From 80ccc7eb60cb2a3932014d7541b90f0f282f3eac Mon Sep 17 00:00:00 2001 From: deniallugo Date: Mon, 5 Jul 2021 16:22:55 +0300 Subject: [PATCH 01/10] Upgrade version for web3 Signed-off-by: deniallugo --- Cargo.lock | 2498 +++++++++-------- Cargo.toml | 5 +- core/bin/block_revert/Cargo.toml | 4 +- core/bin/data_restore/Cargo.toml | 4 +- core/bin/data_restore/src/contract/v4.rs | 30 +- core/bin/prover/Cargo.toml | 4 +- core/bin/prover/src/client.rs | 16 +- core/bin/regen-root-hash/Cargo.toml | 2 +- core/bin/zksync_api/Cargo.toml | 6 +- core/bin/zksync_core/Cargo.toml | 6 +- core/bin/zksync_eth_sender/Cargo.toml | 4 +- .../zksync_forced_exit_requests/Cargo.toml | 4 +- core/bin/zksync_witness_generator/Cargo.toml | 2 +- core/lib/api_client/Cargo.toml | 2 +- core/lib/basic_types/Cargo.toml | 2 +- core/lib/config/Cargo.toml | 2 +- core/lib/contracts/Cargo.toml | 2 +- core/lib/crypto/Cargo.toml | 2 +- core/lib/eth_client/Cargo.toml | 6 +- .../lib/eth_client/src/clients/http_client.rs | 5 +- core/lib/eth_signer/Cargo.toml | 6 +- core/lib/eth_signer/src/raw_ethereum_tx.rs | 2 +- core/lib/gateway_watcher/Cargo.toml | 2 +- core/lib/notifier/Cargo.toml | 2 +- core/lib/prover_utils/Cargo.toml | 2 +- core/lib/state/Cargo.toml | 2 +- core/lib/storage/Cargo.toml | 2 +- core/lib/types/Cargo.toml | 6 +- core/lib/types/src/ethereum.rs | 4 +- core/lib/types/src/forced_exit_requests.rs | 2 +- core/lib/types/src/priority_ops/mod.rs | 10 +- core/lib/types/src/register_factory.rs | 2 +- core/tests/loadnext/Cargo.toml | 2 +- core/tests/loadnext/src/account_pool.rs | 2 +- core/tests/loadnext/src/command/mod.rs | 4 +- core/tests/loadnext/src/command/tx_command.rs | 2 +- core/tests/loadnext/src/rng.rs | 4 +- core/tests/loadtest/Cargo.toml | 4 +- core/tests/testkit/Cargo.toml | 4 +- sdk/zksync-rs/Cargo.toml | 6 +- 40 files changed, 1415 insertions(+), 1261 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a70e18a4a3..89e6bcf433 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,7 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 - [[package]] name = "actix" version = "0.10.0" @@ -16,13 +14,13 @@ dependencies = [ "derive_more", "futures-channel", "futures-util", - "log 0.4.11", + "log 0.4.14", "once_cell", - "parking_lot 0.11.0", - "pin-project 0.4.27", - "smallvec 1.4.2", - "tokio 0.2.22", - "tokio-util", + "parking_lot 0.11.1", + "pin-project 0.4.28", + "smallvec 1.6.1", + "tokio 0.2.25", + "tokio-util 0.3.1", "trust-dns-proto", "trust-dns-resolver", ] @@ -37,10 +35,10 @@ dependencies = [ "bytes 0.5.6", "futures-core", "futures-sink", - "log 0.4.11", - "pin-project 0.4.27", - "tokio 0.2.22", - "tokio-util", + "log 0.4.14", + "pin-project 0.4.28", + "tokio 0.2.25", + "tokio-util 0.3.1", ] [[package]] @@ -56,8 +54,8 @@ dependencies = [ "derive_more", "either", "futures-util", - "http 0.2.1", - "log 0.4.11", + "http 0.2.4", + "log 0.4.14", "trust-dns-proto", "trust-dns-resolver", ] @@ -76,9 +74,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "2.0.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05dd80ba8f27c4a34357c07e338c8f5c38f8520e6d626ca1727d8fecc41b0cab" +checksum = "452299e87817ae5673910e53c243484ca38be3828db819b6011736fc6982e874" dependencies = [ "actix-codec", "actix-connect", @@ -86,7 +84,7 @@ dependencies = [ "actix-service", "actix-threadpool", "actix-utils", - "base64 0.12.3", + "base64 0.13.0", "bitflags", "brotli2", "bytes 0.5.6", @@ -100,32 +98,32 @@ dependencies = [ "futures-core", "futures-util", "fxhash", - "h2 0.2.6", - "http 0.2.1", + "h2 0.2.7", + "http 0.2.4", "httparse", "indexmap", "itoa", "language-tags", "lazy_static", - "log 0.4.11", + "log 0.4.14", "mime 0.3.16", "percent-encoding 2.1.0", - "pin-project 0.4.27", + "pin-project 1.0.7", "rand 0.7.3", "regex", "serde", "serde_json", "serde_urlencoded", - "sha-1 0.9.1", + "sha-1 0.9.6", "slab", - "time 0.2.22", + "time 0.2.27", ] [[package]] name = "actix-macros" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a60f9ba7c4e6df97f3aacb14bb5c0cd7d98a49dcbaed0d7f292912ad9a6a3ed2" +checksum = "b4ca8ce00b267af8ccebbd647de0d61e0674b6e61185cc7a592ff88772bed655" dependencies = [ "quote", "syn", @@ -133,13 +131,13 @@ dependencies = [ [[package]] name = "actix-router" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd1f7dbda1645bf7da33554db60891755f6c01c1b2169e2f4c492098d30c235" +checksum = "2ad299af73649e1fc893e333ccf86f377751eb95ff875d095131574c6f43452c" dependencies = [ "bytestring", - "http 0.2.1", - "log 0.4.11", + "http 0.2.4", + "log 0.4.14", "regex", "serde", ] @@ -155,8 +153,8 @@ dependencies = [ "copyless", "futures-channel", "futures-util", - "smallvec 1.4.2", - "tokio 0.2.22", + "smallvec 1.6.1", + "tokio 0.2.25", ] [[package]] @@ -171,12 +169,12 @@ dependencies = [ "actix-utils", "futures-channel", "futures-util", - "log 0.4.11", - "mio", + "log 0.4.14", + "mio 0.6.23", "mio-uds", "num_cpus", "slab", - "socket2", + "socket2 0.3.19", ] [[package]] @@ -186,7 +184,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb" dependencies = [ "futures-util", - "pin-project 0.4.27", + "pin-project 0.4.28", ] [[package]] @@ -199,8 +197,8 @@ dependencies = [ "actix-rt", "actix-server", "actix-service", - "log 0.4.11", - "socket2", + "log 0.4.14", + "socket2 0.3.19", ] [[package]] @@ -212,9 +210,9 @@ dependencies = [ "derive_more", "futures-channel", "lazy_static", - "log 0.4.11", + "log 0.4.14", "num_cpus", - "parking_lot 0.11.0", + "parking_lot 0.11.1", "threadpool", ] @@ -245,16 +243,16 @@ dependencies = [ "futures-channel", "futures-sink", "futures-util", - "log 0.4.11", - "pin-project 0.4.27", + "log 0.4.14", + "pin-project 0.4.28", "slab", ] [[package]] name = "actix-web" -version = "3.1.0" +version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1b12fe25e11cd9ed2ef2e428427eb6178a1b363f3f7f0dab8278572f11b2da1" +checksum = "e641d4a172e7faa0862241a20ff4f1f5ab0ab7c279f00c2d4587b77483477b86" dependencies = [ "actix-codec", "actix-http", @@ -276,17 +274,17 @@ dependencies = [ "futures-core", "futures-util", "fxhash", - "log 0.4.11", + "log 0.4.14", "mime 0.3.16", - "pin-project 0.4.27", + "pin-project 1.0.7", "regex", "serde", "serde_json", "serde_urlencoded", - "socket2", - "time 0.2.22", - "tinyvec 1.0.1", - "url 2.2.1", + "socket2 0.3.19", + "time 0.2.27", + "tinyvec", + "url 2.2.2", ] [[package]] @@ -302,14 +300,14 @@ dependencies = [ "bytes 0.5.6", "futures-channel", "futures-core", - "pin-project 0.4.27", + "pin-project 0.4.28", ] [[package]] name = "actix-web-codegen" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "750ca8fb60bbdc79491991650ba5d2ae7cd75f3fc00ead51390cfe9efda0d4d8" +checksum = "ad26f77093333e0e7c6ffe54ebe3582d908a104e448723eec6d43d08b07143fb" dependencies = [ "proc-macro2", "quote", @@ -318,14 +316,12 @@ dependencies = [ [[package]] name = "actix-web-httpauth" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "536a75d767c5c2b3e64d3f569621f38ed7609359a0c82d149c88290a6ba41b22" +checksum = "0c3b11a07a3df3f7970fd8bd38cc66998b5549f507c54cc64c6e843bc82d6358" dependencies = [ - "actix-service", "actix-web", - "base64 0.12.3", - "bytes 0.5.6", + "base64 0.13.0", "futures-util", ] @@ -342,62 +338,60 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.13.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b6a2d3371669ab3ca9797670853d61402b03d0b4b9ebf33d677dfa720203072" +checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" dependencies = [ "gimli", ] [[package]] name = "adler" -version = "0.2.3" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aes" -version = "0.3.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54eb1d8fe354e5fc611daf4f2ea97dd45a765f4f1e4512306ec183ae2e8f20c9" +checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" dependencies = [ "aes-soft", "aesni", - "block-cipher-trait", + "cipher", ] [[package]] name = "aes-ctr" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee" +checksum = "7729c3cde54d67063be556aeac75a81330d802f0259500ca40cb52967f975763" dependencies = [ "aes-soft", "aesni", + "cipher", "ctr", - "stream-cipher", ] [[package]] name = "aes-soft" -version = "0.3.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d" +checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" dependencies = [ - "block-cipher-trait", - "byteorder", - "opaque-debug 0.2.3", + "cipher", + "opaque-debug 0.3.0", ] [[package]] name = "aesni" -version = "0.6.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100" +checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" dependencies = [ - "block-cipher-trait", - "opaque-debug 0.2.3", - "stream-cipher", + "cipher", + "opaque-debug 0.3.0", ] [[package]] @@ -417,20 +411,20 @@ checksum = "739f4a8db6605981345c5654f3a85b056ce52f37a39d34da03f25bf2151ea16e" [[package]] name = "ahash" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75b7e6a93ecd6dbd2c225154d0fa7f86205574ecaa6c87429fb5f66ee677c44" +checksum = "796540673305a66d127804eef19ad696f1f204b8c1025aaca4958c17eab32877" dependencies = [ - "getrandom 0.2.0", - "lazy_static", - "version_check 0.9.2", + "getrandom 0.2.3", + "once_cell", + "version_check 0.9.3", ] [[package]] name = "aho-corasick" -version = "0.7.14" +version = "0.7.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" dependencies = [ "memchr", ] @@ -466,9 +460,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.33" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1fd36ffbb1fb7c834eac128ea8d0e310c5aeb635548f9d58861e1308d46e71c" +checksum = "15af2628f6890fe2609a3b91bef4c83450512802e59489f9c1cb1fa5df064a61" [[package]] name = "approx" @@ -481,9 +475,9 @@ dependencies = [ [[package]] name = "arc-swap" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034" +checksum = "dabe5a181f83789739c194cbe5a897dde195078fac08568d09221fd6137a7ba8" [[package]] name = "arrayref" @@ -502,127 +496,21 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" - -[[package]] -name = "async-channel" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59740d83946db6a5af71ae25ddf9562c2b176b2ca42cf99a455f09f4a220d6b9" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-executor" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d373d78ded7d0b3fa8039375718cde0aace493f2e34fb60f51cbf567562ca801" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "once_cell", - "vec-arena", -] - -[[package]] -name = "async-global-executor" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "124ac8c265e407641c3362b8f4d39cdb4e243885b71eef087be27199790f5a3a" -dependencies = [ - "async-executor", - "async-io", - "futures-lite", - "num_cpus", - "once_cell", -] - -[[package]] -name = "async-io" -version = "1.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54bc4c1c7292475efb2253227dbcfad8fe1ca4c02bc62c510cc2f3da5c4704e" -dependencies = [ - "concurrent-queue", - "fastrand", - "futures-lite", - "libc", - "log 0.4.11", - "nb-connect", - "once_cell", - "parking", - "polling", - "vec-arena", - "waker-fn", - "winapi 0.3.9", -] - -[[package]] -name = "async-mutex" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-native-tls" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9e7a929bd34c68a82d58a4de7f86fffdaf97fb2af850162a7bb19dd7269b33" -dependencies = [ - "async-std", - "native-tls", - "thiserror", - "url 2.2.1", -] - -[[package]] -name = "async-std" -version = "1.6.5" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9fa76751505e8df1c7a77762f60486f60c71bbd9b8557f4da6ad47d083732ed" -dependencies = [ - "async-global-executor", - "async-io", - "async-mutex", - "blocking", - "crossbeam-utils 0.7.2", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log 0.4.11", - "memchr", - "num_cpus", - "once_cell", - "pin-project-lite 0.1.11", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] +checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] -name = "async-task" -version = "4.0.3" +name = "arrayvec" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" +checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd" [[package]] name = "async-trait" -version = "0.1.42" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d3a45e77e34375a7923b1e8febb049bb011f064714a8e17a1a616fef01da13d" +checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" dependencies = [ "proc-macro2", "quote", @@ -647,12 +535,6 @@ dependencies = [ "crossbeam", ] -[[package]] -name = "atomic-waker" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" - [[package]] name = "atty" version = "0.2.14" @@ -678,19 +560,20 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" [[package]] name = "awc" -version = "2.0.0" +version = "2.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "150e00c06683ab44c5f97d033950e5d87a7a042d06d77f5eecb443cbd23d0575" +checksum = "b381e490e7b0cfc37ebc54079b0413d8093ef43d14a4e4747083f7fa47a9e691" dependencies = [ "actix-codec", "actix-http", "actix-rt", "actix-service", - "base64 0.12.3", + "base64 0.13.0", "bytes 0.5.6", + "cfg-if 1.0.0", "derive_more", "futures-core", - "log 0.4.11", + "log 0.4.14", "mime 0.3.16", "percent-encoding 2.1.0", "rand 0.7.3", @@ -717,16 +600,16 @@ checksum = "721c249ab59cbc483ad4294c9ee2671835c1e43e9ffc277e6b4ecfef733cfdc5" dependencies = [ "futures-core", "instant", - "pin-project 0.4.27", + "pin-project 0.4.28", "rand 0.7.3", - "tokio 0.2.22", + "tokio 0.2.25", ] [[package]] name = "backtrace" -version = "0.3.53" +version = "0.3.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707b586e0e2f247cbde68cdd2c3ce69ea7b7be43e1c5b426e37c9319c4b9838e" +checksum = "78ed203b9ba68b242c62b3fb7480f589dd49829be1edb3fe8fc8b4ffda2dcb8d" dependencies = [ "addr2line", "cfg-if 1.0.0", @@ -738,9 +621,9 @@ dependencies = [ [[package]] name = "base-x" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1" +checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" [[package]] name = "base64" @@ -776,7 +659,7 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "bellman_ce" version = "0.3.2" -source = "git+https://github.com/matter-labs/bellman?branch=beta#48441155ec7006bf7bfac553b5fb7d466d7fcd00" +source = "git+https://github.com/matter-labs/bellman?branch=beta#455480a2db44ecc0423785b295981074800913e6" dependencies = [ "bit-vec", "blake2s_const", @@ -784,7 +667,7 @@ dependencies = [ "byteorder", "cfg-if 1.0.0", "crossbeam", - "futures 0.3.6", + "futures 0.3.15", "hex", "lazy_static", "num_cpus", @@ -799,7 +682,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc403c26e6b03005522e6e8053384c4e881dfe5b2bf041c0c2c49be33d64a539" dependencies = [ - "num-bigint 0.3.1", + "num-bigint 0.3.2", "num-integer", "num-traits", "serde", @@ -807,9 +690,9 @@ dependencies = [ [[package]] name = "bit-vec" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0dc55f2d8a1a85650ac47858bb001b4c0dd73d79e3c455a842925e68d29cd3" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitflags" @@ -828,22 +711,24 @@ dependencies = [ [[package]] name = "bitvec" -version = "0.17.4" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" +checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" dependencies = [ - "either", - "radium 0.3.0", + "funty", + "radium 0.5.3", + "tap", + "wyz", ] [[package]] name = "bitvec" -version = "0.19.4" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ba35e9565969edb811639dbebfe34edc0368e472c5018474c8eb2543397f81" +checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" dependencies = [ "funty", - "radium 0.5.3", + "radium 0.6.2", "tap", "wyz", ] @@ -873,21 +758,21 @@ dependencies = [ [[package]] name = "blake2s_const" version = "0.6.0" -source = "git+https://github.com/matter-labs/bellman?branch=beta#48441155ec7006bf7bfac553b5fb7d466d7fcd00" +source = "git+https://github.com/matter-labs/bellman?branch=beta#455480a2db44ecc0423785b295981074800913e6" dependencies = [ "arrayref", - "arrayvec 0.5.1", + "arrayvec 0.5.2", "constant_time_eq", ] [[package]] name = "blake2s_simd" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab9e07352b829279624ceb7c64adb4f585dacdb81d35cafae81139ccd617cf44" +checksum = "9e461a7034e85b211a4acb57ee2e6730b32912b06c08cc242243c39fc21ae6a2" dependencies = [ "arrayref", - "arrayvec 0.5.1", + "arrayvec 0.5.2", "constant_time_eq", ] @@ -900,7 +785,7 @@ dependencies = [ "block-padding 0.1.5", "byte-tools", "byteorder", - "generic-array 0.12.3", + "generic-array 0.12.4", ] [[package]] @@ -913,23 +798,14 @@ dependencies = [ "generic-array 0.14.4", ] -[[package]] -name = "block-cipher-trait" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" -dependencies = [ - "generic-array 0.12.3", -] - [[package]] name = "block-modes" -version = "0.3.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31aa8410095e39fdb732909fb5730a48d5bd7c2e3cd76bd1b07b3dbea130c529" +checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0" dependencies = [ - "block-cipher-trait", - "block-padding 0.1.5", + "block-padding 0.2.1", + "cipher", ] [[package]] @@ -954,7 +830,7 @@ dependencies = [ "anyhow", "ethabi", "structopt", - "tokio 0.2.22", + "tokio 0.2.25", "web3", "zksync_config", "zksync_eth_client", @@ -962,20 +838,6 @@ dependencies = [ "zksync_types", ] -[[package]] -name = "blocking" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9" -dependencies = [ - "async-channel", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", - "once_cell", -] - [[package]] name = "brotli-sys" version = "0.3.2" @@ -998,9 +860,9 @@ dependencies = [ [[package]] name = "bstr" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "473fc6b38233f9af7baa94fb5852dca389e3d95b8e21c8e3719301462c5d9faf" +checksum = "90682c8d613ad3373e66de8c6411e0ae2ab2571e879d2efbf73558cc66f21279" dependencies = [ "lazy_static", "memchr", @@ -1010,15 +872,15 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.4.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" +checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" [[package]] name = "byte-slice-cast" -version = "0.3.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" +checksum = "65c1bf4a04a88c54f589125563643d773f3254b5c38571395e2b591c693bbc81" [[package]] name = "byte-tools" @@ -1028,9 +890,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "byteorder" -version = "1.3.4" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" +checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" @@ -1049,40 +911,50 @@ 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 = "0.1.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc7c05fa5172da78a62d9949d662d2ac89d4cc7355d7b49adee5163f1fb3f363" +checksum = "90706ba19e97b90786e19dc0d5e2abd80008d99d4c0c5d1ad0b5e72cec7c494d" dependencies = [ - "bytes 0.5.6", + "bytes 1.0.1", ] [[package]] -name = "cache-padded" -version = "1.1.1" +name = "cargo-platform" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" +checksum = "0226944a63d1bf35a3b5f948dd7c59e263db83695c9e8bffc4037de02e30f1d7" +dependencies = [ + "serde", +] [[package]] name = "cargo_metadata" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83f95cf4bf0dda0ac2e65371ae7215d0dce3c187613a9dbf23aaa9374186f97a" +checksum = "7714a157da7991e23d90686b9524b9e12e0407a108647f52e9328f4b3d51ac7f" dependencies = [ + "cargo-platform", "semver 0.11.0", - "semver-parser 0.10.0", + "semver-parser 0.10.2", "serde", "serde_json", ] [[package]] name = "cast" -version = "0.2.3" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0" +checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" dependencies = [ - "rustc_version", + "rustc_version 0.4.0", ] [[package]] @@ -1114,10 +986,19 @@ dependencies = [ "num-traits", "rustc-serialize", "serde", - "time 0.1.44", + "time 0.1.43", "winapi 0.3.9", ] +[[package]] +name = "cipher" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" +dependencies = [ + "generic-array 0.14.4", +] + [[package]] name = "clap" version = "2.33.3" @@ -1142,15 +1023,6 @@ 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" @@ -1162,15 +1034,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "concurrent-queue" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" -dependencies = [ - "cache-padded", -] - [[package]] name = "config" version = "0.10.1" @@ -1198,7 +1061,7 @@ version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40" dependencies = [ - "getrandom 0.2.0", + "getrandom 0.2.3", "lazy_static", "proc-macro-hack", "tiny-keccak 2.0.2", @@ -1206,9 +1069,9 @@ dependencies = [ [[package]] name = "const_fn" -version = "0.4.2" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce90df4c658c62f12d78f7508cf92f9173e5184a539c10bfe54a3107b3ffd0f2" +checksum = "f92cfa0fd5690b3cf8c1ef2cabbd9b7ef22fa53cf5e1f92b05103f6d5d1cf6e7" [[package]] name = "constant_time_eq" @@ -1216,15 +1079,21 @@ 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.2" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1373a16a4937bc34efec7b391f9c1500c30b8478a701a4f44c9165cc0475a6e0" +checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" dependencies = [ "percent-encoding 2.1.0", - "time 0.2.22", - "version_check 0.9.2", + "time 0.2.27", + "version_check 0.9.3", ] [[package]] @@ -1235,9 +1104,9 @@ checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" [[package]] name = "core-foundation" -version = "0.7.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" dependencies = [ "core-foundation-sys", "libc", @@ -1245,23 +1114,26 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" +checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" [[package]] -name = "cpuid-bool" -version = "0.1.2" +name = "cpufeatures" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" +checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef" +dependencies = [ + "libc", +] [[package]] name = "crc32fast" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" +checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -1275,8 +1147,8 @@ dependencies = [ "clap", "criterion-plot", "csv", - "futures 0.3.6", - "itertools 0.10.0", + "futures 0.3.15", + "itertools 0.10.1", "lazy_static", "num-traits", "oorandom", @@ -1288,7 +1160,7 @@ dependencies = [ "serde_derive", "serde_json", "tinytemplate", - "tokio 1.1.0", + "tokio 1.8.0", "walkdir", ] @@ -1310,7 +1182,7 @@ checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" dependencies = [ "cfg-if 0.1.10", "crossbeam-channel 0.4.4", - "crossbeam-deque", + "crossbeam-deque 0.7.3", "crossbeam-epoch 0.8.2", "crossbeam-queue 0.2.3", "crossbeam-utils 0.7.2", @@ -1328,12 +1200,12 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" +checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.1", + "crossbeam-utils 0.8.5", ] [[package]] @@ -1347,6 +1219,17 @@ 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" @@ -1358,21 +1241,20 @@ dependencies = [ "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", - "memoffset", + "memoffset 0.5.6", "scopeguard", ] [[package]] name = "crossbeam-epoch" -version = "0.9.0" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0f606a85340376eef0d6d8fec399e6d4a544d648386c6645eb6d0653b27d9f" +checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" dependencies = [ "cfg-if 1.0.0", - "const_fn", - "crossbeam-utils 0.8.1", + "crossbeam-utils 0.8.5", "lazy_static", - "memoffset", + "memoffset 0.6.4", "scopeguard", ] @@ -1389,12 +1271,12 @@ dependencies = [ [[package]] name = "crossbeam-queue" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f6cb3c7f5b8e51bc3ebb73a2327ad4abdbd119dc13223f14f961d2f38486756" +checksum = "9b10ddc024425c88c2ad148c1b0fd53f4c6d38db9697c9f1588381212fa657c9" dependencies = [ "cfg-if 1.0.0", - "crossbeam-utils 0.8.1", + "crossbeam-utils 0.8.5", ] [[package]] @@ -1410,11 +1292,10 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.1" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d" +checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" dependencies = [ - "autocfg 1.0.1", "cfg-if 1.0.0", "lazy_static", ] @@ -1431,7 +1312,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" dependencies = [ - "generic-array 0.12.3", + "generic-array 0.12.4", "subtle 1.0.0", ] @@ -1442,7 +1323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ "generic-array 0.14.4", - "subtle 2.3.0", + "subtle 2.4.0", ] [[package]] @@ -1452,14 +1333,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" dependencies = [ "generic-array 0.14.4", - "subtle 2.3.0", + "subtle 2.4.0", ] [[package]] name = "csv" -version = "1.1.3" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00affe7f6ab566df61b4be3ce8cf16bc2576bca0963ceb0955e45d514bf9a279" +checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" dependencies = [ "bstr", "csv-core", @@ -1479,19 +1360,18 @@ dependencies = [ [[package]] name = "ctr" -version = "0.3.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736" +checksum = "fb4a30d54f7443bf3d6191dcd486aca19e67cb3c49fa7a06a319966346707e7f" dependencies = [ - "block-cipher-trait", - "stream-cipher", + "cipher", ] [[package]] name = "ctrlc" -version = "3.1.7" +version = "3.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57a92e9749e10f25a171adcebfafe72991d45e7ec2dcb853e8f83d9dafaeb08" +checksum = "232295399409a8b7ae41276757b5a1cc21032848d42bff2352261f958b3ca29a" dependencies = [ "nix", "winapi 0.3.9", @@ -1499,9 +1379,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f2c43f534ea4b0b049015d00269734195e6d3f0f6635cb692251aca6f9f8b3c" +checksum = "757c0ded2af11d8e739c4daea1ac623dd1624b06c844cf3f5a39f1bdbd99bb12" dependencies = [ "darling_core", "darling_macro", @@ -1509,9 +1389,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e91455b86830a1c21799d94524df0845183fa55bafd9aa137b01c7d1065fa36" +checksum = "2c34d8efb62d0c2d7f60ece80f75e5c63c1588ba68032740494b0b9a996466e3" dependencies = [ "fnv", "ident_case", @@ -1523,9 +1403,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a" +checksum = "ade7bff147130fe5e6d39f089c6bd49ec0250f35d70b2eebf72afdfc919f15cc" dependencies = [ "darling_core", "quote", @@ -1563,7 +1443,7 @@ dependencies = [ "crossbeam-queue 0.2.3", "num_cpus", "serde", - "tokio 0.2.22", + "tokio 0.2.25", ] [[package]] @@ -1578,10 +1458,11 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.11" +version = "0.99.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cb0e6161ad61ed084a36ba71fbba9e3ac5aee3606fb607fe08da6acbcf3d8c" +checksum = "5cc7b9cef1e351660e5443924e4f43ab25fbbed3e9a5f052df3677deb4d6b320" dependencies = [ + "convert_case", "proc-macro2", "quote", "syn", @@ -1593,7 +1474,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90" dependencies = [ - "generic-array 0.9.0", + "generic-array 0.9.1", ] [[package]] @@ -1602,7 +1483,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" dependencies = [ - "generic-array 0.12.3", + "generic-array 0.12.4", ] [[package]] @@ -1626,12 +1507,6 @@ 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" @@ -1643,11 +1518,11 @@ dependencies = [ [[package]] name = "encoding_rs" -version = "0.8.24" +version = "0.8.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a51b8cf747471cb9499b6d59e59b0444f4c90eba8968c4e44874e92b5b64ace2" +checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -1673,22 +1548,25 @@ dependencies = [ [[package]] name = "ethabi" -version = "12.0.0" -source = "git+https://github.com/dvush/ethabi.git#df9015530857701a95e9224af71e581bd28004ad" +version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c52991643379afc90bfe2df3c64d53983e59c35a82ba6e75c997cfc2880d8524" dependencies = [ + "anyhow", "ethereum-types", - "rustc-hex", + "hex", "serde", "serde_json", - "tiny-keccak 1.5.0", + "sha3", + "thiserror", "uint", ] [[package]] name = "ethbloom" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71a6567e6fd35589fea0c63b94b4cf2e55573e413901bdbe60ab15cf0e25e5df" +checksum = "779864b9c7f7ead1f092972c3257496c6a84b46dba2ce131dd8a282cb2cc5972" dependencies = [ "crunchy", "fixed-hash", @@ -1699,9 +1577,9 @@ dependencies = [ [[package]] name = "ethereum-types" -version = "0.9.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "473aecff686bd8e7b9db0165cbbb53562376b39bf35b427f0c60446a9e1634b0" +checksum = "f64b5df66a228d85e4b17e5d6c6aa43b0310898ffe8a85988c4c032357aaabfd" dependencies = [ "ethbloom", "fixed-hash", @@ -1711,12 +1589,6 @@ dependencies = [ "uint", ] -[[package]] -name = "event-listener" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" - [[package]] name = "failure" version = "0.1.8" @@ -1745,15 +1617,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" -[[package]] -name = "fastrand" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca5faf057445ce5c9d4329e382b2ce7ca38550ef3b73a5348362d5f24e0c7fe3" -dependencies = [ - "instant", -] - [[package]] name = "ff_ce" version = "0.12.0" @@ -1768,11 +1631,11 @@ dependencies = [ [[package]] name = "ff_derive_ce" -version = "0.9.0" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77d4fecbd8714dc12f4bab026d74e3f5766436bf4d9fc1161709d6e45a593400" +checksum = "dde5a00073374b4d7aa2d3a8359a5709f9c0bfac8393f254655d16b4acdfe823" dependencies = [ - "num-bigint 0.2.6", + "num-bigint 0.4.0", "num-integer", "num-traits", "proc-macro2", @@ -1782,23 +1645,23 @@ dependencies = [ [[package]] name = "fixed-hash" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11498d382790b7a8f2fd211780bec78619bba81cdad3a283997c0c41f836759c" +checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" dependencies = [ "byteorder", - "rand 0.7.3", + "rand 0.8.4", "rustc-hex", "static_assertions", ] [[package]] name = "flate2" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da80be589a72651dcda34d8b35bcdc9b7254ad06325611074d9cc0fbb19f60ee" +checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "crc32fast", "libc", "miniz_oxide", @@ -1838,7 +1701,7 @@ dependencies = [ [[package]] name = "franklin-crypto" version = "0.0.5" -source = "git+https://github.com/matter-labs/franklin-crypto.git?branch=beta#4a706d93628980e036249e3b182b91af8797ce8c" +source = "git+https://github.com/matter-labs/franklin-crypto.git?branch=beta#942368fcde0fe87451bed82e716ec18cfd725fa2" dependencies = [ "bellman_ce", "bit-vec", @@ -1850,7 +1713,7 @@ dependencies = [ "hex", "hmac 0.7.1", "itertools 0.9.0", - "num-bigint 0.3.1", + "num-bigint 0.3.2", "num-integer", "num-traits", "poseidon_hash", @@ -1892,15 +1755,15 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7e4c2612746b0df8fed4ce0c69156021b704c9aefa360311c04e6e9e002eed" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.6" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d8e3078b7b2a8a671cb7a3d17b4760e4181ea243227776ba83fd043b4ca034e" +checksum = "0e7e43a803dae2fa37c1f6a8fe121e1f7bf9548b4dfc0522a42f34145dadfc27" dependencies = [ "futures-channel", "futures-core", @@ -1913,9 +1776,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.8" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b7109687aa4e177ef6fe84553af6280ef2778bdb7783ba44c9dc3399110fe64" +checksum = "e682a68b29a882df0545c143dc3646daefe80ba479bcdede94d5a703de2871e2" dependencies = [ "futures-core", "futures-sink", @@ -1923,9 +1786,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.8" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "847ce131b72ffb13b6109a221da9ad97a64cbe48feb1028356b836b47b8f1748" +checksum = "0402f765d8a89a26043b889b26ce3c4679d268fa6bb22cd7c6aad98340e179d1" [[package]] name = "futures-cpupool" @@ -1933,15 +1796,15 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "num_cpus", ] [[package]] name = "futures-executor" -version = "0.3.6" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc709ca1da6f66143b8c9bec8e6260181869893714e9b5a490b169b0414144ab" +checksum = "badaa6a909fac9e7236d0620a2f57f7664640c56575b71a7552fbd68deafab79" dependencies = [ "futures-core", "futures-task", @@ -1951,31 +1814,17 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.8" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "611834ce18aaa1bd13c4b374f5d653e1027cf99b6b502584ff8c9a64413b30bb" - -[[package]] -name = "futures-lite" -version = "1.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6c079abfac3ab269e2927ec048dabc89d009ebfdda6b8ee86624f30c689658" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite 0.1.11", - "waker-fn", -] +checksum = "acc499defb3b348f8d8f3f66415835a9131856ff7714bf10dadfc4ec4bdb29a1" [[package]] name = "futures-macro" -version = "0.3.8" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77408a692f1f97bcc61dc001d752e00643408fbc922e4d634c655df50d595556" +checksum = "a4c40298486cdf52cc00cd6d6987892ba502c7656a16a4192a9992b1ccedd121" dependencies = [ + "autocfg 1.0.1", "proc-macro-hack", "proc-macro2", "quote", @@ -1984,18 +1833,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.8" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f878195a49cee50e006b02b93cf7e0a95a38ac7b776b4c4d9cc1207cd20fcb3d" +checksum = "a57bead0ceff0d6dde8f465ecd96c9338121bb7717d3e7b108059531870c4282" [[package]] name = "futures-task" -version = "0.3.8" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c554eb5bf48b2426c4771ab68c6b14468b6e76cc90996f528c3338d761a4d0d" -dependencies = [ - "once_cell", -] +checksum = "8a16bef9fc1a4dddb5bee51c989e3fbba26569cbb0e31f5b303c184e3dd33dae" [[package]] name = "futures-timer" @@ -2005,11 +1851,12 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.8" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d304cff4a7b99cfb7986f7d43fbe93d175e72e704a8860787cc95e9ffd85cbd2" +checksum = "feb5c238d27e2bf94ffdfd27b2c29e3df4a68c4193bb6427384259e2bf191967" dependencies = [ - "futures 0.1.30", + "autocfg 1.0.1", + "futures 0.1.31", "futures-channel", "futures-core", "futures-io", @@ -2017,7 +1864,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project 1.0.2", + "pin-project-lite 0.2.7", "pin-utils", "proc-macro-hack", "proc-macro-nested", @@ -2041,18 +1888,18 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" [[package]] name = "generic-array" -version = "0.9.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d" +checksum = "6d00328cedcac5e81c683e5620ca6a30756fc23027ebf9bff405c0e8da1fbb7e" dependencies = [ "typenum", ] [[package]] name = "generic-array" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" dependencies = [ "typenum", ] @@ -2064,63 +1911,50 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" dependencies = [ "typenum", - "version_check 0.9.2", + "version_check 0.9.3", ] [[package]] name = "getrandom" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc587bc0ec293155d5bfa6b9891ec18a1e330c234f896ea47fbada4cadbe47e6" +checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] [[package]] name = "getrandom" -version = "0.2.0" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8025cf36f917e6a52cce185b7c7177689b838b7ec138364e50cc2277a56cf4" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "wasi 0.10.2+wasi-snapshot-preview1", ] [[package]] name = "gimli" -version = "0.22.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf91faf136cb47367fa430cd46e37a788775e7fa104f8b4bcb3861dc389b724" +checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" [[package]] name = "globset" -version = "0.4.5" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ad1da430bd7281dde2576f44c84cc3f0f7b475e7202cd503042dff01a8c8120" +checksum = "10463d9ff00a2a068db14231982f5132edebad0d7660cd956a1c30292dbcbfbd" dependencies = [ "aho-corasick", "bstr", "fnv", - "log 0.4.11", + "log 0.4.14", "regex", ] -[[package]] -name = "gloo-timers" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "h2" version = "0.1.26" @@ -2130,10 +1964,10 @@ dependencies = [ "byteorder", "bytes 0.4.12", "fnv", - "futures 0.1.30", + "futures 0.1.31", "http 0.1.21", "indexmap", - "log 0.4.11", + "log 0.4.14", "slab", "string", "tokio-io", @@ -2141,39 +1975,59 @@ dependencies = [ [[package]] name = "h2" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993f9e0baeed60001cf565546b0d3dbe6a6ad23f2bd31644a133c641eccf6d53" +checksum = "5e4728fd124914ad25e99e3d15a9361a879f6620f63cb56bbb08f95abb97a535" dependencies = [ "bytes 0.5.6", "fnv", "futures-core", "futures-sink", "futures-util", - "http 0.2.1", + "http 0.2.4", "indexmap", "slab", - "tokio 0.2.22", - "tokio-util", + "tokio 0.2.25", + "tokio-util 0.3.1", + "tracing", + "tracing-futures", +] + +[[package]] +name = "h2" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726" +dependencies = [ + "bytes 1.0.1", + "fnv", + "futures-core", + "futures-sink", + "futures-util", + "http 0.2.4", + "indexmap", + "slab", + "tokio 1.8.0", + "tokio-util 0.6.7", "tracing", ] [[package]] name = "half" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36fab90f82edc3c747f9d438e06cf0a491055896f2a279638bb5beed6c40177" +checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3" [[package]] name = "handlebars" -version = "3.5.0" +version = "3.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcd1b5399b9884f9ae18b5d4105d180720c8f602aeb73d3ceae9d6b1d13a5fa7" +checksum = "4498fc115fa7d34de968184e473529abb40eeb6be8bc5f7faba3d08c316cb3e3" dependencies = [ - "log 0.4.11", + "log 0.4.14", "pest", "pest_derive", - "quick-error 2.0.0", + "quick-error 2.0.1", "serde", "serde_json", ] @@ -2187,52 +2041,83 @@ 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", + "hashbrown 0.9.1", ] [[package]] name = "hdrhistogram" -version = "7.2.0" +version = "7.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af54a13c410de2b5e2d611475072834b86d7b2f835a2a8f7b1b1248d3e9bfbd8" +checksum = "faa51471caf8069812385974ce947bf4b71a806d7e5a0d1f710af57d6a9a45ad" dependencies = [ "base64 0.13.0", "byteorder", - "crossbeam-channel 0.5.0", + "crossbeam-channel 0.5.1", "flate2", - "nom 6.1.0", + "nom 6.1.2", "num-traits", ] +[[package]] +name = "headers" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0b7591fb62902706ae8e7aaff416b1b0fa2c0fd0878b46dc13baa3712d8a855" +dependencies = [ + "base64 0.13.0", + "bitflags", + "bytes 1.0.1", + "headers-core", + "http 0.2.4", + "mime 0.3.16", + "sha-1 0.9.6", + "time 0.1.43", +] + +[[package]] +name = "headers-core" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" +dependencies = [ + "http 0.2.4", +] + [[package]] name = "heck" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ "unicode-segmentation", ] [[package]] name = "hermit-abi" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] [[package]] name = "hex" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "644f9158b2f133fd50f5fb3242878846d9eb792e445c893805ff0e3824006e35" +checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hmac" @@ -2278,11 +2163,11 @@ dependencies = [ [[package]] name = "http" -version = "0.2.1" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" +checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" dependencies = [ - "bytes 0.5.6", + "bytes 1.0.1", "fnv", "itoa", ] @@ -2294,7 +2179,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6741c859c1b2463a423a1dbce98d418e6c3c3fc720fb0d45528657320920292d" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "http 0.1.21", "tokio-buf", ] @@ -2306,14 +2191,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" dependencies = [ "bytes 0.5.6", - "http 0.2.1", + "http 0.2.4", +] + +[[package]] +name = "http-body" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" +dependencies = [ + "bytes 1.0.1", + "http 0.2.4", + "pin-project-lite 0.2.7", ] [[package]] name = "httparse" -version = "1.3.4" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" +checksum = "f3a87b616e37e93c22fb19bcd386f02f3af5ea98a25670ad0fce773de23c5e68" [[package]] name = "httpdate" @@ -2321,6 +2217,12 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" +[[package]] +name = "httpdate" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" + [[package]] name = "hyper" version = "0.10.16" @@ -2333,7 +2235,7 @@ dependencies = [ "log 0.3.9", "mime 0.2.6", "num_cpus", - "time 0.1.44", + "time 0.1.43", "traitobject", "typeable", "unicase 1.4.2", @@ -2342,12 +2244,12 @@ dependencies = [ [[package]] name = "hyper" -version = "0.12.35" +version = "0.12.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dbe6ed1438e1f8ad955a4701e9a944938e9519f6888d12d8558b645e247d5f6" +checksum = "5c843caf6296fc1f93444735205af9ed4e109a539005abb2564ae1d6fad34c52" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "futures-cpupool", "h2 0.1.26", "http 0.1.21", @@ -2355,10 +2257,10 @@ dependencies = [ "httparse", "iovec", "itoa", - "log 0.4.11", + "log 0.4.14", "net2", - "rustc_version", - "time 0.1.44", + "rustc_version 0.2.3", + "time 0.1.43", "tokio 0.1.22", "tokio-buf", "tokio-executor", @@ -2372,23 +2274,47 @@ dependencies = [ [[package]] name = "hyper" -version = "0.13.8" +version = "0.13.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3afcfae8af5ad0576a31e768415edb627824129e8e5a29b8bfccb2f234e835" +checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" dependencies = [ "bytes 0.5.6", "futures-channel", "futures-core", "futures-util", - "h2 0.2.6", - "http 0.2.1", + "h2 0.2.7", + "http 0.2.4", "http-body 0.3.1", "httparse", - "httpdate", + "httpdate 0.3.2", "itoa", - "pin-project 0.4.27", - "socket2", - "tokio 0.2.22", + "pin-project 1.0.7", + "socket2 0.3.19", + "tokio 0.2.25", + "tower-service", + "tracing", + "want 0.3.0", +] + +[[package]] +name = "hyper" +version = "0.14.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07d6baa1b441335f3ce5098ac421fb6547c46dda735ca1bc6d0153c838f9dd83" +dependencies = [ + "bytes 1.0.1", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.3.3", + "http 0.2.4", + "http-body 0.4.2", + "httparse", + "httpdate 1.0.1", + "itoa", + "pin-project-lite 0.2.7", + "socket2 0.4.0", + "tokio 1.8.0", "tower-service", "tracing", "want 0.3.0", @@ -2401,12 +2327,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d979acc56dcb5b8dddba3917601745e877576475aa046df3226eabdecef78eed" dependencies = [ "bytes 0.5.6", - "hyper 0.13.8", + "hyper 0.13.10", "native-tls", - "tokio 0.2.22", + "tokio 0.2.25", "tokio-tls 0.3.1", ] +[[package]] +name = "hyper-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" +dependencies = [ + "bytes 1.0.1", + "hyper 0.14.9", + "native-tls", + "tokio 1.8.0", + "tokio-native-tls 0.3.0", +] + [[package]] name = "ident_case" version = "1.0.1" @@ -2426,9 +2365,9 @@ dependencies = [ [[package]] name = "idna" -version = "0.2.0" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" dependencies = [ "matches", "unicode-bidi", @@ -2446,23 +2385,23 @@ dependencies = [ "rand_xoshiro", "sized-chunks", "typenum", - "version_check 0.9.2", + "version_check 0.9.3", ] [[package]] name = "impl-codec" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" +checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" dependencies = [ "parity-scale-codec", ] [[package]] name = "impl-rlp" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f7a72f11830b52333f36e3b09a288333888bf54380fd0ac0790a3c31ab0f3c5" +checksum = "f28220f89297a075ddc7245cd538076ee98b01f2a9c23a53a4f1105d5a322808" dependencies = [ "rlp", ] @@ -2476,23 +2415,34 @@ dependencies = [ "serde", ] +[[package]] +name = "impl-trait-for-tuples" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "indexmap" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55e2e4c765aa53a0424761bf9f41aa7a6ac1efa87238f59560640e27fca028f2" +checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" dependencies = [ "autocfg 1.0.1", - "hashbrown", + "hashbrown 0.11.2", ] [[package]] name = "instant" -version = "0.1.7" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66" +checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -2510,7 +2460,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7e2f18aece9709094573a9f24f483c4f65caa4298e2f7ae1b71cc65d853fad7" dependencies = [ - "socket2", + "socket2 0.3.19", "widestring", "winapi 0.3.9", "winreg 0.6.2", @@ -2518,9 +2468,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" +checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" [[package]] name = "itertools" @@ -2542,24 +2492,24 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" +checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" dependencies = [ "either", ] [[package]] name = "itoa" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" +checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" [[package]] name = "js-sys" -version = "0.3.45" +version = "0.3.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca059e81d9486668f12d455a4ea6daa600bd408134cd17e3d3fb5a32d1f016f8" +checksum = "83bdfbace3a0e81a4253f73b49e960b053e396a11012cbd49b9b74d6a2b67062" dependencies = [ "wasm-bindgen", ] @@ -2571,11 +2521,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2773fa94a2a1fd51efb89a8f45b8861023dbb415d18d3c9235ae9388d780f9ec" dependencies = [ "failure", - "futures 0.1.30", - "hyper 0.12.35", - "jsonrpc-core", + "futures 0.1.31", + "hyper 0.12.36", + "jsonrpc-core 14.2.0", "jsonrpc-pubsub", - "log 0.4.11", + "log 0.4.14", "serde", "serde_json", "tokio 0.1.22", @@ -2589,8 +2539,23 @@ version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0747307121ffb9703afd93afbd0fb4f854c38fb873f2c8b90e0e902f27c7b62" dependencies = [ - "futures 0.1.30", - "log 0.4.11", + "futures 0.1.31", + "log 0.4.14", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "jsonrpc-core" +version = "17.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4467ab6dfa369b69e52bd0692e480c4d117410538526a57a304a0f2250fd95e" +dependencies = [ + "futures 0.3.15", + "futures-executor", + "futures-util", + "log 0.4.14", "serde", "serde_derive", "serde_json", @@ -2611,7 +2576,7 @@ version = "14.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0e77e8812f02155b85a677a96e1d16b60181950c0636199bc4528524fba98dc" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -2623,10 +2588,10 @@ version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0da906d682799df05754480dac1b9e70ec92e12c19ebafd2662a5ea1c9fd6522" dependencies = [ - "hyper 0.12.35", - "jsonrpc-core", + "hyper 0.12.36", + "jsonrpc-core 14.2.0", "jsonrpc-server-utils", - "log 0.4.11", + "log 0.4.14", "net2", "parking_lot 0.10.2", "unicase 2.6.0", @@ -2638,8 +2603,8 @@ version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d44f5602a11d657946aac09357956d2841299ed422035edf140c552cb057986" dependencies = [ - "jsonrpc-core", - "log 0.4.11", + "jsonrpc-core 14.2.0", + "log 0.4.14", "parking_lot 0.10.2", "rand 0.7.3", "serde", @@ -2653,9 +2618,9 @@ checksum = "56cbfb462e7f902e21121d9f0d1c2b77b2c5b642e1a4e8f4ebfa2e15b94402bb" dependencies = [ "bytes 0.4.12", "globset", - "jsonrpc-core", + "jsonrpc-core 14.2.0", "lazy_static", - "log 0.4.11", + "log 0.4.14", "tokio 0.1.22", "tokio-codec", "unicase 2.6.0", @@ -2667,9 +2632,9 @@ version = "14.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "903d3109fe7c4acb932b567e1e607e0f524ed04741b09fb0e61841bc40a022fc" dependencies = [ - "jsonrpc-core", + "jsonrpc-core 14.2.0", "jsonrpc-server-utils", - "log 0.4.11", + "log 0.4.14", "parking_lot 0.10.2", "slab", "ws", @@ -2715,7 +2680,7 @@ dependencies = [ "rust-crypto", "serde_json", "structopt", - "time 0.1.44", + "time 0.1.43", "vlog", "zksync_circuit", "zksync_config", @@ -2725,15 +2690,6 @@ dependencies = [ "zksync_utils", ] -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log 0.4.11", -] - [[package]] name = "language-tags" version = "0.2.2" @@ -2754,22 +2710,22 @@ 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", + "arrayvec 0.5.2", "bitflags", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "ryu", "static_assertions", ] [[package]] name = "libc" -version = "0.2.86" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c" +checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" [[package]] name = "libm" @@ -2779,9 +2735,9 @@ checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" [[package]] name = "linked-hash-map" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a" +checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "loadnext" @@ -2789,13 +2745,13 @@ version = "0.1.0" dependencies = [ "anyhow", "envy", - "futures 0.3.6", + "futures 0.3.15", "hex", "num", - "rand 0.7.3", + "rand 0.8.4", "serde", "static_assertions", - "tokio 0.2.22", + "tokio 0.2.25", "vlog", "zksync", "zksync_eth_signer", @@ -2811,16 +2767,16 @@ dependencies = [ "async-trait", "chrono", "colored", - "futures 0.3.6", + "futures 0.3.15", "hex", "num", "once_cell", "rand 0.4.6", - "reqwest", + "reqwest 0.11.4", "serde", "serde_json", "structopt", - "tokio 0.2.22", + "tokio 0.2.25", "toml", "vlog", "web3", @@ -2843,9 +2799,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28247cc5a5be2f05fbcd76dd0cf2c7d3b5400cb978a28042abcd4fa0b3f8261c" +checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb" dependencies = [ "scopeguard", ] @@ -2856,16 +2812,16 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" dependencies = [ - "log 0.4.11", + "log 0.4.14", ] [[package]] name = "log" -version = "0.4.11" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", ] [[package]] @@ -2933,9 +2889,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" [[package]] name = "memoffset" @@ -2946,6 +2902,15 @@ 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" @@ -2964,12 +2929,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c507e712df1231dea654a2cf39da902a7098d0929360a0fab218c998abc729a" dependencies = [ "hdrhistogram", - "hyper 0.13.8", + "hyper 0.13.10", "metrics", "metrics-util", - "parking_lot 0.11.0", + "parking_lot 0.11.1", "thiserror", - "tokio 0.2.22", + "tokio 0.2.25", ] [[package]] @@ -2994,8 +2959,8 @@ checksum = "938d428ecdc2dc9a6ed8a8da2e6aefc6ee70ab7e26cfc68996a13cc560bced9c" dependencies = [ "arc-swap", "atomic-shim", - "crossbeam-epoch 0.9.0", - "crossbeam-utils 0.8.1", + "crossbeam-epoch 0.9.5", + "crossbeam-utils 0.8.5", "dashmap", "indexmap", "metrics", @@ -3028,9 +2993,9 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f2d26ec3309788e423cfbf68ad1800f061638098d76a83681af979dc4eda19d" +checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" dependencies = [ "adler", "autocfg 1.0.1", @@ -3038,9 +3003,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.6.22" +version = "0.6.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" +checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" dependencies = [ "cfg-if 0.1.10", "fuchsia-zircon", @@ -3048,13 +3013,26 @@ dependencies = [ "iovec", "kernel32-sys", "libc", - "log 0.4.11", - "miow 0.2.1", + "log 0.4.14", + "miow 0.2.2", "net2", "slab", "winapi 0.2.8", ] +[[package]] +name = "mio" +version = "0.7.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" +dependencies = [ + "libc", + "log 0.4.14", + "miow 0.3.7", + "ntapi", + "winapi 0.3.9", +] + [[package]] name = "mio-extras" version = "2.0.6" @@ -3062,8 +3040,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" dependencies = [ "lazycell", - "log 0.4.11", - "mio", + "log 0.4.14", + "mio 0.6.23", "slab", ] @@ -3073,9 +3051,9 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ - "log 0.4.11", - "mio", - "miow 0.3.6", + "log 0.4.14", + "mio 0.6.23", + "miow 0.3.7", "winapi 0.3.9", ] @@ -3087,14 +3065,14 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio", + "mio 0.6.23", ] [[package]] name = "miow" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" +checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" dependencies = [ "kernel32-sys", "net2", @@ -3104,23 +3082,22 @@ dependencies = [ [[package]] name = "miow" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a33c1b55807fbed163481b5ba66db4b2fa6cde694a5027be10fb724206c5897" +checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" dependencies = [ - "socket2", "winapi 0.3.9", ] [[package]] name = "native-tls" -version = "0.2.4" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" +checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" dependencies = [ "lazy_static", "libc", - "log 0.4.11", + "log 0.4.14", "openssl", "openssl-probe", "openssl-sys", @@ -3130,21 +3107,11 @@ 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.35" +version = "0.2.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ebc3ec692ed7c9a255596c67808dee269f64655d8baf7b4f0638e51ba1d6853" +checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" dependencies = [ "cfg-if 0.1.10", "libc", @@ -3153,13 +3120,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.18.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" +checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a" dependencies = [ "bitflags", "cc", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", ] @@ -3177,19 +3144,29 @@ checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" dependencies = [ "lexical-core", "memchr", - "version_check 0.9.2", + "version_check 0.9.3", ] [[package]] name = "nom" -version = "6.1.0" +version = "6.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab6f70b46d6325aa300f1c7bb3d470127dfc27806d8ea6bf294ee0ce643ce2b1" +checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" dependencies = [ - "bitvec 0.19.4", + "bitvec 0.19.5", + "funty", "lexical-core", "memchr", - "version_check 0.9.2", + "version_check 0.9.3", +] + +[[package]] +name = "ntapi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" +dependencies = [ + "winapi 0.3.9", ] [[package]] @@ -3198,7 +3175,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b7a8e9be5e039e2ff869df49155f1c06bd01ade2117ec783e56ab0932b67a8f" dependencies = [ - "num-bigint 0.3.1", + "num-bigint 0.3.2", "num-complex 0.3.1", "num-integer", "num-iter", @@ -3219,9 +3196,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9a41747ae4633fce5adffb4d2e81ffc5e89593cb19917f8fb2cc5ff76507bf" +checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" dependencies = [ "autocfg 1.0.1", "num-integer", @@ -3229,6 +3206,17 @@ 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" @@ -3277,7 +3265,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" dependencies = [ "autocfg 1.0.1", - "num-bigint 0.3.1", + "num-bigint 0.3.2", "num-integer", "num-traits", "serde", @@ -3305,21 +3293,21 @@ dependencies = [ [[package]] name = "object" -version = "0.21.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37fd5004feb2ce328a52b0b3d01dbf4ffff72583493900ed15f22d4111c51693" +checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" [[package]] name = "once_cell" -version = "1.5.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "oorandom" -version = "11.1.2" +version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a170cebd8021a008ea92e4db85a72f80b35df514ec664b296fdcbb654eac0b2c" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" [[package]] name = "opaque-debug" @@ -3335,29 +3323,29 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.30" +version = "0.10.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" +checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" dependencies = [ "bitflags", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "foreign-types", - "lazy_static", "libc", + "once_cell", "openssl-sys", ] [[package]] name = "openssl-probe" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" +checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" [[package]] name = "openssl-sys" -version = "0.9.58" +version = "0.9.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" +checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" dependencies = [ "autocfg 1.0.1", "cc", @@ -3380,46 +3368,53 @@ dependencies = [ [[package]] name = "parity-crypto" -version = "0.6.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88e15b5e11d7a4829490630a797c537a68c9e864a139f56fe7a1e6a51f0da25d" +checksum = "4c81ac9a98f245685fdfd1c37685613ecf123cf7941e2365e9aa551622065e8e" dependencies = [ "aes", "aes-ctr", "block-modes", - "digest 0.8.1", + "digest 0.9.0", "ethereum-types", - "hmac 0.7.1", + "hmac 0.10.1", "lazy_static", "pbkdf2", - "rand 0.7.3", "ripemd160", "rustc-hex", "scrypt", - "secp256k1", - "sha2 0.8.2", - "subtle 2.3.0", + "secp256k1 0.20.3", + "sha2 0.9.5", + "subtle 2.4.0", "tiny-keccak 2.0.2", "zeroize", ] [[package]] name = "parity-scale-codec" -version = "1.3.5" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c740e5fbcb6847058b40ac7e5574766c6388f585e184d769910fe0d3a2ca861" +checksum = "8975095a2a03bbbdc70a74ab11a4f76a6d0b84680d87c68d722531b0ac28e8a9" dependencies = [ - "arrayvec 0.5.1", - "bitvec 0.17.4", + "arrayvec 0.7.1", + "bitvec 0.20.4", "byte-slice-cast", + "impl-trait-for-tuples", + "parity-scale-codec-derive", "serde", ] [[package]] -name = "parking" -version = "2.0.0" +name = "parity-scale-codec-derive" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" +checksum = "40dbbfef7f0a1143c5b06e0d76a6278e25dac0bc1af4be51a0fbb73f07e7ad09" +dependencies = [ + "proc-macro-crate 1.0.0", + "proc-macro2", + "quote", + "syn", +] [[package]] name = "parking_lot" @@ -3429,7 +3424,7 @@ checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" dependencies = [ "lock_api 0.3.4", "parking_lot_core 0.6.2", - "rustc_version", + "rustc_version 0.2.3", ] [[package]] @@ -3444,13 +3439,13 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4893845fa2ca272e647da5d0e46660a314ead9c2fdd9a883aabc32e481a8733" +checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" dependencies = [ "instant", - "lock_api 0.4.1", - "parking_lot_core 0.8.0", + "lock_api 0.4.4", + "parking_lot_core 0.8.3", ] [[package]] @@ -3460,11 +3455,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" dependencies = [ "cfg-if 0.1.10", - "cloudabi 0.0.3", + "cloudabi", "libc", - "redox_syscall", - "rustc_version", - "smallvec 0.6.13", + "redox_syscall 0.1.57", + "rustc_version 0.2.3", + "smallvec 0.6.14", "winapi 0.3.9", ] @@ -3475,25 +3470,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3" dependencies = [ "cfg-if 0.1.10", - "cloudabi 0.0.3", + "cloudabi", "libc", - "redox_syscall", - "smallvec 1.4.2", + "redox_syscall 0.1.57", + "smallvec 1.6.1", "winapi 0.3.9", ] [[package]] name = "parking_lot_core" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b" +checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" dependencies = [ - "cfg-if 0.1.10", - "cloudabi 0.1.0", + "cfg-if 1.0.0", "instant", "libc", - "redox_syscall", - "smallvec 1.4.2", + "redox_syscall 0.2.9", + "smallvec 1.6.1", "winapi 0.3.9", ] @@ -3507,26 +3501,26 @@ dependencies = [ [[package]] name = "pbkdf2" -version = "0.3.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" +checksum = "b3b8c0d71734018084da0c0354193a5edfb81b20d2d57a92c5b154aefc554a4a" dependencies = [ - "base64 0.9.3", - "byteorder", - "crypto-mac 0.7.0", - "hmac 0.7.1", - "rand 0.5.6", - "sha2 0.8.2", - "subtle 1.0.0", + "base64 0.13.0", + "crypto-mac 0.10.0", + "hmac 0.10.1", + "rand 0.7.3", + "rand_core 0.5.1", + "sha2 0.9.5", + "subtle 2.4.0", ] [[package]] name = "pem" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59698ea79df9bf77104aefd39cc3ec990cb9693fb59c3b0a70ddf2646fdffb4b" +checksum = "fd56cbd21fea48d0c440b41cd69c589faacade08c992d9a54e471b79d0fd13eb" dependencies = [ - "base64 0.12.3", + "base64 0.13.0", "once_cell", "regex", ] @@ -3588,27 +3582,27 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffbc8e94b38ea3d2d8ba92aea2983b503cd75d0888d75b86bb37970b5698e15" +checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" dependencies = [ - "pin-project-internal 0.4.27", + "pin-project-internal 0.4.28", ] [[package]] name = "pin-project" -version = "1.0.2" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccc2237c2c489783abd8c4c80e5450fc0e98644555b1364da68cc29aa151ca7" +checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4" dependencies = [ - "pin-project-internal 1.0.2", + "pin-project-internal 1.0.7", ] [[package]] name = "pin-project-internal" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895" +checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" dependencies = [ "proc-macro2", "quote", @@ -3617,9 +3611,9 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.0.2" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8e8d2bf0b23038a4424865103a4df472855692821aab4e4f5c3312d461d9e5f" +checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f" dependencies = [ "proc-macro2", "quote", @@ -3628,15 +3622,15 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" +checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.4" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827" +checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" [[package]] name = "pin-utils" @@ -3652,9 +3646,9 @@ checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "plotters" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a" +checksum = "32a3fd9ec30b9749ce28cd91f255d569591cdf937fe280c312143e3c4bad6f2a" dependencies = [ "num-traits", "plotters-backend", @@ -3665,32 +3659,19 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590" +checksum = "d88417318da0eaf0fdcdb51a0ee6c3bed624333bff8f946733049380be67ac1c" [[package]] name = "plotters-svg" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211" +checksum = "521fa9638fa597e1dc53e9412a4f9cefb01187ee1f7413076f9e6749e2885ba9" dependencies = [ "plotters-backend", ] -[[package]] -name = "polling" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a7bc6b2a29e632e45451c941832803a18cce6781db04de8a04696cdca8bde4" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "log 0.4.11", - "wepoll-sys", - "winapi 0.3.9", -] - [[package]] name = "poseidon_hash" version = "0.0.1" @@ -3712,15 +3693,15 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" +checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "primitive-types" -version = "0.7.2" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55c21c64d0eaa4d7ed885d959ef2d62d9e488c27c0e02d9aa5ce6c877b7d5f8" +checksum = "2415937401cb030a2a0a4d922483f945fa068f52a7dbb22ce0fe5f2b6f6adace" dependencies = [ "fixed-hash", "impl-codec", @@ -3738,6 +3719,16 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-crate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" +dependencies = [ + "thiserror", + "toml", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -3748,7 +3739,7 @@ dependencies = [ "proc-macro2", "quote", "syn", - "version_check 0.9.2", + "version_check 0.9.3", ] [[package]] @@ -3759,7 +3750,7 @@ checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ "proc-macro2", "quote", - "version_check 0.9.2", + "version_check 0.9.3", ] [[package]] @@ -3770,15 +3761,15 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" +checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" [[package]] name = "proc-macro2" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec" +checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038" dependencies = [ "unicode-xid", ] @@ -3800,30 +3791,30 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quick-error" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quote" -version = "1.0.7" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" +checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" dependencies = [ "proc-macro2", ] [[package]] name = "radium" -version = "0.3.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" [[package]] name = "radium" -version = "0.5.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" +checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" [[package]] name = "rand" @@ -3848,19 +3839,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "rand" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" -dependencies = [ - "cloudabi 0.0.3", - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "winapi 0.3.9", -] - [[package]] name = "rand" version = "0.6.5" @@ -3875,7 +3853,7 @@ dependencies = [ "rand_isaac", "rand_jitter", "rand_os", - "rand_pcg 0.1.2", + "rand_pcg", "rand_xorshift", "winapi 0.3.9", ] @@ -3886,12 +3864,23 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom 0.1.15", + "getrandom 0.1.16", "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc 0.2.0", - "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]] @@ -3914,6 +3903,16 @@ 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" @@ -3935,7 +3934,16 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom 0.1.15", + "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", ] [[package]] @@ -3956,6 +3964,15 @@ 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" @@ -3982,7 +3999,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" dependencies = [ - "cloudabi 0.0.3", + "cloudabi", "fuchsia-cprng", "libc", "rand_core 0.4.2", @@ -4000,15 +4017,6 @@ dependencies = [ "rand_core 0.4.2", ] -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - [[package]] name = "rand_xorshift" version = "0.1.1" @@ -4029,25 +4037,25 @@ dependencies = [ [[package]] name = "rayon" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf6960dc9a5b4ee8d3e4c5787b4a112a8818e0290a42ff664ad60692fdf2032" +checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" dependencies = [ "autocfg 1.0.1", - "crossbeam-deque", + "crossbeam-deque 0.8.0", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.8.1" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8c4fec834fb6e6d2dd5eece3c7b432a52f0ba887cf40e595190c4107edc08bf" +checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" dependencies = [ - "crossbeam-channel 0.4.4", - "crossbeam-deque", - "crossbeam-utils 0.7.2", + "crossbeam-channel 0.5.1", + "crossbeam-deque 0.8.0", + "crossbeam-utils 0.8.5", "lazy_static", "num_cpus", ] @@ -4069,7 +4077,7 @@ dependencies = [ "franklin-crypto", "hex", "once_cell", - "sha2 0.9.1", + "sha2 0.9.5", ] [[package]] @@ -4078,6 +4086,15 @@ 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 = "regen-root-hash" version = "1.0.0" @@ -4091,7 +4108,7 @@ dependencies = [ "serde", "serde_json", "structopt", - "tokio 0.2.22", + "tokio 0.2.25", "zksync_circuit", "zksync_crypto", "zksync_storage", @@ -4101,31 +4118,29 @@ dependencies = [ [[package]] name = "regex" -version = "1.4.1" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b" +checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" dependencies = [ "aho-corasick", "memchr", "regex-syntax", - "thread_local", ] [[package]] name = "regex-automata" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "byteorder", "regex-syntax", ] [[package]] name = "regex-syntax" -version = "0.6.20" +version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c" +checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" [[package]] name = "remove_dir_all" @@ -4138,34 +4153,69 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.10.8" +version = "0.10.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" +dependencies = [ + "base64 0.13.0", + "bytes 0.5.6", + "encoding_rs", + "futures-core", + "futures-util", + "http 0.2.4", + "http-body 0.3.1", + "hyper 0.13.10", + "hyper-tls 0.4.3", + "ipnet", + "js-sys", + "lazy_static", + "log 0.4.14", + "mime 0.3.16", + "mime_guess", + "native-tls", + "percent-encoding 2.1.0", + "pin-project-lite 0.2.7", + "serde", + "serde_json", + "serde_urlencoded", + "tokio 0.2.25", + "tokio-tls 0.3.1", + "url 2.2.2", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg 0.7.0", +] + +[[package]] +name = "reqwest" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e" +checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22" dependencies = [ - "base64 0.12.3", - "bytes 0.5.6", + "base64 0.13.0", + "bytes 1.0.1", "encoding_rs", "futures-core", "futures-util", - "http 0.2.1", - "http-body 0.3.1", - "hyper 0.13.8", - "hyper-tls", + "http 0.2.4", + "http-body 0.4.2", + "hyper 0.14.9", + "hyper-tls 0.5.0", "ipnet", "js-sys", "lazy_static", - "log 0.4.11", + "log 0.4.14", "mime 0.3.16", - "mime_guess", "native-tls", "percent-encoding 2.1.0", - "pin-project-lite 0.1.11", + "pin-project-lite 0.2.7", "serde", "serde_json", "serde_urlencoded", - "tokio 0.2.22", - "tokio-tls 0.3.1", - "url 2.2.1", + "tokio 1.8.0", + "tokio-native-tls 0.3.0", + "url 2.2.2", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -4179,7 +4229,7 @@ source = "git+https://github.com/matter-labs/rescue-poseidon.git?branch=stable#3 dependencies = [ "byteorder", "franklin-crypto", - "num-bigint 0.3.1", + "num-bigint 0.3.2", "num-integer", "num-iter", "num-traits", @@ -4189,9 +4239,9 @@ dependencies = [ [[package]] name = "resolv-conf" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11834e137f3b14e309437a8276714eed3a80d1ef894869e510f2c0c0b98b9f4a" +checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" dependencies = [ "hostname", "quick-error 1.2.3", @@ -4214,21 +4264,22 @@ dependencies = [ [[package]] name = "ripemd160" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5112e0dbbb87577bfbc56c42450235e3012ce336e29c5befd7807bd626da4a" +checksum = "2eca4ecc81b7f313189bf73ce724400a07da2a6dac19588b03c8bd76a2dcc251" dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "opaque-debug 0.2.3", + "block-buffer 0.9.0", + "digest 0.9.0", + "opaque-debug 0.3.0", ] [[package]] name = "rlp" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1190dcc8c3a512f1eef5d09bb8c84c7f39e1054e174d1795482e18f5272f2e73" +checksum = "e54369147e3e7796c9b885c7304db87ca3d09a0a98f72843d532868675bbfba8" dependencies = [ + "bytes 1.0.1", "rustc-hex", ] @@ -4242,14 +4293,14 @@ dependencies = [ "libc", "rand 0.3.23", "rustc-serialize", - "time 0.1.44", + "time 0.1.43", ] [[package]] name = "rustc-demangle" -version = "0.1.17" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2610b7f643d18c87dff3b489950269617e6601a51f1f05aa5daefee36f64f0b" +checksum = "dead70b0b5e03e9c814bcb6b01e03e68f7c57a80aa48c72ec92152ab3e818d49" [[package]] name = "rustc-hex" @@ -4272,11 +4323,20 @@ dependencies = [ "semver 0.9.0", ] +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver 1.0.3", +] + [[package]] name = "rustversion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd" +checksum = "61b3909d758bb75c79f23d4736fac9433868679d3ad2ea7a61e3c25cfda9a088" [[package]] name = "ryu" @@ -4290,6 +4350,15 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +[[package]] +name = "salsa20" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "399f290ffc409596022fce5ea5d4138184be4784f2b28c62c59f0d8389059a15" +dependencies = [ + "cipher", +] + [[package]] name = "same-file" version = "1.0.6" @@ -4317,15 +4386,18 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scrypt" -version = "0.2.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "656c79d0e90d0ab28ac86bf3c3d10bfbbac91450d3f190113b4e76d9fec3cfdd" +checksum = "8da492dab03f925d977776a0b7233d7b934d6dc2b94faead48928e2e9bacedb9" dependencies = [ - "byte-tools", - "byteorder", - "hmac 0.7.1", + "base64 0.13.0", + "hmac 0.10.1", "pbkdf2", - "sha2 0.8.2", + "rand 0.7.3", + "rand_core 0.5.1", + "salsa20", + "sha2 0.9.5", + "subtle 2.4.0", ] [[package]] @@ -4333,9 +4405,18 @@ name = "secp256k1" version = "0.17.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2932dc07acd2066ff2e3921a4419606b220ba6cd03a9935123856cc534877056" +dependencies = [ + "secp256k1-sys 0.1.2", +] + +[[package]] +name = "secp256k1" +version = "0.20.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a" dependencies = [ "rand 0.6.5", - "secp256k1-sys", + "secp256k1-sys 0.4.1", ] [[package]] @@ -4347,11 +4428,20 @@ dependencies = [ "cc", ] +[[package]] +name = "secp256k1-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "827cb7cce42533829c792fc51b82fbf18b125b45a702ef2c8be77fce65463a7b" +dependencies = [ + "cc", +] + [[package]] name = "security-framework" -version = "0.4.4" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" +checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" dependencies = [ "bitflags", "core-foundation", @@ -4362,9 +4452,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "0.4.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" +checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" dependencies = [ "core-foundation-sys", "libc", @@ -4385,10 +4475,16 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" dependencies = [ - "semver-parser 0.10.0", + "semver-parser 0.10.2", "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" @@ -4397,12 +4493,11 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "semver-parser" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e012c6c5380fb91897ba7b9261a0f565e624e869d42fe1a1d03fa0d68a083d5" +checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" dependencies = [ "pest", - "pest_derive", ] [[package]] @@ -4411,8 +4506,8 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "933beb0343c84eefd69a368318e9291b179e09e51982d49c65d7b362b0e9466f" dependencies = [ - "httpdate", - "reqwest", + "httpdate 0.3.2", + "reqwest 0.10.10", "sentry-backtrace", "sentry-contexts", "sentry-core", @@ -4452,7 +4547,7 @@ dependencies = [ "lazy_static", "libc", "regex", - "rustc_version", + "rustc_version 0.2.3", "sentry-core", "uname", ] @@ -4492,15 +4587,15 @@ dependencies = [ "serde", "serde_json", "thiserror", - "url 2.2.1", + "url 2.2.2", "uuid", ] [[package]] name = "serde" -version = "1.0.125" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" +checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" dependencies = [ "serde_derive", ] @@ -4517,9 +4612,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.125" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" +checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" dependencies = [ "proc-macro2", "quote", @@ -4528,9 +4623,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.59" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95" +checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" dependencies = [ "indexmap", "itoa", @@ -4540,9 +4635,9 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc6b7951b17b051f3210b063f12cc17320e2fe30ae05b0fe2a3abb068551c76" +checksum = "98d0516900518c29efa217c298fa1f4e6c6ffc85ae29fd7f4ee48f176e1a9ed5" dependencies = [ "proc-macro2", "quote", @@ -4551,21 +4646,21 @@ dependencies = [ [[package]] name = "serde_urlencoded" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" +checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" dependencies = [ - "dtoa", + "form_urlencoded", "itoa", + "ryu", "serde", - "url 2.2.1", ] [[package]] name = "serde_with" -version = "1.9.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33d14cb8c1b03d86e97ecbb3128d3e2f81fd8f02805680537b8d9ccb7dd8960b" +checksum = "1ad9fdbb69badc8916db738c25efd04f0a65297d26c2f8de4b62e57b8c12bc72" dependencies = [ "rustversion", "serde", @@ -4574,9 +4669,9 @@ dependencies = [ [[package]] name = "serde_with_macros" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48b35457e9d855d3dc05ef32a73e0df1e2c0fd72c38796a4ee909160c8eeec2" +checksum = "e1569374bd54623ec8bd592cf22ba6e03c0f177ff55fbc8c29a49e296e7adecf" dependencies = [ "darling", "proc-macro2", @@ -4598,13 +4693,13 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.1" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "170a36ea86c864a3f16dd2687712dd6646f7019f301e57537c7f4dc9f5916770" +checksum = "8c4cfa741c5832d0ef7fab46cabed29c2aae926db0b11bb2069edd8db5e64e16" dependencies = [ "block-buffer 0.9.0", - "cfg-if 0.1.10", - "cpuid-bool", + "cfg-if 1.0.0", + "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -4629,13 +4724,13 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.1" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2933378ddfeda7ea26f48c555bdad8bb446bf8a3d17832dc83e380d444cfb8c1" +checksum = "b362ae5752fd2137731f9fa25fd4d9058af34666ca1966fb969119cc35719f12" dependencies = [ "block-buffer 0.9.0", - "cfg-if 0.1.10", - "cpuid-bool", + "cfg-if 1.0.0", + "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", ] @@ -4663,11 +4758,10 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.2.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e12110bc539e657a646068aaf5eb5b63af9d0c1f7b29c97113fad80e15f035" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" dependencies = [ - "arc-swap", "libc", ] @@ -4684,9 +4778,9 @@ dependencies = [ [[package]] name = "sized-chunks" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e65d6a9f13cd78f361ea5a2cf53a45d67cdda421ba0316b9be101560f3d207" +checksum = "16d69225bde7a69b235da73377861095455d298f2b970996eec25ddbb42b3d1e" dependencies = [ "bitmaps", "typenum", @@ -4694,24 +4788,24 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527" [[package]] name = "smallvec" -version = "0.6.13" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" +checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" dependencies = [ "maybe-uninit", ] [[package]] name = "smallvec" -version = "1.4.2" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "socket2" @@ -4724,6 +4818,16 @@ 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" @@ -4732,11 +4836,11 @@ checksum = "b5c71ed3d54db0a699f4948e1bb3e45b450fa31fe602621dee6680361d569c88" dependencies = [ "base64 0.12.3", "bytes 0.5.6", - "futures 0.3.6", + "futures 0.3.15", "httparse", - "log 0.4.11", + "log 0.4.14", "rand 0.7.3", - "sha-1 0.9.1", + "sha-1 0.9.6", ] [[package]] @@ -4753,13 +4857,15 @@ checksum = "c85070f382340e8b23a75808e83573ddf65f9ad9143df9573ca37c1ed2ee956a" [[package]] name = "sqlformat" -version = "0.1.1" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f699301eec598ffd6c39832cca1416381ea459ac73c506f6ca74c8750fb52969" +checksum = "6d86e3c77ff882a828346ba401a7ef4b8e440df804491c6064fe8295765de71c" dependencies = [ "lazy_static", "maplit", + "nom 6.1.2", "regex", + "unicode_categories", ] [[package]] @@ -4778,7 +4884,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36bb6a2ca3345a86493bc3b71eabc2c6c16a8bb1aa476cf5303bee27f67627d7" dependencies = [ - "ahash 0.6.2", + "ahash 0.6.3", "atoi", "base64 0.13.0", "bigdecimal", @@ -4786,9 +4892,9 @@ dependencies = [ "byteorder", "bytes 0.5.6", "chrono", - "crossbeam-channel 0.5.0", - "crossbeam-queue 0.3.1", - "crossbeam-utils 0.8.1", + "crossbeam-channel 0.5.1", + "crossbeam-queue 0.3.2", + "crossbeam-utils 0.8.5", "either", "futures-channel", "futures-core", @@ -4798,24 +4904,24 @@ dependencies = [ "hmac 0.10.1", "itoa", "libc", - "log 0.4.11", + "log 0.4.14", "md-5", "memchr", - "num-bigint 0.3.1", + "num-bigint 0.3.2", "once_cell", - "parking_lot 0.11.0", + "parking_lot 0.11.1", "percent-encoding 2.1.0", "rand 0.7.3", "serde", "serde_json", - "sha-1 0.9.1", - "sha2 0.9.1", - "smallvec 1.4.2", + "sha-1 0.9.6", + "sha2 0.9.5", + "smallvec 1.6.1", "sqlformat", "sqlx-rt", "stringprep", "thiserror", - "url 2.2.1", + "url 2.2.2", "whoami", ] @@ -4828,7 +4934,7 @@ dependencies = [ "cargo_metadata", "dotenv", "either", - "futures 0.3.6", + "futures 0.3.15", "heck", "hex", "lazy_static", @@ -4836,11 +4942,11 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.9.1", + "sha2 0.9.5", "sqlx-core", "sqlx-rt", "syn", - "url 2.2.1", + "url 2.2.2", ] [[package]] @@ -4851,17 +4957,17 @@ checksum = "63fc5454c9dd7aaea3a0eeeb65ca40d06d0d8e7413a8184f7c3a3ffa5056190b" dependencies = [ "native-tls", "once_cell", - "tokio 0.2.22", - "tokio-native-tls", + "tokio 0.2.25", + "tokio-native-tls 0.1.0", ] [[package]] name = "standback" -version = "0.2.11" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e0831040d2cf2bdfd51b844be71885783d489898a192f254ae25d57cce725c" +checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" dependencies = [ - "version_check 0.9.2", + "version_check 0.9.3", ] [[package]] @@ -4877,7 +4983,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" dependencies = [ "discard", - "rustc_version", + "rustc_version 0.2.3", "stdweb-derive", "stdweb-internal-macros", "stdweb-internal-runtime", @@ -4919,15 +5025,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" -[[package]] -name = "stream-cipher" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c" -dependencies = [ - "generic-array 0.12.3", -] - [[package]] name = "string" version = "0.2.1" @@ -4961,9 +5058,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "structopt" -version = "0.3.20" +version = "0.3.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126d630294ec449fae0b16f964e35bf3c74f940da9dca17ee9b905f7b3112eb8" +checksum = "69b041cdcb67226aca307e6e7be44c8806423d83e018bd662360a93dabce4d71" dependencies = [ "clap", "lazy_static", @@ -4972,9 +5069,9 @@ dependencies = [ [[package]] name = "structopt-derive" -version = "0.4.13" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65e51c492f9e23a220534971ff5afc14037289de430e3c83f9daf6a1b6ae91e8" +checksum = "7813934aecf5f51a54775e00068c237de98489463968231a51746bbbc03f9c10" dependencies = [ "heck", "proc-macro-error", @@ -4991,15 +5088,15 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" [[package]] name = "subtle" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343f3f510c2915908f155e94f17220b19ccfacf2a64a2a5d8004f2c3e311e7fd" +checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" [[package]] name = "syn" -version = "1.0.72" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" +checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" dependencies = [ "proc-macro2", "quote", @@ -5020,20 +5117,20 @@ dependencies = [ [[package]] name = "tap" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36474e732d1affd3a6ed582781b3683df3d0563714c59c39591e8ff707cf078e" +checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "rand 0.7.3", - "redox_syscall", + "rand 0.8.4", + "redox_syscall 0.2.9", "remove_dir_all", "winapi 0.3.9", ] @@ -5049,18 +5146,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.21" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42" +checksum = "93119e4feac1cbe6c798c34d3a53ea0026b0b1de6a120deef895137c0529bfe2" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.21" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab" +checksum = "060d69a0afe7796bf42e9e2ff91f5ee691fb15c53d38b4b62a9a53eb23164745" dependencies = [ "proc-macro2", "quote", @@ -5069,11 +5166,11 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.0.1" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] @@ -5087,27 +5184,26 @@ dependencies = [ [[package]] name = "time" -version = "0.1.44" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" dependencies = [ "libc", - "wasi 0.10.0+wasi-snapshot-preview1", "winapi 0.3.9", ] [[package]] name = "time" -version = "0.2.22" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55b7151c9065e80917fbf285d9a5d1432f60db41d170ccafc749a136b41a93af" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" dependencies = [ "const_fn", "libc", "standback", "stdweb", "time-macros", - "version_check 0.9.2", + "version_check 0.9.3", "winapi 0.3.9", ] @@ -5123,9 +5219,9 @@ dependencies = [ [[package]] name = "time-macros-impl" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa" +checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" dependencies = [ "proc-macro-hack", "proc-macro2", @@ -5154,9 +5250,9 @@ dependencies = [ [[package]] name = "tinytemplate" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d3dc76004a03cec1c5932bca4cdc2e39aaa798e3f82363dd94f9adf6098c12f" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" dependencies = [ "serde", "serde_json", @@ -5164,15 +5260,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" - -[[package]] -name = "tinyvec" -version = "1.0.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b78a366903f506d2ad52ca8dc552102ffdd3e937ba8a227f024dc1d1eae28575" +checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" dependencies = [ "tinyvec_macros", ] @@ -5190,8 +5280,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", - "mio", + "futures 0.1.31", + "mio 0.6.23", "num_cpus", "tokio-codec", "tokio-current-thread", @@ -5209,9 +5299,9 @@ dependencies = [ [[package]] name = "tokio" -version = "0.2.22" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d34ca54d84bf2b5b4d7d31e901a8464f7b60ac145a284fba25ceb801f2ddccd" +checksum = "6703a273949a90131b290be1fe7b039d0fc884aa1935860dfcbe056f28cd8092" dependencies = [ "bytes 0.5.6", "fnv", @@ -5220,25 +5310,35 @@ dependencies = [ "lazy_static", "libc", "memchr", - "mio", + "mio 0.6.23", "mio-named-pipes", "mio-uds", "num_cpus", - "pin-project-lite 0.1.11", + "pin-project-lite 0.1.12", "signal-hook-registry", "slab", - "tokio-macros", + "tokio-macros 0.2.6", "winapi 0.3.9", ] [[package]] name = "tokio" -version = "1.1.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8efab2086f17abcddb8f756117665c958feee6b2e39974c2f1600592ab3a4195" +checksum = "570c2eb13b3ab38208130eccd41be92520388791207fde783bda7c1e8ace28d4" dependencies = [ "autocfg 1.0.1", - "pin-project-lite 0.2.4", + "bytes 1.0.1", + "libc", + "memchr", + "mio 0.7.13", + "num_cpus", + "once_cell", + "parking_lot 0.11.1", + "pin-project-lite 0.2.7", + "signal-hook-registry", + "tokio-macros 1.2.0", + "winapi 0.3.9", ] [[package]] @@ -5249,7 +5349,7 @@ checksum = "8fb220f46c53859a4b7ec083e41dec9778ff0b1851c0942b211edb89e0ccdc46" dependencies = [ "bytes 0.4.12", "either", - "futures 0.1.30", + "futures 0.1.31", ] [[package]] @@ -5259,7 +5359,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "tokio-io", ] @@ -5269,7 +5369,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "tokio-executor", ] @@ -5280,7 +5380,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" dependencies = [ "crossbeam-utils 0.7.2", - "futures 0.1.30", + "futures 0.1.31", ] [[package]] @@ -5289,7 +5389,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "tokio-io", "tokio-threadpool", ] @@ -5301,15 +5401,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", - "log 0.4.11", + "futures 0.1.31", + "log 0.4.14", ] [[package]] name = "tokio-macros" -version = "0.2.5" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tokio-macros" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" +checksum = "c49e3df43841dafb86046472506755d8501c5615673955f6aa17181125d13c37" dependencies = [ "proc-macro2", "quote", @@ -5323,7 +5434,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd608593a919a8e05a7d1fc6df885e40f6a88d3a70a3a7eff23ff27964eda069" dependencies = [ "native-tls", - "tokio 0.2.22", + "tokio 0.2.25", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" +dependencies = [ + "native-tls", + "tokio 1.8.0", ] [[package]] @@ -5333,10 +5454,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" dependencies = [ "crossbeam-utils 0.7.2", - "futures 0.1.30", + "futures 0.1.31", "lazy_static", - "log 0.4.11", - "mio", + "log 0.4.14", + "mio 0.6.23", "num_cpus", "parking_lot 0.9.0", "slab", @@ -5345,6 +5466,17 @@ dependencies = [ "tokio-sync", ] +[[package]] +name = "tokio-stream" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8864d706fdb3cc0843a49647ac892720dac98a6eeb818b77190592cf4994066" +dependencies = [ + "futures-core", + "pin-project-lite 0.2.7", + "tokio 1.8.0", +] + [[package]] name = "tokio-sync" version = "0.1.8" @@ -5352,7 +5484,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" dependencies = [ "fnv", - "futures 0.1.30", + "futures 0.1.31", ] [[package]] @@ -5362,9 +5494,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "iovec", - "mio", + "mio 0.6.23", "tokio-io", "tokio-reactor", ] @@ -5375,12 +5507,12 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" dependencies = [ - "crossbeam-deque", + "crossbeam-deque 0.7.3", "crossbeam-queue 0.2.3", "crossbeam-utils 0.7.2", - "futures 0.1.30", + "futures 0.1.31", "lazy_static", - "log 0.4.11", + "log 0.4.14", "num_cpus", "slab", "tokio-executor", @@ -5393,7 +5525,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" dependencies = [ "crossbeam-utils 0.7.2", - "futures 0.1.30", + "futures 0.1.31", "slab", "tokio-executor", ] @@ -5404,7 +5536,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "354b8cd83825b3c20217a9dc174d6a0c67441a2fae5c41bcb1ea6679f6ae0f7c" dependencies = [ - "futures 0.1.30", + "futures 0.1.31", "native-tls", "tokio-io", ] @@ -5416,7 +5548,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a70f4fcd7b3b24fb194f837560168208f669ca8cb70d0c4b862944452396343" dependencies = [ "native-tls", - "tokio 0.2.22", + "tokio 0.2.25", ] [[package]] @@ -5426,9 +5558,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", - "log 0.4.11", - "mio", + "futures 0.1.31", + "log 0.4.14", + "mio 0.6.23", "tokio-codec", "tokio-io", "tokio-reactor", @@ -5441,11 +5573,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "iovec", "libc", - "log 0.4.11", - "mio", + "log 0.4.14", + "mio 0.6.23", "mio-uds", "tokio-codec", "tokio-io", @@ -5462,44 +5594,59 @@ dependencies = [ "futures-core", "futures-io", "futures-sink", - "log 0.4.11", - "pin-project-lite 0.1.11", - "tokio 0.2.22", + "log 0.4.14", + "pin-project-lite 0.1.12", + "tokio 0.2.25", +] + +[[package]] +name = "tokio-util" +version = "0.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592" +dependencies = [ + "bytes 1.0.1", + "futures-core", + "futures-io", + "futures-sink", + "log 0.4.14", + "pin-project-lite 0.2.7", + "tokio 1.8.0", ] [[package]] name = "toml" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645" +checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" dependencies = [ "serde", ] [[package]] name = "tower-service" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e987b6bf443f4b5b3b6f38704195592cca41c5bb7aedd3c3693c7081f8289860" +checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.22" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f47026cdc4080c07e49b37087de021820269d996f581aac150ef9e5583eefe3" +checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d" dependencies = [ "cfg-if 1.0.0", - "log 0.4.11", - "pin-project-lite 0.2.4", + "log 0.4.14", + "pin-project-lite 0.2.7", "tracing-attributes", "tracing-core", ] [[package]] name = "tracing-attributes" -version = "0.1.11" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e0ccfc3378da0cce270c946b676a376943f5cd16aeba64568e7939806f4ada" +checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2" dependencies = [ "proc-macro2", "quote", @@ -5508,21 +5655,31 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.17" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" +checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052" 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.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e0f8c7178e13481ff6765bd169b33e8d554c5d2bbede5e32c356194be02b9b9" +checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" dependencies = [ "lazy_static", - "log 0.4.11", + "log 0.4.14", "tracing-core", ] @@ -5538,9 +5695,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.2.15" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1fa8f0c8f4c594e4fc9debc1990deab13238077271ba84dd853d54902ee3401" +checksum = "ab69019741fca4d98be3c62d2b75254528b5432233fd8a4d2739fec20278de48" dependencies = [ "ansi_term 0.12.1", "chrono", @@ -5550,7 +5707,7 @@ dependencies = [ "serde", "serde_json", "sharded-slab", - "smallvec 1.4.2", + "smallvec 1.6.1", "thread_local", "tracing", "tracing-core", @@ -5566,41 +5723,40 @@ checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" [[package]] name = "trust-dns-proto" -version = "0.19.5" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdd7061ba6f4d4d9721afedffbfd403f20f39a4301fee1b70d6fcd09cca69f28" +checksum = "1cad71a0c0d68ab9941d2fb6e82f8fb2e86d9945b94e1661dd0aaea2b88215a9" dependencies = [ "async-trait", - "backtrace", + "cfg-if 1.0.0", "enum-as-inner", - "futures 0.3.6", - "idna 0.2.0", + "futures 0.3.15", + "idna 0.2.3", "lazy_static", - "log 0.4.11", + "log 0.4.14", "rand 0.7.3", - "smallvec 1.4.2", + "smallvec 1.6.1", "thiserror", - "tokio 0.2.22", - "url 2.2.1", + "tokio 0.2.25", + "url 2.2.2", ] [[package]] name = "trust-dns-resolver" -version = "0.19.5" +version = "0.19.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f23cdfdc3d8300b3c50c9e84302d3bd6d860fb9529af84ace6cf9665f181b77" +checksum = "710f593b371175db53a26d0b38ed2978fafb9e9e8d3868b1acd753ea18df0ceb" dependencies = [ - "backtrace", "cfg-if 0.1.10", - "futures 0.3.6", + "futures 0.3.15", "ipconfig", "lazy_static", - "log 0.4.11", + "log 0.4.14", "lru-cache", "resolv-conf", - "smallvec 1.4.2", + "smallvec 1.6.1", "thiserror", - "tokio 0.2.22", + "tokio 0.2.25", "trust-dns-proto", ] @@ -5618,9 +5774,9 @@ checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" [[package]] name = "typenum" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" +checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" [[package]] name = "ucd-trie" @@ -5630,13 +5786,13 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" [[package]] name = "uint" -version = "0.8.5" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9db035e67dfaf7edd9aebfe8676afcd63eed53c8a4044fed514c8cccf1835177" +checksum = "6470ab50f482bde894a037a57064480a246dbfdd5960bd65a44824693f08da5f" dependencies = [ "byteorder", "crunchy", - "rustc-hex", + "hex", "static_assertions", ] @@ -5664,32 +5820,32 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" dependencies = [ - "version_check 0.9.2", + "version_check 0.9.3", ] [[package]] name = "unicode-bidi" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" dependencies = [ "matches", ] [[package]] name = "unicode-normalization" -version = "0.1.13" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" dependencies = [ - "tinyvec 0.3.4", + "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e83e153d1053cbb5a118eeff7fd5be06ed99153f00dbcd8ae310c5fb2b22edc0" +checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" [[package]] name = "unicode-width" @@ -5699,9 +5855,15 @@ checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" [[package]] name = "unicode-xid" -version = "0.2.1" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" + +[[package]] +name = "unicode_categories" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] name = "untrusted" @@ -5722,12 +5884,12 @@ dependencies = [ [[package]] name = "url" -version = "2.2.1" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" +checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" dependencies = [ "form_urlencoded", - "idna 0.2.0", + "idna 0.2.3", "matches", "percent-encoding 2.1.0", "serde", @@ -5739,21 +5901,15 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.0", + "getrandom 0.2.3", "serde", ] [[package]] name = "vcpkg" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" - -[[package]] -name = "vec-arena" -version = "1.0.0" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eafc1b9b2dfc6f5529177b62cf806484db55b32dc7c9658a118e11bbeb33061d" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "vec_map" @@ -5769,9 +5925,9 @@ checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" [[package]] name = "version_check" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" [[package]] name = "vlog" @@ -5783,17 +5939,11 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - [[package]] name = "walkdir" -version = "2.3.1" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" dependencies = [ "same-file", "winapi 0.3.9", @@ -5806,8 +5956,8 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6395efa4784b027708f7451087e647ec73cc74f5d9bc2e418404248d679a230" dependencies = [ - "futures 0.1.30", - "log 0.4.11", + "futures 0.1.31", + "log 0.4.14", "try-lock", ] @@ -5817,7 +5967,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" dependencies = [ - "log 0.4.11", + "log 0.4.14", "try-lock", ] @@ -5829,17 +5979,17 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" +version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.68" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ac64ead5ea5f05873d7c12b545865ca2b8d28adfc50a49b84770a3a97265d42" +checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "serde", "serde_json", "wasm-bindgen-macro", @@ -5847,13 +5997,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.68" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f22b422e2a757c35a73774860af8e112bff612ce6cb604224e8e47641a9e4f68" +checksum = "3b33f6a0694ccfea53d94db8b2ed1c3a8a4c86dd936b13b9f0a15ec4a451b900" dependencies = [ "bumpalo", "lazy_static", - "log 0.4.11", + "log 0.4.14", "proc-macro2", "quote", "syn", @@ -5862,11 +6012,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.18" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7866cab0aa01de1edf8b5d7936938a7e397ee50ce24119aef3e1eaa3b6171da" +checksum = "5fba7978c679d53ce2d0ac80c8c175840feb849a161664365d1287b41f2e67f1" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "js-sys", "wasm-bindgen", "web-sys", @@ -5874,9 +6024,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.68" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b13312a745c08c469f0b292dd2fcd6411dba5f7160f593da6ef69b64e407038" +checksum = "088169ca61430fe1e58b8096c24975251700e7b1f6fd91cc9d59b04fb9b18bd4" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5884,9 +6034,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.68" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f249f06ef7ee334cc3b8ff031bfc11ec99d00f34d86da7498396dc1e3b1498fe" +checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" dependencies = [ "proc-macro2", "quote", @@ -5897,15 +6047,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.68" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d649a3145108d7d3fbcde896a468d1bd636791823c9921135218ad89be08307" +checksum = "d7cff876b8f18eed75a66cf49b65e7f967cb354a7aa16003fb55dbfd25b44b4f" [[package]] name = "web-sys" -version = "0.3.45" +version = "0.3.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bf6ef87ad7ae8008e15a355ce696bed26012b7caa21605188cfd8214ab51e2d" +checksum = "e828417b379f3df7111d3a2a9e5753706cae29c41f7c4029ee9fd77f3e09e582" dependencies = [ "js-sys", "wasm-bindgen", @@ -5913,33 +6063,48 @@ dependencies = [ [[package]] name = "web3" -version = "0.13.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d03f64be59921dbc5791f05af61a87594bb454518fe4e97d827405422279a0" +checksum = "bc4c18ae15621f764fab919f7e4a83d87163494cbc3460884debef7c6bc1bc6b" dependencies = [ - "arrayvec 0.5.1", - "async-native-tls", - "async-std", - "base64 0.12.3", + "arrayvec 0.5.2", + "base64 0.13.0", + "bytes 1.0.1", "derive_more", "ethabi", "ethereum-types", - "futures 0.3.6", + "futures 0.3.15", "futures-timer", - "hyper 0.13.8", - "hyper-tls", - "jsonrpc-core", - "log 0.4.11", - "native-tls", - "parking_lot 0.11.0", + "headers", + "hex", + "jsonrpc-core 17.1.0", + "log 0.4.14", + "parking_lot 0.11.1", + "pin-project 1.0.7", + "reqwest 0.11.4", "rlp", - "rustc-hex", - "secp256k1", + "secp256k1 0.20.3", "serde", "serde_json", "soketto", "tiny-keccak 2.0.2", - "url 2.2.1", + "tokio 1.8.0", + "tokio-stream", + "tokio-util 0.6.7", + "url 2.2.2", + "web3-async-native-tls", +] + +[[package]] +name = "web3-async-native-tls" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f6d8d1636b2627fe63518d5a9b38a569405d9c9bc665c43c9c341de57227ebb" +dependencies = [ + "native-tls", + "thiserror", + "tokio 1.8.0", + "url 2.2.2", ] [[package]] @@ -5949,7 +6114,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413b37840b9e27b340ce91b319ede10731de8c72f5bc4cb0206ec1ca4ce581d0" dependencies = [ "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "hyper 0.10.16", "native-tls", "rand 0.6.5", @@ -5973,7 +6138,7 @@ dependencies = [ "bitflags", "byteorder", "bytes 0.4.12", - "futures 0.1.30", + "futures 0.1.31", "native-tls", "rand 0.6.5", "sha1", @@ -5983,20 +6148,11 @@ dependencies = [ "tokio-tls 0.2.1", ] -[[package]] -name = "wepoll-sys" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff" -dependencies = [ - "cc", -] - [[package]] name = "whoami" -version = "1.0.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e35495e7faf4c657051a8e9725d9c37ac57879e915be3ed55bb401af84382035" +checksum = "4abacf325c958dfeaf1046931d37f2a901b6dfe0968ee965a29e94c6766b2af6" dependencies = [ "wasm-bindgen", "web-sys", @@ -6078,13 +6234,13 @@ dependencies = [ "byteorder", "bytes 0.4.12", "httparse", - "log 0.4.11", - "mio", + "log 0.4.14", + "mio 0.6.23", "mio-extras", "rand 0.7.3", "sha-1 0.8.2", "slab", - "url 2.2.1", + "url 2.2.2", ] [[package]] @@ -6105,9 +6261,9 @@ checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" [[package]] name = "zeroize" -version = "1.1.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05f33972566adbd2d3588b0491eb94b98b43695c4ef897903470ede4f3f5a28a" +checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd" [[package]] name = "zksync" @@ -6117,14 +6273,14 @@ dependencies = [ "async-trait", "ethabi", "hex", - "jsonrpc-core", + "jsonrpc-core 14.2.0", "num", - "reqwest", + "reqwest 0.11.4", "serde", "serde_json", "sha2 0.8.2", "thiserror", - "tokio 0.2.22", + "tokio 0.2.25", "web3", "zksync_config", "zksync_crypto", @@ -6149,11 +6305,11 @@ dependencies = [ "criterion", "ctrlc", "ethabi", - "futures 0.1.30", - "futures 0.3.6", + "futures 0.1.31", + "futures 0.3.15", "hex", "itertools 0.8.2", - "jsonrpc-core", + "jsonrpc-core 14.2.0", "jsonrpc-core-client", "jsonrpc-derive", "jsonrpc-http-server", @@ -6166,7 +6322,7 @@ dependencies = [ "once_cell", "qstring", "regex", - "reqwest", + "reqwest 0.11.4", "serde", "serde_json", "serde_repr", @@ -6174,7 +6330,7 @@ dependencies = [ "thiserror", "tiny-keccak 1.5.0", "tokio 0.1.22", - "tokio 0.2.22", + "tokio 0.2.25", "vlog", "web3", "zksync_api_client", @@ -6200,7 +6356,7 @@ dependencies = [ "chrono", "hex", "num", - "reqwest", + "reqwest 0.11.4", "serde", "serde_json", "thiserror", @@ -6213,9 +6369,9 @@ dependencies = [ name = "zksync_balancer" version = "1.0.0" dependencies = [ - "futures 0.3.6", + "futures 0.3.15", "metrics", - "tokio 0.2.22", + "tokio 0.2.25", ] [[package]] @@ -6252,12 +6408,12 @@ dependencies = [ "chrono", "envy", "num", - "reqwest", + "reqwest 0.11.4", "serde", "serde_json", "toml", "tracing", - "url 2.2.1", + "url 2.2.2", "zksync_crypto", "zksync_types", "zksync_utils", @@ -6282,16 +6438,16 @@ dependencies = [ "chrono", "ctrlc", "ethabi", - "futures 0.3.6", + "futures 0.3.15", "itertools 0.9.0", "metrics", "num", - "reqwest", + "reqwest 0.11.4", "serde", "serde_json", "thiserror", "tiny-keccak 1.5.0", - "tokio 0.2.22", + "tokio 0.2.25", "vlog", "web3", "zksync_balancer", @@ -6339,15 +6495,15 @@ dependencies = [ "chrono", "db_test_macro", "ethabi", - "futures 0.3.6", + "futures 0.3.15", "hex", - "jsonrpc-core", + "jsonrpc-core 14.2.0", "num", "serde", "serde_json", "structopt", "tiny-keccak 1.5.0", - "tokio 0.2.22", + "tokio 0.2.25", "vlog", "web3", "zksync_config", @@ -6369,7 +6525,7 @@ dependencies = [ "metrics", "parity-crypto", "serde", - "tokio 0.2.22", + "tokio 0.2.25", "vlog", "web3", "zksync_config", @@ -6387,14 +6543,14 @@ dependencies = [ "chrono", "ctrlc", "ethabi", - "futures 0.3.6", + "futures 0.3.15", "hex", "lazy_static", "metrics", "num", "serde", "serde_json", - "tokio 0.2.22", + "tokio 0.2.25", "vlog", "web3", "zksync_basic_types", @@ -6415,17 +6571,17 @@ dependencies = [ "actix-rt", "actix-web", "async-trait", - "futures 0.3.6", + "futures 0.3.15", "hex", - "jsonrpc-core", + "jsonrpc-core 14.2.0", "parity-crypto", - "reqwest", + "reqwest 0.11.4", "rlp", "serde", "serde_derive", "serde_json", "thiserror", - "tokio 0.2.22", + "tokio 0.2.25", "zksync_types", ] @@ -6456,10 +6612,10 @@ dependencies = [ "chrono", "ethabi", "hex", - "log 0.4.11", + "log 0.4.14", "metrics", "num", - "tokio 0.2.22", + "tokio 0.2.25", "vlog", "web3", "zksync_api", @@ -6477,10 +6633,10 @@ dependencies = [ name = "zksync_gateway_watcher" version = "1.0.0" dependencies = [ - "futures 0.3.6", + "futures 0.3.15", "metrics", "thiserror", - "tokio 0.2.22", + "tokio 0.2.25", "vlog", "web3", "zksync_config", @@ -6494,10 +6650,10 @@ version = "1.0.0" dependencies = [ "anyhow", "bigdecimal", - "futures 0.3.6", + "futures 0.3.15", "hex", "num", - "reqwest", + "reqwest 0.11.4", "serde", "serde_json", "zksync_types", @@ -6509,12 +6665,12 @@ version = "1.0.0" dependencies = [ "anyhow", "ctrlc", - "futures 0.3.6", + "futures 0.3.15", "metrics", "metrics-exporter-prometheus", "metrics-macros", "metrics-util", - "tokio 0.2.22", + "tokio 0.2.25", "tracing", "vlog", "zksync_config", @@ -6531,16 +6687,16 @@ dependencies = [ "backoff 0.2.1", "chrono", "ctrlc", - "futures 0.3.6", + "futures 0.3.15", "hex", "jsonwebtoken", "num", - "reqwest", + "reqwest 0.11.4", "rust-crypto", "serde", "serde_json", "structopt", - "tokio 0.2.22", + "tokio 0.2.25", "vlog", "web3", "zksync_circuit", @@ -6560,11 +6716,11 @@ dependencies = [ "backoff 0.1.6", "lazy_static", "num", - "reqwest", + "reqwest 0.11.4", "serde", "serde_json", "structopt", - "tokio 0.2.22", + "tokio 0.2.25", "vlog", "zksync_basic_types", "zksync_circuit", @@ -6581,12 +6737,12 @@ version = "1.0.0" dependencies = [ "anyhow", "ctrlc", - "futures 0.3.6", + "futures 0.3.15", "num", "serde", "serde_json", "structopt", - "tokio 0.2.22", + "tokio 0.2.25", "vlog", "zksync_api", "zksync_config", @@ -6640,7 +6796,7 @@ dependencies = [ "serde_json", "sqlx", "thiserror", - "tokio 0.2.22", + "tokio 0.2.25", "vlog", "zksync_basic_types", "zksync_config", @@ -6667,13 +6823,13 @@ version = "1.0.0" dependencies = [ "anyhow", "ethabi", - "futures 0.3.6", + "futures 0.3.15", "itertools 0.9.0", "num", "serde", "serde_json", "structopt", - "tokio 0.2.22", + "tokio 0.2.25", "vlog", "web3", "zksync_circuit", @@ -6703,7 +6859,7 @@ dependencies = [ "num", "once_cell", "parity-crypto", - "secp256k1", + "secp256k1 0.17.2", "serde", "serde_json", "serde_with", @@ -6722,12 +6878,12 @@ version = "1.0.0" dependencies = [ "anyhow", "bigdecimal", - "futures 0.3.6", + "futures 0.3.15", "hex", "num", "serde", "serde_json", - "tokio 0.2.22", + "tokio 0.2.25", ] [[package]] @@ -6741,14 +6897,14 @@ dependencies = [ "async-trait", "chrono", "ctrlc", - "futures 0.3.6", + "futures 0.3.15", "jsonwebtoken", "metrics", "num", - "reqwest", + "reqwest 0.11.4", "serde", "serde_json", - "tokio 0.2.22", + "tokio 0.2.25", "tracing", "vlog", "zksync_circuit", diff --git a/Cargo.toml b/Cargo.toml index 309373b66b..95de288b89 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,7 +45,4 @@ members = [ # SDK section "sdk/zksync-rs" -] - -[patch.crates-io] -ethabi = { git = "https://github.com/dvush/ethabi.git" } +] \ No newline at end of file diff --git a/core/bin/block_revert/Cargo.toml b/core/bin/block_revert/Cargo.toml index e77ee4cc5d..b512d6f58e 100644 --- a/core/bin/block_revert/Cargo.toml +++ b/core/bin/block_revert/Cargo.toml @@ -19,7 +19,7 @@ zksync_eth_client = { path = "../../lib/eth_client", version = "1.0" } zksync_config = { path = "../../lib/config", version = "1.0" } tokio = { version = "0.2", features = ["full"] } -ethabi = "12.0.0" +ethabi = "14.0.0" anyhow = "1.0" -web3 = "0.13.0" +web3 = "0.16.0" structopt = "0.3.20" diff --git a/core/bin/data_restore/Cargo.toml b/core/bin/data_restore/Cargo.toml index 4566b9ef78..3534bbbf95 100644 --- a/core/bin/data_restore/Cargo.toml +++ b/core/bin/data_restore/Cargo.toml @@ -18,8 +18,8 @@ vlog = { path = "../../lib/vlog", version = "1.0" } num = { version = "0.3.1", features = ["serde"] } tiny-keccak = "1.4.2" -ethabi = "12.0.0" -web3 = "0.13.0" +ethabi = "14.0.0" +web3 = "0.16.0" hex = "0.4" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.0" diff --git a/core/bin/data_restore/src/contract/v4.rs b/core/bin/data_restore/src/contract/v4.rs index 17f50105d8..071cb7db0f 100644 --- a/core/bin/data_restore/src/contract/v4.rs +++ b/core/bin/data_restore/src/contract/v4.rs @@ -6,23 +6,23 @@ use zksync_types::{AccountId, BlockNumber, H256}; fn decode_commitment_parameters(input_data: Vec) -> anyhow::Result> { let commit_operation = ParamType::Tuple(vec![ - Box::new(ParamType::FixedBytes(32)), // bytes32 encoded_root, - Box::new(ParamType::Bytes), // bytes calldata _publicData, - Box::new(ParamType::Uint(256)), // uint256 _timestamp, - Box::new(ParamType::Array(Box::new(ParamType::Tuple(vec![ - Box::new(ParamType::Bytes), // bytes eht_witness - Box::new(ParamType::Uint(32)), //uint32 public_data_offset - ])))), - Box::new(ParamType::Uint(32)), // uint32 _blockNumber, - Box::new(ParamType::Uint(32)), // uint32 _feeAccount, + ParamType::FixedBytes(32), // bytes32 encoded_root, + ParamType::Bytes, // bytes calldata _publicData, + ParamType::Uint(256), // uint256 _timestamp, + ParamType::Array(Box::new(ParamType::Tuple(vec![ + ParamType::Bytes, // bytes eht_witness + ParamType::Uint(32), //uint32 public_data_offset + ]))), + ParamType::Uint(32), // uint32 _blockNumber, + ParamType::Uint(32), // uint32 _feeAccount, ]); let stored_block = ParamType::Tuple(vec![ - Box::new(ParamType::Uint(32)), // uint32 blockNumber - Box::new(ParamType::Uint(64)), // uint32 priorityOperations - Box::new(ParamType::FixedBytes(32)), // bytes32 pendingOnchainOperationsHash - Box::new(ParamType::Uint(256)), // uint256 timestamp - Box::new(ParamType::FixedBytes(32)), // bytes32 stateHash - Box::new(ParamType::FixedBytes(32)), // bytes32 commitment + (ParamType::Uint(32)), // uint32 blockNumber + (ParamType::Uint(64)), // uint32 priorityOperations + (ParamType::FixedBytes(32)), // bytes32 pendingOnchainOperationsHash + (ParamType::Uint(256)), // uint256 timestamp + (ParamType::FixedBytes(32)), // bytes32 stateHash + (ParamType::FixedBytes(32)), // bytes32 commitment ]); ethabi::decode( vec![stored_block, ParamType::Array(Box::new(commit_operation))].as_slice(), diff --git a/core/bin/prover/Cargo.toml b/core/bin/prover/Cargo.toml index 5cb7dbba14..17ebe3baf2 100644 --- a/core/bin/prover/Cargo.toml +++ b/core/bin/prover/Cargo.toml @@ -21,7 +21,7 @@ zksync_prover_utils = { path = "../../lib/prover_utils", version = "1.0" } hex = "0.4" rust-crypto = "0.2" -web3 = "0.13.0" +web3 = "0.16.0" tokio = { version = "0.2", features = ["full"] } async-trait = "0.1" futures = "0.3" @@ -33,7 +33,7 @@ serde = "1.0.90" serde_json = "1.0.0" num = { version = "0.3.1", features = ["serde"] } chrono = { version = "0.4", features = ["serde", "rustc-serialize"] } -reqwest = { version = "0.10", features = ["blocking", "json"] } +reqwest = { version = "0.11.0", features = ["blocking", "json"] } jsonwebtoken = "7" anyhow = "1.0" backoff = { version = "0.2.1", features = ["tokio"] } 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/regen-root-hash/Cargo.toml b/core/bin/regen-root-hash/Cargo.toml index f65f626f64..3739c79163 100644 --- a/core/bin/regen-root-hash/Cargo.toml +++ b/core/bin/regen-root-hash/Cargo.toml @@ -17,7 +17,7 @@ zksync_types = { path = "../../lib/types", version = "1.0" } zksync_utils = { path = "../../lib/utils", version = "1.0" } zksync_circuit = { path = "../../lib/circuit", version = "1.0" } zksync_storage = { path = "../../lib/storage", version = "1.0" } -ethabi = "12.0.0" +ethabi = "14.0.0" once_cell = "1.4" anyhow = "1.0" diff --git a/core/bin/zksync_api/Cargo.toml b/core/bin/zksync_api/Cargo.toml index 32bc2cdd5a..78c26db56c 100644 --- a/core/bin/zksync_api/Cargo.toml +++ b/core/bin/zksync_api/Cargo.toml @@ -32,8 +32,8 @@ zksync_gateway_watcher = { path = "../../lib/gateway_watcher", version = "1.0" } vlog = { path = "../../lib/vlog", version = "1.0", features=['actix'] } hex = "0.4" -ethabi = "12.0.0" -web3 = "0.13.0" +ethabi = "14.0.0" +web3 = "0.16.0" serde = "1.0.90" serde_json = "1.0.0" serde_repr = "0.1" @@ -63,7 +63,7 @@ thiserror = "1.0" structopt = "0.3" # TODO: should be removed after json rpc deps are updated is updated, current version (14.0) (ZKS-98). futures01 = { package = "futures", version = "0.1" } -reqwest = { version = "0.10", features = ["blocking", "json"] } +reqwest = { version = "0.11.0", features = ["blocking", "json"] } tiny-keccak = "1.4.2" async-trait = "0.1" jsonwebtoken = "7" diff --git a/core/bin/zksync_core/Cargo.toml b/core/bin/zksync_core/Cargo.toml index a7078e4107..8abb9e357d 100644 --- a/core/bin/zksync_core/Cargo.toml +++ b/core/bin/zksync_core/Cargo.toml @@ -28,8 +28,8 @@ zksync_gateway_watcher = { path = "../../lib/gateway_watcher", version = "1.0" } num = { version = "0.3.1", features = ["serde"] } -ethabi = "12.0.0" -web3 = "0.13.0" +ethabi = "14.0.0" +web3 = "0.16.0" serde = "1.0.90" serde_json = "1.0.0" metrics = "=0.13.0-alpha.8" @@ -41,7 +41,7 @@ tokio = { version = "0.2", features = ["time"] } futures = "0.3" actix-rt = "1.1.1" actix-web = "3.0.0" -reqwest = { version = "0.10", features = ["blocking", "json"] } +reqwest = { version = "0.11.0", features = ["blocking", "json"] } chrono = { version = "0.4", features = ["serde", "rustc-serialize"] } ctrlc = { version = "3.1", features = ["termination"] } anyhow = "1.0" diff --git a/core/bin/zksync_eth_sender/Cargo.toml b/core/bin/zksync_eth_sender/Cargo.toml index f4405c5a8f..1f22845312 100644 --- a/core/bin/zksync_eth_sender/Cargo.toml +++ b/core/bin/zksync_eth_sender/Cargo.toml @@ -23,8 +23,8 @@ zksync_prometheus_exporter = { path = "../../lib/prometheus_exporter", version = zksync_gateway_watcher = { path = "../../lib/gateway_watcher", version = "1.0" } hex = "0.4" -ethabi = "12.0.0" -web3 = "0.13.0" +ethabi = "14.0.0" +web3 = "0.16.0" serde = "1.0.90" serde_json = "1.0.0" metrics = "=0.13.0-alpha.8" diff --git a/core/bin/zksync_forced_exit_requests/Cargo.toml b/core/bin/zksync_forced_exit_requests/Cargo.toml index 305251d5dc..66520d98ee 100644 --- a/core/bin/zksync_forced_exit_requests/Cargo.toml +++ b/core/bin/zksync_forced_exit_requests/Cargo.toml @@ -26,8 +26,8 @@ vlog = { path = "../../lib/vlog", version = "1.0" } zksync_core = { path = "../zksync_core", version = "1.0" } zksync_api = { path = "../zksync_api", version = "1.0" } actix-web = "3.0.0" -ethabi = "12.0.0" -web3 = "0.13.0" +ethabi = "14.0.0" +web3 = "0.16.0" log = "0.4" hex = "0.4" metrics = "0.13.0-alpha.8" diff --git a/core/bin/zksync_witness_generator/Cargo.toml b/core/bin/zksync_witness_generator/Cargo.toml index 2ae3884cb9..1efc58d391 100644 --- a/core/bin/zksync_witness_generator/Cargo.toml +++ b/core/bin/zksync_witness_generator/Cargo.toml @@ -43,4 +43,4 @@ async-trait = "0.1.42" zksync_prover = { path = "../prover", version = "1.0" } num = { version = "0.3.1", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] } -reqwest = { version = "0.10", features = ["blocking"] } +reqwest = { version = "0.11.0", features = ["blocking"] } diff --git a/core/lib/api_client/Cargo.toml b/core/lib/api_client/Cargo.toml index db175f5356..43eac1409e 100644 --- a/core/lib/api_client/Cargo.toml +++ b/core/lib/api_client/Cargo.toml @@ -17,7 +17,7 @@ zksync_crypto = { path = "../../lib/crypto", version = "1.0" } serde = "1.0.90" serde_json = "1.0.0" chrono = { version = "0.4", features = ["serde", "rustc-serialize"] } -reqwest = { version = "0.10", features = ["blocking", "json"] } +reqwest = { version = "0.11.0", features = ["blocking", "json"] } thiserror = "1.0" bigdecimal = { version = "0.2.0", features = ["serde"]} hex = "0.4" diff --git a/core/lib/basic_types/Cargo.toml b/core/lib/basic_types/Cargo.toml index ef8672d9c2..8706846804 100644 --- a/core/lib/basic_types/Cargo.toml +++ b/core/lib/basic_types/Cargo.toml @@ -10,5 +10,5 @@ keywords = ["blockchain", "zksync"] categories = ["cryptography"] [dependencies] -web3 = "0.13.0" +web3 = "0.16.0" serde = { version = "1.0", features = ["derive"] } diff --git a/core/lib/config/Cargo.toml b/core/lib/config/Cargo.toml index b1c147e0ee..aee9b7e614 100644 --- a/core/lib/config/Cargo.toml +++ b/core/lib/config/Cargo.toml @@ -18,7 +18,7 @@ url = "2.1" tracing = "0.1.22" num = "0.3.1" serde = { version = "1.0", features = ["derive"] } -reqwest = "0.10.0" +reqwest = "0.11.0" serde_json = "1.0" envy = "0.4" toml = "0.5" diff --git a/core/lib/contracts/Cargo.toml b/core/lib/contracts/Cargo.toml index 349fca9189..101d1ce550 100644 --- a/core/lib/contracts/Cargo.toml +++ b/core/lib/contracts/Cargo.toml @@ -10,5 +10,5 @@ keywords = ["blockchain", "zksync"] categories = ["cryptography"] [dependencies] -ethabi = "12.0.0" +ethabi = "14.0.0" serde_json = "1.0" diff --git a/core/lib/crypto/Cargo.toml b/core/lib/crypto/Cargo.toml index b8f0bbb0b9..9f800b4be7 100644 --- a/core/lib/crypto/Cargo.toml +++ b/core/lib/crypto/Cargo.toml @@ -18,7 +18,7 @@ rescue_poseidon = { package = "rescue_poseidon", version = "0.3.0", git = "https num = { version = "0.3.1", features = ["serde"] } zksync_basic_types = { path = "../basic_types", version = "1.0" } -ethabi = "12.0.0" +ethabi = "14.0.0" serde = "1.0" thiserror = "1.0" diff --git a/core/lib/eth_client/Cargo.toml b/core/lib/eth_client/Cargo.toml index 55a6efba69..f9355c8aec 100644 --- a/core/lib/eth_client/Cargo.toml +++ b/core/lib/eth_client/Cargo.toml @@ -17,9 +17,9 @@ zksync_contracts = { path = "../contracts", version = "1.0" } vlog = { path = "../../lib/vlog", version = "1.0" } serde = "1.0.90" -ethabi = "12.0.0" -web3 = "0.13.0" -parity-crypto = {version = "0.6.2", features = ["publickey"] } +ethabi = "14.0.0" +web3 = "0.16.0" +parity-crypto = {version = "0.8.0", features = ["publickey"] } hex = "0.4" anyhow = "1.0" diff --git a/core/lib/eth_client/src/clients/http_client.rs b/core/lib/eth_client/src/clients/http_client.rs index 2e76e9f3e3..852ad61d75 100644 --- a/core/lib/eth_client/src/clients/http_client.rs +++ b/core/lib/eth_client/src/clients/http_client.rs @@ -250,12 +250,14 @@ impl ETHDirectClient { let gas_used = receipt.gas_used; let call_request = web3::types::CallRequest { - from: Some(transaction.from), + from: transaction.from, to: transaction.to, gas: Some(transaction.gas), gas_price: Some(transaction.gas_price), value: Some(transaction.value), data: Some(transaction.input), + transaction_type: None, + access_list: None, }; let encoded_revert_reason = self @@ -276,7 +278,6 @@ impl ETHDirectClient { .next() .unwrap() .to_string() - .unwrap() } else { "unknown".to_string() }; diff --git a/core/lib/eth_signer/Cargo.toml b/core/lib/eth_signer/Cargo.toml index b616c6f1dd..7e80db6359 100644 --- a/core/lib/eth_signer/Cargo.toml +++ b/core/lib/eth_signer/Cargo.toml @@ -17,10 +17,10 @@ serde_derive = "1.0.90" serde_json = "1.0.0" hex = "0.4.2" -parity-crypto = {version = "0.6.2", features = ["publickey"] } -rlp = "0.4.0" +parity-crypto = {version = "0.8.0", features = ["publickey"] } +rlp = "0.5.0" -reqwest = { version = "0.10", features = ["json", "blocking"] } +reqwest = { version = "0.11.0", features = ["json", "blocking"] } thiserror = "1.0" jsonrpc-core = "14.0.3" diff --git a/core/lib/eth_signer/src/raw_ethereum_tx.rs b/core/lib/eth_signer/src/raw_ethereum_tx.rs index 8644de4c6e..044bfaa54f 100644 --- a/core/lib/eth_signer/src/raw_ethereum_tx.rs +++ b/core/lib/eth_signer/src/raw_ethereum_tx.rs @@ -50,7 +50,7 @@ impl RawTransaction { let s = &signature.s[s_start..]; tx.append(&s); tx.finalize_unbounded_list(); - tx.out() + tx.out().to_vec() } pub fn hash(&self) -> [u8; 32] { diff --git a/core/lib/gateway_watcher/Cargo.toml b/core/lib/gateway_watcher/Cargo.toml index c6b9218a9e..7d66462e34 100644 --- a/core/lib/gateway_watcher/Cargo.toml +++ b/core/lib/gateway_watcher/Cargo.toml @@ -17,6 +17,6 @@ zksync_utils = { path = "../../lib/utils", version = "1.0" } thiserror = "1.0" futures = "0.3" vlog = { path = "../../lib/vlog", version = "1.0" } -web3 = "0.13.0" +web3 = "0.16.0" tokio = { version = "0.2", features = ["rt-core"] } metrics = "=0.13.0-alpha.8" diff --git a/core/lib/notifier/Cargo.toml b/core/lib/notifier/Cargo.toml index 7502868a36..10b696e7f0 100644 --- a/core/lib/notifier/Cargo.toml +++ b/core/lib/notifier/Cargo.toml @@ -18,7 +18,7 @@ serde_json = "1.0.0" anyhow = "1.0" futures = "0.3" hex = "0.4" -reqwest = { version = "0.10", features = ["blocking", "json"] } +reqwest = { version = "0.11.0", features = ["blocking", "json"] } [dev-dependencies] serde_json = "1.0.0" diff --git a/core/lib/prover_utils/Cargo.toml b/core/lib/prover_utils/Cargo.toml index 28c28359f9..dfc1b5bef3 100644 --- a/core/lib/prover_utils/Cargo.toml +++ b/core/lib/prover_utils/Cargo.toml @@ -20,7 +20,7 @@ zksync_config = { path = "../config", version = "1.0" } lazy_static = "1.2.0" anyhow = "1.0" backoff = "0.1.6" -reqwest = { version = "0.10.6", features = ["blocking"] } +reqwest = { version = "0.11.0", features = ["blocking"] } serde = "1.0" serde_json = "1.0" num = { version = "0.3.1", features = ["serde"] } diff --git a/core/lib/state/Cargo.toml b/core/lib/state/Cargo.toml index b756e4d210..059436053c 100644 --- a/core/lib/state/Cargo.toml +++ b/core/lib/state/Cargo.toml @@ -23,7 +23,7 @@ serde_json = "1.0" [dev-dependencies] criterion = "0.3.0" -web3 = "0.13.0" +web3 = "0.16.0" [[bench]] name = "criterion" diff --git a/core/lib/storage/Cargo.toml b/core/lib/storage/Cargo.toml index c700cb5026..69af42d0ce 100644 --- a/core/lib/storage/Cargo.toml +++ b/core/lib/storage/Cargo.toml @@ -30,7 +30,7 @@ once_cell = "1.4" itertools = "0.8" hex = "0.4" metrics = "=0.13.0-alpha.8" -parity-crypto = { version = "0.6.2", features = ["publickey"] } +parity-crypto = { version = "0.8.0", features = ["publickey"] } vlog = { path = "../../lib/vlog", version = "1.0" } diff --git a/core/lib/types/Cargo.toml b/core/lib/types/Cargo.toml index cdb484804e..20851b4c25 100644 --- a/core/lib/types/Cargo.toml +++ b/core/lib/types/Cargo.toml @@ -30,12 +30,12 @@ serde_json = "1.0.0" serde_with = "1.8.0" # Crypto stuff -parity-crypto = { version = "0.6.2", features = ["publickey"] } -ethabi = "12.0.0" +parity-crypto = { version = "0.8.0", features = ["publickey"] } +ethabi = "14.0.0" [dev-dependencies] criterion = "0.3.0" -web3 = "0.13.0" +web3 = "0.16.0" secp256k1 = { version = "0.17.2", features = ["std", "recovery"] } [[bench]] diff --git a/core/lib/types/src/ethereum.rs b/core/lib/types/src/ethereum.rs index d7c501094a..cdf336a053 100644 --- a/core/lib/types/src/ethereum.rs +++ b/core/lib/types/src/ethereum.rs @@ -142,13 +142,13 @@ impl TryFrom for CompleteWithdrawalsTx { .ok_or(CompleteWithdrawalsTxParseError::TransactionHashMissing)?, pending_withdrawals_queue_start_index: decoded_event .remove(0) - .to_uint() + .into_uint() .as_ref() .map(U256::as_u32) .ok_or(CompleteWithdrawalsTxParseError::PendingWithdrawalsQueueStartConversion)?, pending_withdrawals_queue_end_index: decoded_event .remove(0) - .to_uint() + .into_uint() .as_ref() .map(U256::as_u32) .ok_or(CompleteWithdrawalsTxParseError::PendingWithdrawalsQueueEndConversion)?, diff --git a/core/lib/types/src/forced_exit_requests.rs b/core/lib/types/src/forced_exit_requests.rs index 54d9a738c0..85efe55a6f 100644 --- a/core/lib/types/src/forced_exit_requests.rs +++ b/core/lib/types/src/forced_exit_requests.rs @@ -60,7 +60,7 @@ impl TryFrom for FundsReceivedEvent { &event.data.0, )?; - let amount = dec_ev.remove(0).to_uint().unwrap(); + let amount = dec_ev.remove(0).into_uint().unwrap(); let block_number = event .block_number .ok_or(FundsReceivedEventParseError::UnfinalizedBlockAccess)? diff --git a/core/lib/types/src/priority_ops/mod.rs b/core/lib/types/src/priority_ops/mod.rs index 18bdc2a3af..2d88f866ef 100644 --- a/core/lib/types/src/priority_ops/mod.rs +++ b/core/lib/types/src/priority_ops/mod.rs @@ -374,22 +374,22 @@ impl TryFrom for PriorityOp { &event.data.0, )?; - let sender = dec_ev.remove(0).to_address().unwrap(); + let sender = dec_ev.remove(0).into_address().unwrap(); Ok(PriorityOp { serial_id: dec_ev .remove(0) - .to_uint() + .into_uint() .as_ref() .map(U256::as_u64) .unwrap(), data: { let op_type = dec_ev .remove(0) - .to_uint() + .into_uint() .as_ref() .map(|ui| U256::as_u32(ui) as u8) .unwrap(); - let op_pubdata = dec_ev.remove(0).to_bytes().unwrap(); + let op_pubdata = dec_ev.remove(0).into_bytes().unwrap(); let result = ZkSyncPriorityOp::parse_from_priority_queue_logs(&op_pubdata, op_type, sender); @@ -405,7 +405,7 @@ impl TryFrom for PriorityOp { }, deadline_block: dec_ev .remove(0) - .to_uint() + .into_uint() .as_ref() .map(U256::as_u64) .unwrap(), diff --git a/core/lib/types/src/register_factory.rs b/core/lib/types/src/register_factory.rs index 5f741f0633..39c6f29aff 100644 --- a/core/lib/types/src/register_factory.rs +++ b/core/lib/types/src/register_factory.rs @@ -39,7 +39,7 @@ impl TryFrom for RegisterNFTFactoryEvent { ) .map_err(RegisterNFTFactoryEventParseError::ParseError)?; let creator_address = Address::from_slice(&event.topics[2].as_fixed_bytes()[12..]); - let factory_address = decoded_event.remove(0).to_address().unwrap(); + let factory_address = decoded_event.remove(0).into_address().unwrap(); Ok(Self { factory_address, creator_address, diff --git a/core/tests/loadnext/Cargo.toml b/core/tests/loadnext/Cargo.toml index ce0671914c..9ba7a1560e 100644 --- a/core/tests/loadnext/Cargo.toml +++ b/core/tests/loadnext/Cargo.toml @@ -21,7 +21,7 @@ num = { version = "0.3.1", features = ["serde"] } tokio = { version = "0.2", features = ["full"] } futures = "0.3" anyhow = "1.0" -rand = { version = "0.7", features = ["small_rng"] } +rand = { version = "0.8", features = ["small_rng"] } envy = "0.4" hex = "0.4" static_assertions = "1.1" diff --git a/core/tests/loadnext/src/account_pool.rs b/core/tests/loadnext/src/account_pool.rs index 1e55499245..e28d649153 100644 --- a/core/tests/loadnext/src/account_pool.rs +++ b/core/tests/loadnext/src/account_pool.rs @@ -29,7 +29,7 @@ impl AddressPool { /// Randomly chooses one of the addresses stored in the pool. pub fn random_address(&self, rng: &mut LoadtestRng) -> Address { - let index = rng.gen_range(0, self.addresses.len()); + let index = rng.gen_range(0..self.addresses.len()); self.addresses[index] } } diff --git a/core/tests/loadnext/src/command/mod.rs b/core/tests/loadnext/src/command/mod.rs index f865b1088f..6de194fb0c 100644 --- a/core/tests/loadnext/src/command/mod.rs +++ b/core/tests/loadnext/src/command/mod.rs @@ -49,7 +49,7 @@ impl Random for CommandType { const_assert!( -f32::EPSILON <= (_CHANCES_SUM - 1.0f32) && (_CHANCES_SUM - 1.0f32) <= f32::EPSILON ); - let chance = rng.gen_range(0.0f32, 1.0f32); + let chance = rng.gen_range(0.0f32..1.0f32); if chance <= SINGLE_TX_CHANCE { Self::SingleTx @@ -68,7 +68,7 @@ impl Command { CommandType::Batch => { // TODO: For some reason, batches of size 1 are being rejected because of nonce mistmatch. // It may be either bug in loadtest or server code, thus it should be investigated. - let batch_size = rng.gen_range(2, MAX_BATCH_SIZE + 1); + let batch_size = rng.gen_range(2..=MAX_BATCH_SIZE); let mut batch_command: Vec<_> = (0..batch_size) .map(|_| TxCommand::random_batchable(rng, own_address, addresses)) .collect(); diff --git a/core/tests/loadnext/src/command/tx_command.rs b/core/tests/loadnext/src/command/tx_command.rs index 18b52077be..fd565d759f 100644 --- a/core/tests/loadnext/src/command/tx_command.rs +++ b/core/tests/loadnext/src/command/tx_command.rs @@ -273,6 +273,6 @@ impl TxCommand { } fn random_amount(rng: &mut LoadtestRng) -> BigUint { - rng.gen_range(0u64, 2u64.pow(18)).into() + rng.gen_range(0u64..2u64.pow(18)).into() } } diff --git a/core/tests/loadnext/src/rng.rs b/core/tests/loadnext/src/rng.rs index a1d221b1cb..b8c4d6295c 100644 --- a/core/tests/loadnext/src/rng.rs +++ b/core/tests/loadnext/src/rng.rs @@ -7,8 +7,8 @@ use zksync_types::H256; use crate::all::AllWeighted; -// SmallRng seed type is [u8; 16]. -const SEED_SIZE: usize = 16; +// SmallRng seed type is [u8; 32]. +const SEED_SIZE: usize = 32; #[derive(Debug)] pub struct LoadtestRng { diff --git a/core/tests/loadtest/Cargo.toml b/core/tests/loadtest/Cargo.toml index 90f183f2b1..b393b0944d 100644 --- a/core/tests/loadtest/Cargo.toml +++ b/core/tests/loadtest/Cargo.toml @@ -25,7 +25,7 @@ toml = "0.5" async-trait = "0.1" futures = { version = "0.3" } tokio = { version = "0.2", features = ["full"] } -web3 = "0.13.0" +web3 = "0.16.0" anyhow = "1.0" chrono = "0.4" @@ -35,5 +35,5 @@ vlog = { path = "../../lib/vlog", version = "1.0" } num = { version = "0.3.1", features = ["serde"] } once_cell = "1.4" rand = "0.4" -reqwest = "0.10" +reqwest = "0.11.0" structopt = "0.3" diff --git a/core/tests/testkit/Cargo.toml b/core/tests/testkit/Cargo.toml index 166014482c..5efa7e5c64 100644 --- a/core/tests/testkit/Cargo.toml +++ b/core/tests/testkit/Cargo.toml @@ -28,8 +28,8 @@ tokio = { version = "0.2", features = ["full"] } vlog = { path = "../../lib/vlog", version = "1.0" } num = { version = "0.3.1", features = ["serde"] } futures = "0.3" -ethabi = "12.0.0" -web3 = "0.13.0" +ethabi = "14.0.0" +web3 = "0.16.0" anyhow = "1.0" serde = "1.0.90" serde_json = "1.0.0" diff --git a/sdk/zksync-rs/Cargo.toml b/sdk/zksync-rs/Cargo.toml index a37965f3f5..8c0149046a 100644 --- a/sdk/zksync-rs/Cargo.toml +++ b/sdk/zksync-rs/Cargo.toml @@ -13,15 +13,15 @@ zksync_crypto = { path = "../../core/lib/crypto", version = "1.0" } zksync_utils = { path = "../../core/lib/utils", version = "1.0" } sha2 = "0.8" -web3 = "0.13.0" -ethabi = "12.0.0" +web3 = "0.16.0" +ethabi = "14.0.0" tokio = { version = "0.2", features = ["time"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" jsonrpc-core = "14.0.3" num = { version = "0.3.1", features = ["serde"] } -reqwest = { version = "0.10", features = ["json", "blocking"] } +reqwest = { version = "0.11.0", features = ["json", "blocking"] } thiserror = "1.0" async-trait = "0.1" From d2a0366f6adda8162d5d11033a7b634ddd8f457f Mon Sep 17 00:00:00 2001 From: deniallugo Date: Mon, 5 Jul 2021 16:58:03 +0300 Subject: [PATCH 02/10] Update wasm bind gen Signed-off-by: deniallugo --- sdk/zksync-crypto/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/zksync-crypto/Cargo.toml b/sdk/zksync-crypto/Cargo.toml index fa1766a5d7..b993b0ff90 100644 --- a/sdk/zksync-crypto/Cargo.toml +++ b/sdk/zksync-crypto/Cargo.toml @@ -22,7 +22,7 @@ default = ["console_error_panic_hook"] franklin_crypto = { package = "franklin-crypto", git = "https://github.com/matter-labs/franklin-crypto.git", branch="beta"} rand = "0.4" -wasm-bindgen = "=0.2.60" +wasm-bindgen = "0.2.74" hex = "0.4" sha2 = "0.8" From f0acced757e1a2642bd2b3f4e6fcc489e1019a82 Mon Sep 17 00:00:00 2001 From: deniallugo Date: Mon, 5 Jul 2021 17:54:29 +0300 Subject: [PATCH 03/10] Fix tests Signed-off-by: deniallugo --- core/bin/data_restore/src/tests/mod.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/core/bin/data_restore/src/tests/mod.rs b/core/bin/data_restore/src/tests/mod.rs index c626730d5a..f772c35e07 100644 --- a/core/bin/data_restore/src/tests/mod.rs +++ b/core/bin/data_restore/src/tests/mod.rs @@ -138,7 +138,12 @@ fn create_transaction_v4(number: u32, stored_block: Block, blocks: Vec) - gas_price: u32_to_32bytes(1).into(), gas: u32_to_32bytes(1).into(), input: Bytes(input_data), + v: None, + r: None, + s: None, raw: None, + transaction_type: None, + access_list: None, } } fn create_transaction(number: u32, block: Block) -> Transaction { @@ -171,7 +176,12 @@ fn create_transaction(number: u32, block: Block) -> Transaction { gas_price: u32_to_32bytes(1).into(), gas: u32_to_32bytes(1).into(), input: Bytes(input_data), + v: None, + r: None, + s: None, raw: None, + transaction_type: None, + access_list: None, } } From 7158e0289dbe0b0a553d064ace9c51335f4a10b3 Mon Sep 17 00:00:00 2001 From: deniallugo Date: Mon, 5 Jul 2021 19:07:29 +0300 Subject: [PATCH 04/10] Update version Signed-off-by: deniallugo --- Cargo.lock | 238 +++++++----------- core/bin/block_revert/Cargo.toml | 4 +- core/bin/data_restore/Cargo.toml | 6 +- core/bin/data_restore/src/tests/mod.rs | 10 - core/bin/prover/Cargo.toml | 2 +- core/bin/regen-root-hash/Cargo.toml | 2 +- core/bin/zksync_api/Cargo.toml | 6 +- core/bin/zksync_core/Cargo.toml | 4 +- core/bin/zksync_eth_sender/Cargo.toml | 4 +- core/bin/zksync_eth_sender/src/tests/mock.rs | 2 +- .../zksync_forced_exit_requests/Cargo.toml | 4 +- core/lib/basic_types/Cargo.toml | 2 +- core/lib/contracts/Cargo.toml | 2 +- core/lib/crypto/Cargo.toml | 2 +- core/lib/eth_client/Cargo.toml | 6 +- .../lib/eth_client/src/clients/http_client.rs | 4 +- core/lib/eth_signer/Cargo.toml | 4 +- core/lib/gateway_watcher/Cargo.toml | 2 +- core/lib/state/Cargo.toml | 2 +- core/lib/storage/Cargo.toml | 2 +- core/lib/types/Cargo.toml | 6 +- core/tests/loadtest/Cargo.toml | 2 +- core/tests/testkit/Cargo.toml | 4 +- sdk/zksync-rs/Cargo.toml | 6 +- 24 files changed, 128 insertions(+), 198 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 89e6bcf433..4cbe6710fd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -501,10 +501,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" [[package]] -name = "arrayvec" -version = "0.7.1" +name = "async-native-tls" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd" +checksum = "9e9e7a929bd34c68a82d58a4de7f86fffdaf97fb2af850162a7bb19dd7269b33" +dependencies = [ + "native-tls", + "thiserror", + "tokio 0.2.25", + "url 2.2.2", +] [[package]] name = "async-trait" @@ -644,6 +650,12 @@ dependencies = [ "byteorder", ] +[[package]] +name = "base64" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" + [[package]] name = "base64" version = "0.12.3" @@ -711,24 +723,22 @@ dependencies = [ [[package]] name = "bitvec" -version = "0.19.5" +version = "0.17.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" dependencies = [ - "funty", - "radium 0.5.3", - "tap", - "wyz", + "either", + "radium 0.3.0", ] [[package]] name = "bitvec" -version = "0.20.4" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" +checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" dependencies = [ "funty", - "radium 0.6.2", + "radium 0.5.3", "tap", "wyz", ] @@ -878,9 +888,9 @@ checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" [[package]] name = "byte-slice-cast" -version = "1.0.0" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65c1bf4a04a88c54f589125563643d773f3254b5c38571395e2b591c693bbc81" +checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" [[package]] name = "byte-tools" @@ -1548,9 +1558,9 @@ dependencies = [ [[package]] name = "ethabi" -version = "14.0.0" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c52991643379afc90bfe2df3c64d53983e59c35a82ba6e75c997cfc2880d8524" +checksum = "53d4e679d6864bc26210feb5cf044e245741cd9d7701b35c00440a6e84d61399" dependencies = [ "anyhow", "ethereum-types", @@ -1564,9 +1574,9 @@ dependencies = [ [[package]] name = "ethbloom" -version = "0.11.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "779864b9c7f7ead1f092972c3257496c6a84b46dba2ce131dd8a282cb2cc5972" +checksum = "22a621dcebea74f2a6f2002d0a885c81ccf6cbdf86760183316a7722b5707ca4" dependencies = [ "crunchy", "fixed-hash", @@ -1577,9 +1587,9 @@ dependencies = [ [[package]] name = "ethereum-types" -version = "0.11.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f64b5df66a228d85e4b17e5d6c6aa43b0310898ffe8a85988c4c032357aaabfd" +checksum = "05dc5f0df4915fa6dff7f975a8366ecfaaa8959c74235469495153e7bb1b280e" dependencies = [ "ethbloom", "fixed-hash", @@ -2070,31 +2080,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "headers" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0b7591fb62902706ae8e7aaff416b1b0fa2c0fd0878b46dc13baa3712d8a855" -dependencies = [ - "base64 0.13.0", - "bitflags", - "bytes 1.0.1", - "headers-core", - "http 0.2.4", - "mime 0.3.16", - "sha-1 0.9.6", - "time 0.1.43", -] - -[[package]] -name = "headers-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" -dependencies = [ - "http 0.2.4", -] - [[package]] name = "heck" version = "0.3.3" @@ -2320,6 +2305,24 @@ dependencies = [ "want 0.3.0", ] +[[package]] +name = "hyper-proxy" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ec5be69758dfc06b9b29efa9d6e9306e387c85eb362c603912eead2ad98c7" +dependencies = [ + "bytes 0.5.6", + "futures 0.3.15", + "http 0.2.4", + "hyper 0.13.10", + "hyper-tls 0.4.3", + "native-tls", + "tokio 0.2.25", + "tokio-tls 0.3.1", + "tower-service", + "typed-headers", +] + [[package]] name = "hyper-tls" version = "0.4.3" @@ -2390,9 +2393,9 @@ dependencies = [ [[package]] name = "impl-codec" -version = "0.5.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" +checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" dependencies = [ "parity-scale-codec", ] @@ -2415,17 +2418,6 @@ dependencies = [ "serde", ] -[[package]] -name = "impl-trait-for-tuples" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "indexmap" version = "1.7.0" @@ -2548,13 +2540,11 @@ dependencies = [ [[package]] name = "jsonrpc-core" -version = "17.1.0" +version = "16.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4467ab6dfa369b69e52bd0692e480c4d117410538526a57a304a0f2250fd95e" +checksum = "6a47c4c3ac843f9a4238943f97620619033dadef4b378cd1e8addd170de396b3" dependencies = [ "futures 0.3.15", - "futures-executor", - "futures-util", "log 0.4.14", "serde", "serde_derive", @@ -2576,7 +2566,7 @@ version = "14.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0e77e8812f02155b85a677a96e1d16b60181950c0636199bc4528524fba98dc" dependencies = [ - "proc-macro-crate 0.1.5", + "proc-macro-crate", "proc-macro2", "quote", "syn", @@ -3368,9 +3358,9 @@ dependencies = [ [[package]] name = "parity-crypto" -version = "0.8.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c81ac9a98f245685fdfd1c37685613ecf123cf7941e2365e9aa551622065e8e" +checksum = "868c55e939883391346b69c8b93f6999688d89a84b7ea7e7d0a94e7a2c07c185" dependencies = [ "aes", "aes-ctr", @@ -3392,30 +3382,16 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "2.2.0" +version = "1.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8975095a2a03bbbdc70a74ab11a4f76a6d0b84680d87c68d722531b0ac28e8a9" +checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d" dependencies = [ - "arrayvec 0.7.1", - "bitvec 0.20.4", + "arrayvec 0.5.2", + "bitvec 0.17.4", "byte-slice-cast", - "impl-trait-for-tuples", - "parity-scale-codec-derive", "serde", ] -[[package]] -name = "parity-scale-codec-derive" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40dbbfef7f0a1143c5b06e0d76a6278e25dac0bc1af4be51a0fbb73f07e7ad09" -dependencies = [ - "proc-macro-crate 1.0.0", - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "parking_lot" version = "0.9.0" @@ -3699,9 +3675,9 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "primitive-types" -version = "0.9.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2415937401cb030a2a0a4d922483f945fa068f52a7dbb22ce0fe5f2b6f6adace" +checksum = "b3824ae2c5e27160113b9e029a10ec9e3f0237bad8029f69c7724393c9fdefd8" dependencies = [ "fixed-hash", "impl-codec", @@ -3719,16 +3695,6 @@ dependencies = [ "toml", ] -[[package]] -name = "proc-macro-crate" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" -dependencies = [ - "thiserror", - "toml", -] - [[package]] name = "proc-macro-error" version = "1.0.4" @@ -3806,15 +3772,15 @@ dependencies = [ [[package]] name = "radium" -version = "0.5.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" +checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" [[package]] name = "radium" -version = "0.6.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" [[package]] name = "rand" @@ -5317,7 +5283,7 @@ dependencies = [ "pin-project-lite 0.1.12", "signal-hook-registry", "slab", - "tokio-macros 0.2.6", + "tokio-macros", "winapi 0.3.9", ] @@ -5333,11 +5299,7 @@ dependencies = [ "memchr", "mio 0.7.13", "num_cpus", - "once_cell", - "parking_lot 0.11.1", "pin-project-lite 0.2.7", - "signal-hook-registry", - "tokio-macros 1.2.0", "winapi 0.3.9", ] @@ -5416,17 +5378,6 @@ dependencies = [ "syn", ] -[[package]] -name = "tokio-macros" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c49e3df43841dafb86046472506755d8501c5615673955f6aa17181125d13c37" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "tokio-native-tls" version = "0.1.0" @@ -5466,17 +5417,6 @@ dependencies = [ "tokio-sync", ] -[[package]] -name = "tokio-stream" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8864d706fdb3cc0843a49647ac892720dac98a6eeb818b77190592cf4994066" -dependencies = [ - "futures-core", - "pin-project-lite 0.2.7", - "tokio 1.8.0", -] - [[package]] name = "tokio-sync" version = "0.1.8" @@ -5772,6 +5712,19 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" +[[package]] +name = "typed-headers" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3179a61e9eccceead5f1574fd173cf2e162ac42638b9bf214c6ad0baf7efa24a" +dependencies = [ + "base64 0.11.0", + "bytes 0.5.6", + "chrono", + "http 0.2.4", + "mime 0.3.16", +] + [[package]] name = "typenum" version = "1.13.0" @@ -6063,47 +6016,36 @@ dependencies = [ [[package]] name = "web3" -version = "0.16.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc4c18ae15621f764fab919f7e4a83d87163494cbc3460884debef7c6bc1bc6b" +checksum = "4080a844bbb41437f0d432138f0a7543780a40b43345b76dc0338c59bdfd1336" dependencies = [ "arrayvec 0.5.2", + "async-native-tls", "base64 0.13.0", - "bytes 1.0.1", "derive_more", "ethabi", "ethereum-types", "futures 0.3.15", "futures-timer", - "headers", "hex", - "jsonrpc-core 17.1.0", + "hyper 0.13.10", + "hyper-proxy", + "hyper-tls 0.4.3", + "jsonrpc-core 16.0.0", "log 0.4.14", + "native-tls", "parking_lot 0.11.1", "pin-project 1.0.7", - "reqwest 0.11.4", "rlp", "secp256k1 0.20.3", "serde", "serde_json", "soketto", "tiny-keccak 2.0.2", - "tokio 1.8.0", - "tokio-stream", + "tokio 0.2.25", "tokio-util 0.6.7", - "url 2.2.2", - "web3-async-native-tls", -] - -[[package]] -name = "web3-async-native-tls" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f6d8d1636b2627fe63518d5a9b38a569405d9c9bc665c43c9c341de57227ebb" -dependencies = [ - "native-tls", - "thiserror", - "tokio 1.8.0", + "typed-headers", "url 2.2.2", ] @@ -6497,7 +6439,7 @@ dependencies = [ "ethabi", "futures 0.3.15", "hex", - "jsonrpc-core 14.2.0", + "jsonrpc-core 16.0.0", "num", "serde", "serde_json", diff --git a/core/bin/block_revert/Cargo.toml b/core/bin/block_revert/Cargo.toml index b512d6f58e..dff6bf2926 100644 --- a/core/bin/block_revert/Cargo.toml +++ b/core/bin/block_revert/Cargo.toml @@ -19,7 +19,7 @@ zksync_eth_client = { path = "../../lib/eth_client", version = "1.0" } zksync_config = { path = "../../lib/config", version = "1.0" } tokio = { version = "0.2", features = ["full"] } -ethabi = "14.0.0" +ethabi = "13.0.0" anyhow = "1.0" -web3 = "0.16.0" +web3 = "0.15.0" structopt = "0.3.20" diff --git a/core/bin/data_restore/Cargo.toml b/core/bin/data_restore/Cargo.toml index 3534bbbf95..2faca3ca39 100644 --- a/core/bin/data_restore/Cargo.toml +++ b/core/bin/data_restore/Cargo.toml @@ -18,8 +18,8 @@ vlog = { path = "../../lib/vlog", version = "1.0" } num = { version = "0.3.1", features = ["serde"] } tiny-keccak = "1.4.2" -ethabi = "14.0.0" -web3 = "0.16.0" +ethabi = "13.0.0" +web3 = "0.15.0" hex = "0.4" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.0" @@ -38,6 +38,6 @@ zksync_config = { path = "../../lib/config", version = "1.0" } zksync_contracts = { path = "../../lib/contracts", version = "1.0" } [dev-dependencies] -jsonrpc-core = "14.0.0" +jsonrpc-core = "16.0.0" db_test_macro = { path = "../../lib/storage/db_test_macro" } futures = "0.3.5" diff --git a/core/bin/data_restore/src/tests/mod.rs b/core/bin/data_restore/src/tests/mod.rs index f772c35e07..c626730d5a 100644 --- a/core/bin/data_restore/src/tests/mod.rs +++ b/core/bin/data_restore/src/tests/mod.rs @@ -138,12 +138,7 @@ fn create_transaction_v4(number: u32, stored_block: Block, blocks: Vec) - gas_price: u32_to_32bytes(1).into(), gas: u32_to_32bytes(1).into(), input: Bytes(input_data), - v: None, - r: None, - s: None, raw: None, - transaction_type: None, - access_list: None, } } fn create_transaction(number: u32, block: Block) -> Transaction { @@ -176,12 +171,7 @@ fn create_transaction(number: u32, block: Block) -> Transaction { gas_price: u32_to_32bytes(1).into(), gas: u32_to_32bytes(1).into(), input: Bytes(input_data), - v: None, - r: None, - s: None, raw: None, - transaction_type: None, - access_list: None, } } diff --git a/core/bin/prover/Cargo.toml b/core/bin/prover/Cargo.toml index 17ebe3baf2..1b967e6637 100644 --- a/core/bin/prover/Cargo.toml +++ b/core/bin/prover/Cargo.toml @@ -21,7 +21,7 @@ zksync_prover_utils = { path = "../../lib/prover_utils", version = "1.0" } hex = "0.4" rust-crypto = "0.2" -web3 = "0.16.0" +web3 = "0.15.0" tokio = { version = "0.2", features = ["full"] } async-trait = "0.1" futures = "0.3" diff --git a/core/bin/regen-root-hash/Cargo.toml b/core/bin/regen-root-hash/Cargo.toml index 3739c79163..fed656a098 100644 --- a/core/bin/regen-root-hash/Cargo.toml +++ b/core/bin/regen-root-hash/Cargo.toml @@ -17,7 +17,7 @@ zksync_types = { path = "../../lib/types", version = "1.0" } zksync_utils = { path = "../../lib/utils", version = "1.0" } zksync_circuit = { path = "../../lib/circuit", version = "1.0" } zksync_storage = { path = "../../lib/storage", version = "1.0" } -ethabi = "14.0.0" +ethabi = "13.0.0" once_cell = "1.4" anyhow = "1.0" diff --git a/core/bin/zksync_api/Cargo.toml b/core/bin/zksync_api/Cargo.toml index 78c26db56c..9d4b2711d1 100644 --- a/core/bin/zksync_api/Cargo.toml +++ b/core/bin/zksync_api/Cargo.toml @@ -32,13 +32,13 @@ zksync_gateway_watcher = { path = "../../lib/gateway_watcher", version = "1.0" } vlog = { path = "../../lib/vlog", version = "1.0", features=['actix'] } hex = "0.4" -ethabi = "14.0.0" -web3 = "0.16.0" +ethabi = "13.0.0" +web3 = "0.15.0" serde = "1.0.90" serde_json = "1.0.0" serde_repr = "0.1" itertools = "0.8" -jsonrpc-core = "14.0.3" +jsonrpc-core = "14.0" jsonrpc-core-client = {version= "14.0.3", features=["ws", "http"]} jsonrpc-pubsub = "14.0.3" jsonrpc-ws-server = "14.0.3" diff --git a/core/bin/zksync_core/Cargo.toml b/core/bin/zksync_core/Cargo.toml index 8abb9e357d..e418a49410 100644 --- a/core/bin/zksync_core/Cargo.toml +++ b/core/bin/zksync_core/Cargo.toml @@ -28,8 +28,8 @@ zksync_gateway_watcher = { path = "../../lib/gateway_watcher", version = "1.0" } num = { version = "0.3.1", features = ["serde"] } -ethabi = "14.0.0" -web3 = "0.16.0" +ethabi = "13.0.0" +web3 = "0.15.0" serde = "1.0.90" serde_json = "1.0.0" metrics = "=0.13.0-alpha.8" diff --git a/core/bin/zksync_eth_sender/Cargo.toml b/core/bin/zksync_eth_sender/Cargo.toml index 1f22845312..31626a62e4 100644 --- a/core/bin/zksync_eth_sender/Cargo.toml +++ b/core/bin/zksync_eth_sender/Cargo.toml @@ -23,8 +23,8 @@ zksync_prometheus_exporter = { path = "../../lib/prometheus_exporter", version = zksync_gateway_watcher = { path = "../../lib/gateway_watcher", version = "1.0" } hex = "0.4" -ethabi = "14.0.0" -web3 = "0.16.0" +ethabi = "13.0.0" +web3 = "0.15.0" serde = "1.0.90" serde_json = "1.0.0" metrics = "=0.13.0-alpha.8" 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_forced_exit_requests/Cargo.toml b/core/bin/zksync_forced_exit_requests/Cargo.toml index 66520d98ee..d69dbd1068 100644 --- a/core/bin/zksync_forced_exit_requests/Cargo.toml +++ b/core/bin/zksync_forced_exit_requests/Cargo.toml @@ -26,8 +26,8 @@ vlog = { path = "../../lib/vlog", version = "1.0" } zksync_core = { path = "../zksync_core", version = "1.0" } zksync_api = { path = "../zksync_api", version = "1.0" } actix-web = "3.0.0" -ethabi = "14.0.0" -web3 = "0.16.0" +ethabi = "13.0.0" +web3 = "0.15.0" log = "0.4" hex = "0.4" metrics = "0.13.0-alpha.8" diff --git a/core/lib/basic_types/Cargo.toml b/core/lib/basic_types/Cargo.toml index 8706846804..8822974279 100644 --- a/core/lib/basic_types/Cargo.toml +++ b/core/lib/basic_types/Cargo.toml @@ -10,5 +10,5 @@ keywords = ["blockchain", "zksync"] categories = ["cryptography"] [dependencies] -web3 = "0.16.0" +web3 = "0.15.0" serde = { version = "1.0", features = ["derive"] } diff --git a/core/lib/contracts/Cargo.toml b/core/lib/contracts/Cargo.toml index 101d1ce550..fb4ef3a180 100644 --- a/core/lib/contracts/Cargo.toml +++ b/core/lib/contracts/Cargo.toml @@ -10,5 +10,5 @@ keywords = ["blockchain", "zksync"] categories = ["cryptography"] [dependencies] -ethabi = "14.0.0" +ethabi = "13.0.0" serde_json = "1.0" diff --git a/core/lib/crypto/Cargo.toml b/core/lib/crypto/Cargo.toml index 9f800b4be7..af4657f10d 100644 --- a/core/lib/crypto/Cargo.toml +++ b/core/lib/crypto/Cargo.toml @@ -18,7 +18,7 @@ rescue_poseidon = { package = "rescue_poseidon", version = "0.3.0", git = "https num = { version = "0.3.1", features = ["serde"] } zksync_basic_types = { path = "../basic_types", version = "1.0" } -ethabi = "14.0.0" +ethabi = "13.0.0" serde = "1.0" thiserror = "1.0" diff --git a/core/lib/eth_client/Cargo.toml b/core/lib/eth_client/Cargo.toml index f9355c8aec..8a64591eb9 100644 --- a/core/lib/eth_client/Cargo.toml +++ b/core/lib/eth_client/Cargo.toml @@ -17,9 +17,9 @@ zksync_contracts = { path = "../contracts", version = "1.0" } vlog = { path = "../../lib/vlog", version = "1.0" } serde = "1.0.90" -ethabi = "14.0.0" -web3 = "0.16.0" -parity-crypto = {version = "0.8.0", features = ["publickey"] } +ethabi = "13.0.0" +web3 = "0.15.0" +parity-crypto = {version = "0.7.0", features = ["publickey"] } hex = "0.4" anyhow = "1.0" diff --git a/core/lib/eth_client/src/clients/http_client.rs b/core/lib/eth_client/src/clients/http_client.rs index 852ad61d75..d101aeb71d 100644 --- a/core/lib/eth_client/src/clients/http_client.rs +++ b/core/lib/eth_client/src/clients/http_client.rs @@ -250,14 +250,12 @@ impl ETHDirectClient { let gas_used = receipt.gas_used; let call_request = web3::types::CallRequest { - from: transaction.from, + from: Some(transaction.from), to: transaction.to, gas: Some(transaction.gas), gas_price: Some(transaction.gas_price), value: Some(transaction.value), data: Some(transaction.input), - transaction_type: None, - access_list: None, }; let encoded_revert_reason = self diff --git a/core/lib/eth_signer/Cargo.toml b/core/lib/eth_signer/Cargo.toml index 7e80db6359..77e051b3ce 100644 --- a/core/lib/eth_signer/Cargo.toml +++ b/core/lib/eth_signer/Cargo.toml @@ -17,13 +17,13 @@ serde_derive = "1.0.90" serde_json = "1.0.0" hex = "0.4.2" -parity-crypto = {version = "0.8.0", features = ["publickey"] } +parity-crypto = {version = "0.7.0", features = ["publickey"] } rlp = "0.5.0" reqwest = { version = "0.11.0", features = ["json", "blocking"] } thiserror = "1.0" -jsonrpc-core = "14.0.3" +jsonrpc-core = "14.0" async-trait = "0.1" [dev-dependencies] diff --git a/core/lib/gateway_watcher/Cargo.toml b/core/lib/gateway_watcher/Cargo.toml index 7d66462e34..5723d24053 100644 --- a/core/lib/gateway_watcher/Cargo.toml +++ b/core/lib/gateway_watcher/Cargo.toml @@ -17,6 +17,6 @@ zksync_utils = { path = "../../lib/utils", version = "1.0" } thiserror = "1.0" futures = "0.3" vlog = { path = "../../lib/vlog", version = "1.0" } -web3 = "0.16.0" +web3 = "0.15.0" tokio = { version = "0.2", features = ["rt-core"] } metrics = "=0.13.0-alpha.8" diff --git a/core/lib/state/Cargo.toml b/core/lib/state/Cargo.toml index 059436053c..a04bc4dd75 100644 --- a/core/lib/state/Cargo.toml +++ b/core/lib/state/Cargo.toml @@ -23,7 +23,7 @@ serde_json = "1.0" [dev-dependencies] criterion = "0.3.0" -web3 = "0.16.0" +web3 = "0.15.0" [[bench]] name = "criterion" diff --git a/core/lib/storage/Cargo.toml b/core/lib/storage/Cargo.toml index 69af42d0ce..4a4870245a 100644 --- a/core/lib/storage/Cargo.toml +++ b/core/lib/storage/Cargo.toml @@ -30,7 +30,7 @@ once_cell = "1.4" itertools = "0.8" hex = "0.4" metrics = "=0.13.0-alpha.8" -parity-crypto = { version = "0.8.0", features = ["publickey"] } +parity-crypto = { version = "0.7.0", features = ["publickey"] } vlog = { path = "../../lib/vlog", version = "1.0" } diff --git a/core/lib/types/Cargo.toml b/core/lib/types/Cargo.toml index 20851b4c25..3f81672b5c 100644 --- a/core/lib/types/Cargo.toml +++ b/core/lib/types/Cargo.toml @@ -30,12 +30,12 @@ serde_json = "1.0.0" serde_with = "1.8.0" # Crypto stuff -parity-crypto = { version = "0.8.0", features = ["publickey"] } -ethabi = "14.0.0" +parity-crypto = { version = "0.7.0", features = ["publickey"] } +ethabi = "13.0.0" [dev-dependencies] criterion = "0.3.0" -web3 = "0.16.0" +web3 = "0.15.0" secp256k1 = { version = "0.17.2", features = ["std", "recovery"] } [[bench]] diff --git a/core/tests/loadtest/Cargo.toml b/core/tests/loadtest/Cargo.toml index b393b0944d..04903cc725 100644 --- a/core/tests/loadtest/Cargo.toml +++ b/core/tests/loadtest/Cargo.toml @@ -25,7 +25,7 @@ toml = "0.5" async-trait = "0.1" futures = { version = "0.3" } tokio = { version = "0.2", features = ["full"] } -web3 = "0.16.0" +web3 = "0.15.0" anyhow = "1.0" chrono = "0.4" diff --git a/core/tests/testkit/Cargo.toml b/core/tests/testkit/Cargo.toml index 5efa7e5c64..9a487b0f55 100644 --- a/core/tests/testkit/Cargo.toml +++ b/core/tests/testkit/Cargo.toml @@ -28,8 +28,8 @@ tokio = { version = "0.2", features = ["full"] } vlog = { path = "../../lib/vlog", version = "1.0" } num = { version = "0.3.1", features = ["serde"] } futures = "0.3" -ethabi = "14.0.0" -web3 = "0.16.0" +ethabi = "13.0.0" +web3 = "0.15.0" anyhow = "1.0" serde = "1.0.90" serde_json = "1.0.0" diff --git a/sdk/zksync-rs/Cargo.toml b/sdk/zksync-rs/Cargo.toml index 8c0149046a..2353dc19d3 100644 --- a/sdk/zksync-rs/Cargo.toml +++ b/sdk/zksync-rs/Cargo.toml @@ -13,13 +13,13 @@ zksync_crypto = { path = "../../core/lib/crypto", version = "1.0" } zksync_utils = { path = "../../core/lib/utils", version = "1.0" } sha2 = "0.8" -web3 = "0.16.0" -ethabi = "14.0.0" +web3 = "0.15.0" +ethabi = "13.0.0" tokio = { version = "0.2", features = ["time"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -jsonrpc-core = "14.0.3" +jsonrpc-core = "14.0" num = { version = "0.3.1", features = ["serde"] } reqwest = { version = "0.11.0", features = ["json", "blocking"] } thiserror = "1.0" From a58936e81151f1e0da2f9cda4b1f7a4b09c53cfa Mon Sep 17 00:00:00 2001 From: deniallugo Date: Mon, 5 Jul 2021 19:31:45 +0300 Subject: [PATCH 05/10] Return old reqwest Signed-off-by: deniallugo --- Cargo.lock | 224 +++---------------- core/bin/prover/Cargo.toml | 2 +- core/bin/zksync_api/Cargo.toml | 2 +- core/bin/zksync_core/Cargo.toml | 2 +- core/bin/zksync_witness_generator/Cargo.toml | 2 +- core/lib/api_client/Cargo.toml | 2 +- core/lib/config/Cargo.toml | 2 +- core/lib/eth_signer/Cargo.toml | 2 +- core/lib/notifier/Cargo.toml | 2 +- core/lib/prover_utils/Cargo.toml | 2 +- core/tests/loadtest/Cargo.toml | 2 +- sdk/zksync-rs/Cargo.toml | 2 +- 12 files changed, 45 insertions(+), 201 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4cbe6710fd..afdf382831 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -170,11 +170,11 @@ dependencies = [ "futures-channel", "futures-util", "log 0.4.14", - "mio 0.6.23", + "mio", "mio-uds", "num_cpus", "slab", - "socket2 0.3.19", + "socket2", ] [[package]] @@ -198,7 +198,7 @@ dependencies = [ "actix-server", "actix-service", "log 0.4.14", - "socket2 0.3.19", + "socket2", ] [[package]] @@ -281,7 +281,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "socket2 0.3.19", + "socket2", "time 0.2.27", "tinyvec", "url 2.2.2", @@ -2003,25 +2003,6 @@ dependencies = [ "tracing-futures", ] -[[package]] -name = "h2" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726" -dependencies = [ - "bytes 1.0.1", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http 0.2.4", - "indexmap", - "slab", - "tokio 1.8.0", - "tokio-util 0.6.7", - "tracing", -] - [[package]] name = "half" version = "1.7.1" @@ -2179,17 +2160,6 @@ dependencies = [ "http 0.2.4", ] -[[package]] -name = "http-body" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60daa14be0e0786db0f03a9e57cb404c9d756eed2b6c62b9ea98ec5743ec75a9" -dependencies = [ - "bytes 1.0.1", - "http 0.2.4", - "pin-project-lite 0.2.7", -] - [[package]] name = "httparse" version = "1.4.1" @@ -2202,12 +2172,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47" -[[package]] -name = "httpdate" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" - [[package]] name = "hyper" version = "0.10.16" @@ -2271,40 +2235,16 @@ dependencies = [ "http 0.2.4", "http-body 0.3.1", "httparse", - "httpdate 0.3.2", + "httpdate", "itoa", "pin-project 1.0.7", - "socket2 0.3.19", + "socket2", "tokio 0.2.25", "tower-service", "tracing", "want 0.3.0", ] -[[package]] -name = "hyper" -version = "0.14.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07d6baa1b441335f3ce5098ac421fb6547c46dda735ca1bc6d0153c838f9dd83" -dependencies = [ - "bytes 1.0.1", - "futures-channel", - "futures-core", - "futures-util", - "h2 0.3.3", - "http 0.2.4", - "http-body 0.4.2", - "httparse", - "httpdate 1.0.1", - "itoa", - "pin-project-lite 0.2.7", - "socket2 0.4.0", - "tokio 1.8.0", - "tower-service", - "tracing", - "want 0.3.0", -] - [[package]] name = "hyper-proxy" version = "0.8.0" @@ -2315,7 +2255,7 @@ dependencies = [ "futures 0.3.15", "http 0.2.4", "hyper 0.13.10", - "hyper-tls 0.4.3", + "hyper-tls", "native-tls", "tokio 0.2.25", "tokio-tls 0.3.1", @@ -2336,19 +2276,6 @@ dependencies = [ "tokio-tls 0.3.1", ] -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes 1.0.1", - "hyper 0.14.9", - "native-tls", - "tokio 1.8.0", - "tokio-native-tls 0.3.0", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -2452,7 +2379,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", @@ -2762,7 +2689,7 @@ dependencies = [ "num", "once_cell", "rand 0.4.6", - "reqwest 0.11.4", + "reqwest", "serde", "serde_json", "structopt", @@ -3010,19 +2937,6 @@ dependencies = [ "winapi 0.2.8", ] -[[package]] -name = "mio" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" -dependencies = [ - "libc", - "log 0.4.14", - "miow 0.3.7", - "ntapi", - "winapi 0.3.9", -] - [[package]] name = "mio-extras" version = "2.0.6" @@ -3031,7 +2945,7 @@ checksum = "52403fe290012ce777c4626790c8951324a2b9e3316b3143779c72b029742f19" dependencies = [ "lazycell", "log 0.4.14", - "mio 0.6.23", + "mio", "slab", ] @@ -3042,7 +2956,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ "log 0.4.14", - "mio 0.6.23", + "mio", "miow 0.3.7", "winapi 0.3.9", ] @@ -3055,7 +2969,7 @@ checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" dependencies = [ "iovec", "libc", - "mio 0.6.23", + "mio", ] [[package]] @@ -3150,15 +3064,6 @@ dependencies = [ "version_check 0.9.3", ] -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi 0.3.9", -] - [[package]] name = "num" version = "0.3.1" @@ -4131,7 +4036,7 @@ dependencies = [ "http 0.2.4", "http-body 0.3.1", "hyper 0.13.10", - "hyper-tls 0.4.3", + "hyper-tls", "ipnet", "js-sys", "lazy_static", @@ -4153,41 +4058,6 @@ dependencies = [ "winreg 0.7.0", ] -[[package]] -name = "reqwest" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246e9f61b9bb77df069a947682be06e31ac43ea37862e244a69f177694ea6d22" -dependencies = [ - "base64 0.13.0", - "bytes 1.0.1", - "encoding_rs", - "futures-core", - "futures-util", - "http 0.2.4", - "http-body 0.4.2", - "hyper 0.14.9", - "hyper-tls 0.5.0", - "ipnet", - "js-sys", - "lazy_static", - "log 0.4.14", - "mime 0.3.16", - "native-tls", - "percent-encoding 2.1.0", - "pin-project-lite 0.2.7", - "serde", - "serde_json", - "serde_urlencoded", - "tokio 1.8.0", - "tokio-native-tls 0.3.0", - "url 2.2.2", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg 0.7.0", -] - [[package]] name = "rescue_poseidon" version = "0.3.0" @@ -4472,8 +4342,8 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "933beb0343c84eefd69a368318e9291b179e09e51982d49c65d7b362b0e9466f" dependencies = [ - "httpdate 0.3.2", - "reqwest 0.10.10", + "httpdate", + "reqwest", "sentry-backtrace", "sentry-contexts", "sentry-core", @@ -4784,16 +4654,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" @@ -4924,7 +4784,7 @@ dependencies = [ "native-tls", "once_cell", "tokio 0.2.25", - "tokio-native-tls 0.1.0", + "tokio-native-tls", ] [[package]] @@ -5247,7 +5107,7 @@ checksum = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" dependencies = [ "bytes 0.4.12", "futures 0.1.31", - "mio 0.6.23", + "mio", "num_cpus", "tokio-codec", "tokio-current-thread", @@ -5276,7 +5136,7 @@ dependencies = [ "lazy_static", "libc", "memchr", - "mio 0.6.23", + "mio", "mio-named-pipes", "mio-uds", "num_cpus", @@ -5294,13 +5154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "570c2eb13b3ab38208130eccd41be92520388791207fde783bda7c1e8ace28d4" dependencies = [ "autocfg 1.0.1", - "bytes 1.0.1", - "libc", - "memchr", - "mio 0.7.13", - "num_cpus", "pin-project-lite 0.2.7", - "winapi 0.3.9", ] [[package]] @@ -5388,16 +5242,6 @@ dependencies = [ "tokio 0.2.25", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" -dependencies = [ - "native-tls", - "tokio 1.8.0", -] - [[package]] name = "tokio-reactor" version = "0.1.12" @@ -5408,7 +5252,7 @@ dependencies = [ "futures 0.1.31", "lazy_static", "log 0.4.14", - "mio 0.6.23", + "mio", "num_cpus", "parking_lot 0.9.0", "slab", @@ -5436,7 +5280,7 @@ dependencies = [ "bytes 0.4.12", "futures 0.1.31", "iovec", - "mio 0.6.23", + "mio", "tokio-io", "tokio-reactor", ] @@ -5500,7 +5344,7 @@ dependencies = [ "bytes 0.4.12", "futures 0.1.31", "log 0.4.14", - "mio 0.6.23", + "mio", "tokio-codec", "tokio-io", "tokio-reactor", @@ -5517,7 +5361,7 @@ dependencies = [ "iovec", "libc", "log 0.4.14", - "mio 0.6.23", + "mio", "mio-uds", "tokio-codec", "tokio-io", @@ -6031,7 +5875,7 @@ dependencies = [ "hex", "hyper 0.13.10", "hyper-proxy", - "hyper-tls 0.4.3", + "hyper-tls", "jsonrpc-core 16.0.0", "log 0.4.14", "native-tls", @@ -6177,7 +6021,7 @@ dependencies = [ "bytes 0.4.12", "httparse", "log 0.4.14", - "mio 0.6.23", + "mio", "mio-extras", "rand 0.7.3", "sha-1 0.8.2", @@ -6217,7 +6061,7 @@ dependencies = [ "hex", "jsonrpc-core 14.2.0", "num", - "reqwest 0.11.4", + "reqwest", "serde", "serde_json", "sha2 0.8.2", @@ -6264,7 +6108,7 @@ dependencies = [ "once_cell", "qstring", "regex", - "reqwest 0.11.4", + "reqwest", "serde", "serde_json", "serde_repr", @@ -6298,7 +6142,7 @@ dependencies = [ "chrono", "hex", "num", - "reqwest 0.11.4", + "reqwest", "serde", "serde_json", "thiserror", @@ -6350,7 +6194,7 @@ dependencies = [ "chrono", "envy", "num", - "reqwest 0.11.4", + "reqwest", "serde", "serde_json", "toml", @@ -6384,7 +6228,7 @@ dependencies = [ "itertools 0.9.0", "metrics", "num", - "reqwest 0.11.4", + "reqwest", "serde", "serde_json", "thiserror", @@ -6517,7 +6361,7 @@ dependencies = [ "hex", "jsonrpc-core 14.2.0", "parity-crypto", - "reqwest 0.11.4", + "reqwest", "rlp", "serde", "serde_derive", @@ -6595,7 +6439,7 @@ dependencies = [ "futures 0.3.15", "hex", "num", - "reqwest 0.11.4", + "reqwest", "serde", "serde_json", "zksync_types", @@ -6633,7 +6477,7 @@ dependencies = [ "hex", "jsonwebtoken", "num", - "reqwest 0.11.4", + "reqwest", "rust-crypto", "serde", "serde_json", @@ -6658,7 +6502,7 @@ dependencies = [ "backoff 0.1.6", "lazy_static", "num", - "reqwest 0.11.4", + "reqwest", "serde", "serde_json", "structopt", @@ -6843,7 +6687,7 @@ dependencies = [ "jsonwebtoken", "metrics", "num", - "reqwest 0.11.4", + "reqwest", "serde", "serde_json", "tokio 0.2.25", diff --git a/core/bin/prover/Cargo.toml b/core/bin/prover/Cargo.toml index 1b967e6637..070d542ecf 100644 --- a/core/bin/prover/Cargo.toml +++ b/core/bin/prover/Cargo.toml @@ -33,7 +33,7 @@ serde = "1.0.90" serde_json = "1.0.0" num = { version = "0.3.1", features = ["serde"] } chrono = { version = "0.4", features = ["serde", "rustc-serialize"] } -reqwest = { version = "0.11.0", features = ["blocking", "json"] } +reqwest = { version = "0.10.0", features = ["blocking", "json"] } jsonwebtoken = "7" anyhow = "1.0" backoff = { version = "0.2.1", features = ["tokio"] } diff --git a/core/bin/zksync_api/Cargo.toml b/core/bin/zksync_api/Cargo.toml index 9d4b2711d1..9caf7ce8d3 100644 --- a/core/bin/zksync_api/Cargo.toml +++ b/core/bin/zksync_api/Cargo.toml @@ -63,7 +63,7 @@ thiserror = "1.0" structopt = "0.3" # TODO: should be removed after json rpc deps are updated is updated, current version (14.0) (ZKS-98). futures01 = { package = "futures", version = "0.1" } -reqwest = { version = "0.11.0", features = ["blocking", "json"] } +reqwest = { version = "0.10.0", features = ["blocking", "json"] } tiny-keccak = "1.4.2" async-trait = "0.1" jsonwebtoken = "7" diff --git a/core/bin/zksync_core/Cargo.toml b/core/bin/zksync_core/Cargo.toml index e418a49410..175a30bdc9 100644 --- a/core/bin/zksync_core/Cargo.toml +++ b/core/bin/zksync_core/Cargo.toml @@ -41,7 +41,7 @@ tokio = { version = "0.2", features = ["time"] } futures = "0.3" actix-rt = "1.1.1" actix-web = "3.0.0" -reqwest = { version = "0.11.0", features = ["blocking", "json"] } +reqwest = { version = "0.10.0", features = ["blocking", "json"] } chrono = { version = "0.4", features = ["serde", "rustc-serialize"] } ctrlc = { version = "3.1", features = ["termination"] } anyhow = "1.0" diff --git a/core/bin/zksync_witness_generator/Cargo.toml b/core/bin/zksync_witness_generator/Cargo.toml index 1efc58d391..e07b69848a 100644 --- a/core/bin/zksync_witness_generator/Cargo.toml +++ b/core/bin/zksync_witness_generator/Cargo.toml @@ -43,4 +43,4 @@ async-trait = "0.1.42" zksync_prover = { path = "../prover", version = "1.0" } num = { version = "0.3.1", features = ["serde"] } chrono = { version = "0.4", features = ["serde"] } -reqwest = { version = "0.11.0", features = ["blocking"] } +reqwest = { version = "0.10.0", features = ["blocking"] } diff --git a/core/lib/api_client/Cargo.toml b/core/lib/api_client/Cargo.toml index 43eac1409e..ff262241bb 100644 --- a/core/lib/api_client/Cargo.toml +++ b/core/lib/api_client/Cargo.toml @@ -17,7 +17,7 @@ zksync_crypto = { path = "../../lib/crypto", version = "1.0" } serde = "1.0.90" serde_json = "1.0.0" chrono = { version = "0.4", features = ["serde", "rustc-serialize"] } -reqwest = { version = "0.11.0", features = ["blocking", "json"] } +reqwest = { version = "0.10.0", features = ["blocking", "json"] } thiserror = "1.0" bigdecimal = { version = "0.2.0", features = ["serde"]} hex = "0.4" diff --git a/core/lib/config/Cargo.toml b/core/lib/config/Cargo.toml index aee9b7e614..b1c147e0ee 100644 --- a/core/lib/config/Cargo.toml +++ b/core/lib/config/Cargo.toml @@ -18,7 +18,7 @@ url = "2.1" tracing = "0.1.22" num = "0.3.1" serde = { version = "1.0", features = ["derive"] } -reqwest = "0.11.0" +reqwest = "0.10.0" serde_json = "1.0" envy = "0.4" toml = "0.5" diff --git a/core/lib/eth_signer/Cargo.toml b/core/lib/eth_signer/Cargo.toml index 77e051b3ce..3f087180d9 100644 --- a/core/lib/eth_signer/Cargo.toml +++ b/core/lib/eth_signer/Cargo.toml @@ -20,7 +20,7 @@ hex = "0.4.2" parity-crypto = {version = "0.7.0", features = ["publickey"] } rlp = "0.5.0" -reqwest = { version = "0.11.0", features = ["json", "blocking"] } +reqwest = { version = "0.10.0", features = ["json", "blocking"] } thiserror = "1.0" jsonrpc-core = "14.0" diff --git a/core/lib/notifier/Cargo.toml b/core/lib/notifier/Cargo.toml index 10b696e7f0..853086daeb 100644 --- a/core/lib/notifier/Cargo.toml +++ b/core/lib/notifier/Cargo.toml @@ -18,7 +18,7 @@ serde_json = "1.0.0" anyhow = "1.0" futures = "0.3" hex = "0.4" -reqwest = { version = "0.11.0", features = ["blocking", "json"] } +reqwest = { version = "0.10.0", features = ["blocking", "json"] } [dev-dependencies] serde_json = "1.0.0" diff --git a/core/lib/prover_utils/Cargo.toml b/core/lib/prover_utils/Cargo.toml index dfc1b5bef3..58b39fe1a1 100644 --- a/core/lib/prover_utils/Cargo.toml +++ b/core/lib/prover_utils/Cargo.toml @@ -20,7 +20,7 @@ zksync_config = { path = "../config", version = "1.0" } lazy_static = "1.2.0" anyhow = "1.0" backoff = "0.1.6" -reqwest = { version = "0.11.0", features = ["blocking"] } +reqwest = { version = "0.10.0", features = ["blocking"] } serde = "1.0" serde_json = "1.0" num = { version = "0.3.1", features = ["serde"] } diff --git a/core/tests/loadtest/Cargo.toml b/core/tests/loadtest/Cargo.toml index 04903cc725..7008de181e 100644 --- a/core/tests/loadtest/Cargo.toml +++ b/core/tests/loadtest/Cargo.toml @@ -35,5 +35,5 @@ vlog = { path = "../../lib/vlog", version = "1.0" } num = { version = "0.3.1", features = ["serde"] } once_cell = "1.4" rand = "0.4" -reqwest = "0.11.0" +reqwest = "0.10.0" structopt = "0.3" diff --git a/sdk/zksync-rs/Cargo.toml b/sdk/zksync-rs/Cargo.toml index 2353dc19d3..0752a420ea 100644 --- a/sdk/zksync-rs/Cargo.toml +++ b/sdk/zksync-rs/Cargo.toml @@ -21,7 +21,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" jsonrpc-core = "14.0" num = { version = "0.3.1", features = ["serde"] } -reqwest = { version = "0.11.0", features = ["json", "blocking"] } +reqwest = { version = "0.10.0", features = ["json", "blocking"] } thiserror = "1.0" async-trait = "0.1" From 0f5c54f4897da2acf02a4e0098f24b7e3f6f472c Mon Sep 17 00:00:00 2001 From: deniallugo Date: Mon, 5 Jul 2021 21:50:46 +0300 Subject: [PATCH 06/10] Add some logs Signed-off-by: deniallugo --- core/bin/zksync_eth_sender/src/lib.rs | 1 + core/lib/eth_client/src/clients/http_client.rs | 4 ++++ core/lib/types/src/aggregated_operations.rs | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/core/bin/zksync_eth_sender/src/lib.rs b/core/bin/zksync_eth_sender/src/lib.rs index 12ea95650d..e440eccc2d 100644 --- a/core/bin/zksync_eth_sender/src/lib.rs +++ b/core/bin/zksync_eth_sender/src/lib.rs @@ -729,6 +729,7 @@ impl ETHSender { match op { AggregatedOperation::CommitBlocks(operation) => { let args = operation.get_eth_tx_args(); + println!("args {:?}", &args); self.ethereum .encode_tx_data("commitBlocks", args.as_slice()) } diff --git a/core/lib/eth_client/src/clients/http_client.rs b/core/lib/eth_client/src/clients/http_client.rs index d101aeb71d..7d4de4c018 100644 --- a/core/lib/eth_client/src/clients/http_client.rs +++ b/core/lib/eth_client/src/clients/http_client.rs @@ -439,6 +439,10 @@ impl ETHDirectClient { .function(func) .expect("failed to get function parameters"); + println!("contract {:?}", self.contract()); + let a: Vec<_> = f.inputs.iter().map(|p| p.kind.clone()).collect(); + + println!("a {:?}", a); f.encode_input(¶ms.into_tokens()) .expect("failed to encode parameters") } diff --git a/core/lib/types/src/aggregated_operations.rs b/core/lib/types/src/aggregated_operations.rs index 6a0bdaefe2..6155c69c19 100644 --- a/core/lib/types/src/aggregated_operations.rs +++ b/core/lib/types/src/aggregated_operations.rs @@ -39,6 +39,10 @@ impl BlocksCommitOperation { .0 .into_iter() .map(|op| { + println!( + " witness {:?} offset {:?}", + &op.eth_witness, op.public_data_offset + ); Token::Tuple(vec![ Token::Bytes(op.eth_witness), Token::Uint(U256::from(op.public_data_offset)), From b9fb0273566e74b12447cb5b5cde18861989eed3 Mon Sep 17 00:00:00 2001 From: deniallugo Date: Tue, 6 Jul 2021 10:28:05 +0300 Subject: [PATCH 07/10] Update ethabI Signed-off-by: deniallugo --- Cargo.lock | 106 ++++++++++++------ Cargo.toml | 6 +- core/bin/block_revert/Cargo.toml | 2 +- core/bin/data_restore/Cargo.toml | 2 +- core/bin/regen-root-hash/Cargo.toml | 2 +- core/bin/zksync_api/Cargo.toml | 2 +- core/bin/zksync_core/Cargo.toml | 2 +- core/bin/zksync_eth_sender/Cargo.toml | 2 +- .../zksync_forced_exit_requests/Cargo.toml | 2 +- core/lib/contracts/Cargo.toml | 2 +- core/lib/crypto/Cargo.toml | 2 +- core/lib/eth_client/Cargo.toml | 4 +- core/lib/eth_signer/Cargo.toml | 2 +- core/lib/storage/Cargo.toml | 2 +- core/lib/types/Cargo.toml | 4 +- core/tests/testkit/Cargo.toml | 2 +- sdk/zksync-rs/Cargo.toml | 2 +- 17 files changed, 96 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index afdf382831..614feab0b0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -500,6 +500,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +[[package]] +name = "arrayvec" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4dc07131ffa69b8072d35f5007352af944213cde02545e2103680baed38fcd" + [[package]] name = "async-native-tls" version = "0.3.3" @@ -723,22 +729,24 @@ dependencies = [ [[package]] name = "bitvec" -version = "0.17.4" +version = "0.19.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41262f11d771fd4a61aa3ce019fca363b4b6c282fca9da2a31186d3965a47a5c" +checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" dependencies = [ - "either", - "radium 0.3.0", + "funty", + "radium 0.5.3", + "tap", + "wyz", ] [[package]] name = "bitvec" -version = "0.19.5" +version = "0.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8942c8d352ae1838c9dda0b0ca2ab657696ef2232a20147cf1b30ae1a9cb4321" +checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" dependencies = [ "funty", - "radium 0.5.3", + "radium 0.6.2", "tap", "wyz", ] @@ -888,9 +896,9 @@ checksum = "9c59e7af012c713f529e7a3ee57ce9b31ddd858d4b512923602f74608b009631" [[package]] name = "byte-slice-cast" -version = "0.3.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" +checksum = "65c1bf4a04a88c54f589125563643d773f3254b5c38571395e2b591c693bbc81" [[package]] name = "byte-tools" @@ -1558,9 +1566,9 @@ dependencies = [ [[package]] name = "ethabi" -version = "13.0.0" +version = "14.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d4e679d6864bc26210feb5cf044e245741cd9d7701b35c00440a6e84d61399" +checksum = "c52991643379afc90bfe2df3c64d53983e59c35a82ba6e75c997cfc2880d8524" dependencies = [ "anyhow", "ethereum-types", @@ -1574,9 +1582,9 @@ dependencies = [ [[package]] name = "ethbloom" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a621dcebea74f2a6f2002d0a885c81ccf6cbdf86760183316a7722b5707ca4" +checksum = "779864b9c7f7ead1f092972c3257496c6a84b46dba2ce131dd8a282cb2cc5972" dependencies = [ "crunchy", "fixed-hash", @@ -1587,9 +1595,9 @@ dependencies = [ [[package]] name = "ethereum-types" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05dc5f0df4915fa6dff7f975a8366ecfaaa8959c74235469495153e7bb1b280e" +checksum = "f64b5df66a228d85e4b17e5d6c6aa43b0310898ffe8a85988c4c032357aaabfd" dependencies = [ "ethbloom", "fixed-hash", @@ -2320,9 +2328,9 @@ dependencies = [ [[package]] name = "impl-codec" -version = "0.4.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be51a921b067b0eaca2fad532d9400041561aa922221cc65f95a85641c6bf53" +checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" dependencies = [ "parity-scale-codec", ] @@ -2345,6 +2353,17 @@ dependencies = [ "serde", ] +[[package]] +name = "impl-trait-for-tuples" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "indexmap" version = "1.7.0" @@ -2493,7 +2512,7 @@ version = "14.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0e77e8812f02155b85a677a96e1d16b60181950c0636199bc4528524fba98dc" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 0.1.5", "proc-macro2", "quote", "syn", @@ -3263,9 +3282,9 @@ dependencies = [ [[package]] name = "parity-crypto" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "868c55e939883391346b69c8b93f6999688d89a84b7ea7e7d0a94e7a2c07c185" +checksum = "4c81ac9a98f245685fdfd1c37685613ecf123cf7941e2365e9aa551622065e8e" dependencies = [ "aes", "aes-ctr", @@ -3287,16 +3306,30 @@ dependencies = [ [[package]] name = "parity-scale-codec" -version = "1.3.7" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b26b16c7687c3075982af47719e481815df30bc544f7a6690763a25ca16e9d" +checksum = "8975095a2a03bbbdc70a74ab11a4f76a6d0b84680d87c68d722531b0ac28e8a9" dependencies = [ - "arrayvec 0.5.2", - "bitvec 0.17.4", + "arrayvec 0.7.1", + "bitvec 0.20.4", "byte-slice-cast", + "impl-trait-for-tuples", + "parity-scale-codec-derive", "serde", ] +[[package]] +name = "parity-scale-codec-derive" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40dbbfef7f0a1143c5b06e0d76a6278e25dac0bc1af4be51a0fbb73f07e7ad09" +dependencies = [ + "proc-macro-crate 1.0.0", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "parking_lot" version = "0.9.0" @@ -3580,9 +3613,9 @@ checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" [[package]] name = "primitive-types" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3824ae2c5e27160113b9e029a10ec9e3f0237bad8029f69c7724393c9fdefd8" +checksum = "06345ee39fbccfb06ab45f3a1a5798d9dafa04cb8921a76d227040003a234b0e" dependencies = [ "fixed-hash", "impl-codec", @@ -3600,6 +3633,16 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-crate" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41fdbd1df62156fbc5945f4762632564d7d038153091c3fcf1067f6aef7cff92" +dependencies = [ + "thiserror", + "toml", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -3677,15 +3720,15 @@ dependencies = [ [[package]] name = "radium" -version = "0.3.0" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" +checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" [[package]] name = "radium" -version = "0.5.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" +checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" [[package]] name = "rand" @@ -5861,8 +5904,7 @@ dependencies = [ [[package]] name = "web3" version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4080a844bbb41437f0d432138f0a7543780a40b43345b76dc0338c59bdfd1336" +source = "git+https://github.com/Deniallugo/rust-web3?branch=update_ethabi#3a6c216b375bbe3c3df8dd70f6cf062691a9b9f9" dependencies = [ "arrayvec 0.5.2", "async-native-tls", diff --git a/Cargo.toml b/Cargo.toml index 95de288b89..974e6a5cc3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -45,4 +45,8 @@ members = [ # SDK section "sdk/zksync-rs" -] \ No newline at end of file +] + +[patch.crates-io] +web3 = { git = "https://github.com/Deniallugo/rust-web3", branch = "update_ethabi"} + diff --git a/core/bin/block_revert/Cargo.toml b/core/bin/block_revert/Cargo.toml index dff6bf2926..357f61557a 100644 --- a/core/bin/block_revert/Cargo.toml +++ b/core/bin/block_revert/Cargo.toml @@ -19,7 +19,7 @@ zksync_eth_client = { path = "../../lib/eth_client", version = "1.0" } zksync_config = { path = "../../lib/config", version = "1.0" } tokio = { version = "0.2", features = ["full"] } -ethabi = "13.0.0" +ethabi = "14.0.0" anyhow = "1.0" web3 = "0.15.0" structopt = "0.3.20" diff --git a/core/bin/data_restore/Cargo.toml b/core/bin/data_restore/Cargo.toml index 2faca3ca39..4ef67f7bb7 100644 --- a/core/bin/data_restore/Cargo.toml +++ b/core/bin/data_restore/Cargo.toml @@ -18,7 +18,7 @@ vlog = { path = "../../lib/vlog", version = "1.0" } num = { version = "0.3.1", features = ["serde"] } tiny-keccak = "1.4.2" -ethabi = "13.0.0" +ethabi = "14.0.0" web3 = "0.15.0" hex = "0.4" serde = { version = "1.0", features = ["derive"] } diff --git a/core/bin/regen-root-hash/Cargo.toml b/core/bin/regen-root-hash/Cargo.toml index fed656a098..3739c79163 100644 --- a/core/bin/regen-root-hash/Cargo.toml +++ b/core/bin/regen-root-hash/Cargo.toml @@ -17,7 +17,7 @@ zksync_types = { path = "../../lib/types", version = "1.0" } zksync_utils = { path = "../../lib/utils", version = "1.0" } zksync_circuit = { path = "../../lib/circuit", version = "1.0" } zksync_storage = { path = "../../lib/storage", version = "1.0" } -ethabi = "13.0.0" +ethabi = "14.0.0" once_cell = "1.4" anyhow = "1.0" diff --git a/core/bin/zksync_api/Cargo.toml b/core/bin/zksync_api/Cargo.toml index 9caf7ce8d3..21c31d9f61 100644 --- a/core/bin/zksync_api/Cargo.toml +++ b/core/bin/zksync_api/Cargo.toml @@ -32,7 +32,7 @@ zksync_gateway_watcher = { path = "../../lib/gateway_watcher", version = "1.0" } vlog = { path = "../../lib/vlog", version = "1.0", features=['actix'] } hex = "0.4" -ethabi = "13.0.0" +ethabi = "14.0.0" web3 = "0.15.0" serde = "1.0.90" serde_json = "1.0.0" diff --git a/core/bin/zksync_core/Cargo.toml b/core/bin/zksync_core/Cargo.toml index 175a30bdc9..c87eefdacc 100644 --- a/core/bin/zksync_core/Cargo.toml +++ b/core/bin/zksync_core/Cargo.toml @@ -28,7 +28,7 @@ zksync_gateway_watcher = { path = "../../lib/gateway_watcher", version = "1.0" } num = { version = "0.3.1", features = ["serde"] } -ethabi = "13.0.0" +ethabi = "14.0.0" web3 = "0.15.0" serde = "1.0.90" serde_json = "1.0.0" diff --git a/core/bin/zksync_eth_sender/Cargo.toml b/core/bin/zksync_eth_sender/Cargo.toml index 31626a62e4..0c2f44df03 100644 --- a/core/bin/zksync_eth_sender/Cargo.toml +++ b/core/bin/zksync_eth_sender/Cargo.toml @@ -23,7 +23,7 @@ zksync_prometheus_exporter = { path = "../../lib/prometheus_exporter", version = zksync_gateway_watcher = { path = "../../lib/gateway_watcher", version = "1.0" } hex = "0.4" -ethabi = "13.0.0" +ethabi = "14.0.0" web3 = "0.15.0" serde = "1.0.90" serde_json = "1.0.0" diff --git a/core/bin/zksync_forced_exit_requests/Cargo.toml b/core/bin/zksync_forced_exit_requests/Cargo.toml index d69dbd1068..ef17146995 100644 --- a/core/bin/zksync_forced_exit_requests/Cargo.toml +++ b/core/bin/zksync_forced_exit_requests/Cargo.toml @@ -26,7 +26,7 @@ vlog = { path = "../../lib/vlog", version = "1.0" } zksync_core = { path = "../zksync_core", version = "1.0" } zksync_api = { path = "../zksync_api", version = "1.0" } actix-web = "3.0.0" -ethabi = "13.0.0" +ethabi = "14.0.0" web3 = "0.15.0" log = "0.4" hex = "0.4" diff --git a/core/lib/contracts/Cargo.toml b/core/lib/contracts/Cargo.toml index fb4ef3a180..101d1ce550 100644 --- a/core/lib/contracts/Cargo.toml +++ b/core/lib/contracts/Cargo.toml @@ -10,5 +10,5 @@ keywords = ["blockchain", "zksync"] categories = ["cryptography"] [dependencies] -ethabi = "13.0.0" +ethabi = "14.0.0" serde_json = "1.0" diff --git a/core/lib/crypto/Cargo.toml b/core/lib/crypto/Cargo.toml index af4657f10d..9f800b4be7 100644 --- a/core/lib/crypto/Cargo.toml +++ b/core/lib/crypto/Cargo.toml @@ -18,7 +18,7 @@ rescue_poseidon = { package = "rescue_poseidon", version = "0.3.0", git = "https num = { version = "0.3.1", features = ["serde"] } zksync_basic_types = { path = "../basic_types", version = "1.0" } -ethabi = "13.0.0" +ethabi = "14.0.0" serde = "1.0" thiserror = "1.0" diff --git a/core/lib/eth_client/Cargo.toml b/core/lib/eth_client/Cargo.toml index 8a64591eb9..e38fb53b47 100644 --- a/core/lib/eth_client/Cargo.toml +++ b/core/lib/eth_client/Cargo.toml @@ -17,9 +17,9 @@ zksync_contracts = { path = "../contracts", version = "1.0" } vlog = { path = "../../lib/vlog", version = "1.0" } serde = "1.0.90" -ethabi = "13.0.0" +ethabi = "14.0.0" web3 = "0.15.0" -parity-crypto = {version = "0.7.0", features = ["publickey"] } +parity-crypto = {version = "0.8.0", features = ["publickey"] } hex = "0.4" anyhow = "1.0" diff --git a/core/lib/eth_signer/Cargo.toml b/core/lib/eth_signer/Cargo.toml index 3f087180d9..7ae9e994d7 100644 --- a/core/lib/eth_signer/Cargo.toml +++ b/core/lib/eth_signer/Cargo.toml @@ -17,7 +17,7 @@ serde_derive = "1.0.90" serde_json = "1.0.0" hex = "0.4.2" -parity-crypto = {version = "0.7.0", features = ["publickey"] } +parity-crypto = {version = "0.8.0", features = ["publickey"] } rlp = "0.5.0" reqwest = { version = "0.10.0", features = ["json", "blocking"] } diff --git a/core/lib/storage/Cargo.toml b/core/lib/storage/Cargo.toml index 4a4870245a..69af42d0ce 100644 --- a/core/lib/storage/Cargo.toml +++ b/core/lib/storage/Cargo.toml @@ -30,7 +30,7 @@ once_cell = "1.4" itertools = "0.8" hex = "0.4" metrics = "=0.13.0-alpha.8" -parity-crypto = { version = "0.7.0", features = ["publickey"] } +parity-crypto = { version = "0.8.0", features = ["publickey"] } vlog = { path = "../../lib/vlog", version = "1.0" } diff --git a/core/lib/types/Cargo.toml b/core/lib/types/Cargo.toml index 3f81672b5c..91b888b2a2 100644 --- a/core/lib/types/Cargo.toml +++ b/core/lib/types/Cargo.toml @@ -30,8 +30,8 @@ serde_json = "1.0.0" serde_with = "1.8.0" # Crypto stuff -parity-crypto = { version = "0.7.0", features = ["publickey"] } -ethabi = "13.0.0" +parity-crypto = { version = "0.8.0", features = ["publickey"] } +ethabi = "14.0.0" [dev-dependencies] criterion = "0.3.0" diff --git a/core/tests/testkit/Cargo.toml b/core/tests/testkit/Cargo.toml index 9a487b0f55..792922f7f8 100644 --- a/core/tests/testkit/Cargo.toml +++ b/core/tests/testkit/Cargo.toml @@ -28,7 +28,7 @@ tokio = { version = "0.2", features = ["full"] } vlog = { path = "../../lib/vlog", version = "1.0" } num = { version = "0.3.1", features = ["serde"] } futures = "0.3" -ethabi = "13.0.0" +ethabi = "14.0.0" web3 = "0.15.0" anyhow = "1.0" serde = "1.0.90" diff --git a/sdk/zksync-rs/Cargo.toml b/sdk/zksync-rs/Cargo.toml index 0752a420ea..ac3ab784ae 100644 --- a/sdk/zksync-rs/Cargo.toml +++ b/sdk/zksync-rs/Cargo.toml @@ -14,7 +14,7 @@ zksync_utils = { path = "../../core/lib/utils", version = "1.0" } sha2 = "0.8" web3 = "0.15.0" -ethabi = "13.0.0" +ethabi = "14.0.0" tokio = { version = "0.2", features = ["time"] } serde = { version = "1.0", features = ["derive"] } From 585758d6fdfc31d72cb31f1ca9c4f23335e76bf1 Mon Sep 17 00:00:00 2001 From: deniallugo Date: Tue, 6 Jul 2021 10:37:44 +0300 Subject: [PATCH 08/10] Patchh zksync crypto Signed-off-by: deniallugo --- sdk/zksync-crypto/Cargo.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk/zksync-crypto/Cargo.toml b/sdk/zksync-crypto/Cargo.toml index b993b0ff90..7753ea7435 100644 --- a/sdk/zksync-crypto/Cargo.toml +++ b/sdk/zksync-crypto/Cargo.toml @@ -47,3 +47,6 @@ crypto_lib = { package = "zksync_crypto", path = "../../core/lib/crypto" } [profile.release] # Tell `rustc` to optimize for small code size. opt-level = "s" + +[patch.crates-io] +web3 = { git = "https://github.com/Deniallugo/rust-web3", branch = "update_ethabi"} From a8d3b75d8670a6105bc1999b54232f447b4a118c Mon Sep 17 00:00:00 2001 From: deniallugo Date: Tue, 6 Jul 2021 10:51:06 +0300 Subject: [PATCH 09/10] Delete logs Signed-off-by: deniallugo --- core/bin/zksync_eth_sender/src/lib.rs | 1 - core/lib/eth_client/src/clients/http_client.rs | 2 -- core/lib/types/src/aggregated_operations.rs | 4 ---- 3 files changed, 7 deletions(-) diff --git a/core/bin/zksync_eth_sender/src/lib.rs b/core/bin/zksync_eth_sender/src/lib.rs index e440eccc2d..12ea95650d 100644 --- a/core/bin/zksync_eth_sender/src/lib.rs +++ b/core/bin/zksync_eth_sender/src/lib.rs @@ -729,7 +729,6 @@ impl ETHSender { match op { AggregatedOperation::CommitBlocks(operation) => { let args = operation.get_eth_tx_args(); - println!("args {:?}", &args); self.ethereum .encode_tx_data("commitBlocks", args.as_slice()) } diff --git a/core/lib/eth_client/src/clients/http_client.rs b/core/lib/eth_client/src/clients/http_client.rs index 7d4de4c018..e19024f572 100644 --- a/core/lib/eth_client/src/clients/http_client.rs +++ b/core/lib/eth_client/src/clients/http_client.rs @@ -439,10 +439,8 @@ impl ETHDirectClient { .function(func) .expect("failed to get function parameters"); - println!("contract {:?}", self.contract()); let a: Vec<_> = f.inputs.iter().map(|p| p.kind.clone()).collect(); - println!("a {:?}", a); f.encode_input(¶ms.into_tokens()) .expect("failed to encode parameters") } diff --git a/core/lib/types/src/aggregated_operations.rs b/core/lib/types/src/aggregated_operations.rs index 6155c69c19..6a0bdaefe2 100644 --- a/core/lib/types/src/aggregated_operations.rs +++ b/core/lib/types/src/aggregated_operations.rs @@ -39,10 +39,6 @@ impl BlocksCommitOperation { .0 .into_iter() .map(|op| { - println!( - " witness {:?} offset {:?}", - &op.eth_witness, op.public_data_offset - ); Token::Tuple(vec![ Token::Bytes(op.eth_witness), Token::Uint(U256::from(op.public_data_offset)), From 75ce2df7161e5e210e8b521356320d0db6193018 Mon Sep 17 00:00:00 2001 From: deniallugo Date: Tue, 6 Jul 2021 10:59:02 +0300 Subject: [PATCH 10/10] Remove redundant var Signed-off-by: deniallugo --- core/lib/eth_client/src/clients/http_client.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/lib/eth_client/src/clients/http_client.rs b/core/lib/eth_client/src/clients/http_client.rs index e19024f572..d101aeb71d 100644 --- a/core/lib/eth_client/src/clients/http_client.rs +++ b/core/lib/eth_client/src/clients/http_client.rs @@ -439,8 +439,6 @@ impl ETHDirectClient { .function(func) .expect("failed to get function parameters"); - let a: Vec<_> = f.inputs.iter().map(|p| p.kind.clone()).collect(); - f.encode_input(¶ms.into_tokens()) .expect("failed to encode parameters") }