From d3ae46dac633e0a857f04a3afe62e2e710379f08 Mon Sep 17 00:00:00 2001 From: HuangYi Date: Thu, 19 Aug 2021 18:34:25 +0800 Subject: [PATCH] Support ethermint mode with features - update deep_space with ethermint feature - add a PrivateKey which switch to ethermint when ethermint feature is turn on - change default hd_path if ethermint feature turn on --- orchestrator/Cargo.lock | 1285 +++++++++-------- orchestrator/Cargo.toml | 12 + orchestrator/cosmos_gravity/Cargo.toml | 5 +- orchestrator/cosmos_gravity/src/build.rs | 3 +- orchestrator/cosmos_gravity/src/crypto.rs | 104 ++ orchestrator/cosmos_gravity/src/lib.rs | 1 + orchestrator/cosmos_gravity/src/send.rs | 3 +- orchestrator/ethereum_gravity/Cargo.toml | 2 +- orchestrator/gorc/Cargo.toml | 7 +- orchestrator/gorc/src/commands/tx/cosmos.rs | 3 +- orchestrator/gorc/src/config.rs | 5 +- orchestrator/gravity_utils/Cargo.toml | 6 +- orchestrator/orchestrator/Cargo.toml | 5 +- .../src/ethereum_event_watcher.rs | 2 +- orchestrator/orchestrator/src/main_loop.rs | 2 +- .../register_delegate_keys/Cargo.toml | 7 +- .../register_delegate_keys/src/main.rs | 3 +- orchestrator/relayer/Cargo.toml | 6 +- orchestrator/test_runner/Cargo.toml | 5 +- orchestrator/test_runner/src/bootstrapping.rs | 2 +- orchestrator/test_runner/src/happy_path.rs | 4 +- orchestrator/test_runner/src/happy_path_v2.rs | 2 +- .../test_runner/src/orch_keys_update.rs | 2 +- orchestrator/test_runner/src/utils.rs | 2 +- 24 files changed, 875 insertions(+), 603 deletions(-) create mode 100644 orchestrator/cosmos_gravity/src/crypto.rs diff --git a/orchestrator/Cargo.lock b/orchestrator/Cargo.lock index 84ed72eab..fecf5b3a3 100644 --- a/orchestrator/Cargo.lock +++ b/orchestrator/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ "once_cell", "regex", "secrecy", - "semver 1.0.4", + "semver 1.0.5", "serde", "termcolor", "toml", @@ -58,8 +58,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc7474272fbe634b6fea24f0b90dc131a35cdc1b0afa92664767cba979c39258" dependencies = [ "abscissa_core", - "actix-rt 2.5.0", - "tokio 1.13.0", + "actix-rt 2.6.0", + "tokio 1.16.1", ] [[package]] @@ -68,7 +68,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3720d0064a0ce5c0de7bd93bdb0a6caebab2a9b5668746145d7b3b0c5da02914" dependencies = [ - "actix-rt 2.5.0", + "actix-rt 2.6.0", "actix_derive", "bitflags", "bytes 1.1.0", @@ -80,10 +80,10 @@ dependencies = [ "log", "once_cell", "parking_lot", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.8", "smallvec", - "tokio 1.13.0", - "tokio-util 0.6.6", + "tokio 1.16.1", + "tokio-util 0.6.9", ] [[package]] @@ -97,25 +97,26 @@ dependencies = [ "futures-core", "futures-sink", "log", - "pin-project 0.4.28", + "pin-project 0.4.29", "tokio 0.2.25", "tokio-util 0.3.1", ] [[package]] name = "actix-codec" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d5dbeb2d9e51344cb83ca7cc170f1217f9fe25bfc50160e6e200b5c31c1019a" +checksum = "a36c014a3e811624313b51a227b775ecba55d36ef9462bbaac7d4f13e54c9271" dependencies = [ "bitflags", "bytes 1.1.0", "futures-core", "futures-sink", "log", - "pin-project-lite 0.2.6", - "tokio 1.13.0", - "tokio-util 0.6.6", + "memchr", + "pin-project-lite 0.2.8", + "tokio 1.16.1", + "tokio-util 0.6.9", ] [[package]] @@ -141,9 +142,9 @@ dependencies = [ [[package]] name = "actix-http" -version = "2.2.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452299e87817ae5673910e53c243484ca38be3828db819b6011736fc6982e874" +checksum = "2be6b66b62a794a8e6d366ac9415bb7d475ffd1e9f4671f38c1d8a8a5df950b3" dependencies = [ "actix-codec 0.3.0", "actix-connect", @@ -154,7 +155,7 @@ dependencies = [ "actix-utils 2.0.0", "base64 0.13.0", "bitflags", - "brotli2", + "brotli", "bytes 0.5.6", "cookie", "copyless", @@ -170,33 +171,32 @@ dependencies = [ "http", "httparse", "indexmap", - "itoa", + "itoa 0.4.8", "language-tags 0.2.2", "lazy_static", "log", "mime", "percent-encoding", - "pin-project 1.0.8", + "pin-project 1.0.10", "rand 0.7.3", "regex", "serde", "serde_json", "serde_urlencoded", - "sha-1", + "sha-1 0.9.8", "slab", - "time 0.2.26", + "time 0.2.27", ] [[package]] name = "actix-http" -version = "3.0.0-beta.10" +version = "3.0.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd38a862fa7fead2b47ee55e550982aba583ebc7365ccf0155b49934ad6f16f9" +checksum = "fb0185d65352deeea60d92231708068c04dc64f1ab307a1a307206a47d5a45d3" dependencies = [ - "actix-codec 0.4.0", - "actix-rt 2.5.0", - "actix-service 2.0.0", - "actix-tls 3.0.0-beta.5", + "actix-codec 0.4.2", + "actix-rt 2.6.0", + "actix-service 2.0.2", "actix-utils 3.0.0", "ahash", "base64 0.13.0", @@ -207,26 +207,20 @@ dependencies = [ "encoding_rs", "flate2", "futures-core", - "futures-util", - "h2 0.3.3", + "h2 0.3.11", "http", "httparse", - "itoa", + "httpdate", + "itoa 1.0.1", "language-tags 0.3.2", "local-channel", "log", "mime", - "once_cell", "percent-encoding", - "pin-project 1.0.8", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.8", "rand 0.8.4", - "regex", - "serde", - "sha-1", + "sha-1 0.10.0", "smallvec", - "time 0.2.26", - "tokio 1.13.0", "zstd", ] @@ -280,13 +274,13 @@ dependencies = [ [[package]] name = "actix-rt" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c2f80ce8d0c990941c7a7a931f69fd0701b76d521f8d36298edf59cd3fbf1f" +checksum = "cdf3f2183be1241ed4dd22611850b85d38de0b08a09f1f7bcccbd0809084b359" dependencies = [ "actix-macros 0.2.3", "futures-core", - "tokio 1.13.0", + "tokio 1.16.1", ] [[package]] @@ -316,18 +310,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0052435d581b5be835d11f4eb3bce417c8af18d87ddf8ace99f8e67e595882bb" dependencies = [ "futures-util", - "pin-project 0.4.28", + "pin-project 0.4.29", ] [[package]] name = "actix-service" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77f5f9d66a8730d0fae62c26f3424f5751e5518086628a40b7ab6fca4a705034" +checksum = "3b894941f818cfdc7ccc4b9e60fa7e53b5042a2e8567270f9147d5591893373a" dependencies = [ "futures-core", "paste", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.8", ] [[package]] @@ -375,21 +369,21 @@ dependencies = [ [[package]] name = "actix-tls" -version = "3.0.0-beta.5" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65b7bb60840962ef0332f7ea01a57d73a24d2cb663708511ff800250bbfef569" +checksum = "a31ab31563b611fa822480b4255e8750cf0af9ce1b8b7bde298afe8447ef9333" dependencies = [ - "actix-codec 0.4.0", - "actix-rt 2.5.0", - "actix-service 2.0.0", + "actix-codec 0.4.2", + "actix-rt 2.6.0", + "actix-service 2.0.2", "actix-utils 3.0.0", - "derive_more", "futures-core", "http", "log", "openssl", - "tokio-openssl 0.6.1", - "tokio-util 0.6.6", + "pin-project-lite 0.2.8", + "tokio-openssl 0.6.3", + "tokio-util 0.6.9", ] [[package]] @@ -408,7 +402,7 @@ dependencies = [ "futures-sink", "futures-util", "log", - "pin-project 0.4.28", + "pin-project 0.4.29", "slab", ] @@ -419,17 +413,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e491cbaac2e7fc788dfff99ff48ef317e23b3cf63dbaf7aaab6418f40f92aa94" dependencies = [ "local-waker", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.8", ] [[package]] name = "actix-web" -version = "3.3.2" +version = "3.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e641d4a172e7faa0862241a20ff4f1f5ab0ab7c279f00c2d4587b77483477b86" +checksum = "b6534a126df581caf443ba2751cab42092c89b3f1d06a9d829b1e17edfe3e277" dependencies = [ "actix-codec 0.3.0", - "actix-http 2.2.0", + "actix-http 2.2.2", "actix-macros 0.1.3", "actix-router", "actix-rt 1.1.1", @@ -451,13 +445,13 @@ dependencies = [ "log", "mime", "openssl", - "pin-project 1.0.8", + "pin-project 1.0.10", "regex", "serde", "serde_json", "serde_urlencoded", "socket2 0.3.19", - "time 0.2.26", + "time 0.2.27", "tinyvec", "url", ] @@ -486,9 +480,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.14.1" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a55f82cfe485775d02112886f4169bde0c5894d75e79ead7eafe7e40a25e45f7" +checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ "gimli", ] @@ -513,11 +507,11 @@ dependencies = [ [[package]] name = "ahash" -version = "0.7.2" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f200cbb1e856866d9eade941cf3aa0c5d7dd36f74311c4273b494f4ef036957" +checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.4", "once_cell", "version_check", ] @@ -531,6 +525,21 @@ dependencies = [ "memchr", ] +[[package]] +name = "alloc-no-stdlib" +version = "2.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ef4730490ad1c4eae5c4325b2a95f521d023e5c885853ff7aca0a6a1631db3" + +[[package]] +name = "alloc-stdlib" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "697ed7edc0f1711de49ce108c541623a0af97c6c60b2f6e2b65229847ac843c2" +dependencies = [ + "alloc-no-stdlib", +] + [[package]] name = "anomaly" version = "0.2.0" @@ -551,21 +560,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.40" +version = "1.0.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" +checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" [[package]] name = "arc-swap" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6df5aef5c5830360ce5218cecb8f018af3438af5686ae945094affc86fdec63" - -[[package]] -name = "arrayvec" -version = "0.5.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f" [[package]] name = "arrayvec" @@ -575,9 +578,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "async-stream" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3670df70cbc01729f901f94c887814b3c68db038aad1329a418bae178bc5295c" +checksum = "171374e7e3b2504e0e5236e3b59260560f9fe94bfe9ac39ba5e4e929c5590625" dependencies = [ "async-stream-impl", "futures-core", @@ -585,9 +588,9 @@ dependencies = [ [[package]] name = "async-stream-impl" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3548b8efc9f8e8a5a0a2808c5bd8451a9031b9e5b879a79590304ae928b0a70" +checksum = "648ed8c8d2ce5409ccd57453d9d1b214b342a0d69376a6feda1fd6cae3299308" dependencies = [ "proc-macro2", "quote", @@ -596,9 +599,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.51" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" +checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" dependencies = [ "proc-macro2", "quote", @@ -641,9 +644,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "awc" @@ -652,7 +655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b381e490e7b0cfc37ebc54079b0413d8093ef43d14a4e4747083f7fa47a9e691" dependencies = [ "actix-codec 0.3.0", - "actix-http 2.2.0", + "actix-http 2.2.2", "actix-rt 1.1.1", "actix-service 1.0.6", "base64 0.13.0", @@ -672,36 +675,43 @@ dependencies = [ [[package]] name = "awc" -version = "3.0.0-beta.8" +version = "3.0.0-beta.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b276021b5aa1df71969acc8adc03973e4fc7d00bba0cbb6338e6f8ad0d7a3c2" +checksum = "4a64a95bbf4905fd057ea45b70fdfeeb9c7ae09f03f091642c4e66a16ebb3ad5" dependencies = [ - "actix-codec 0.4.0", - "actix-http 3.0.0-beta.10", - "actix-rt 2.5.0", - "actix-service 2.0.0", + "actix-codec 0.4.2", + "actix-http 3.0.0-rc.2", + "actix-rt 2.6.0", + "actix-service 2.0.2", + "actix-tls 3.0.2", + "actix-utils 3.0.0", + "ahash", "base64 0.13.0", "bytes 1.1.0", "cfg-if 1.0.0", "derive_more", "futures-core", - "itoa", + "futures-util", + "h2 0.3.11", + "http", + "itoa 1.0.1", "log", "mime", "openssl", "percent-encoding", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.8", "rand 0.8.4", "serde", "serde_json", "serde_urlencoded", + "tokio 1.16.1", ] [[package]] name = "axum" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f143b3839608f1254ac928abeffea9d654d9732162dcb6f0dd92bc022672f1" +checksum = "3a3c42001f1f8dd44673da8e05d4015a8e0ed7a4712309c7ae47d8573cbac0db" dependencies = [ "async-trait", "bytes 1.1.0", @@ -709,24 +719,25 @@ dependencies = [ "http", "http-body", "hyper", - "pin-project 1.0.8", + "pin-project-lite 0.2.8", "regex", "serde", "serde_json", "serde_urlencoded", - "tokio 1.13.0", - "tokio-util 0.6.6", + "tokio 1.16.1", + "tokio-util 0.6.9", "tower", "tower-http", ] [[package]] name = "backtrace" -version = "0.3.56" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d117600f438b1707d4e4ae15d3595657288f8235a0eb593e80ecc98ab34e1bc" +checksum = "5e121dee8023ce33ab248d9ce1493df03c3b38a659b240096fcbd7048ff9c31f" dependencies = [ "addr2line", + "cc", "cfg-if 1.0.0", "libc", "miniz_oxide", @@ -740,6 +751,12 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + [[package]] name = "base58" version = "0.1.0" @@ -770,9 +787,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" [[package]] name = "base64ct" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d27fb6b6f1e43147af148af49d49329413ba781aa0d5e10979831c210173b5" +checksum = "8a32fd6af2b5827bce66c29053ba0e7c42b9dcab01835835058558c10851a46b" [[package]] name = "bech32" @@ -782,9 +799,9 @@ checksum = "2dabbe35f96fb9507f7330793dc490461b2962659ac5d427181e451a623751d1" [[package]] name = "bech32" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c7f7096bc256f5e5cb960f60dfc4f4ef979ca65abe7fb9d5a4f77150d3783d4" +checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b" [[package]] name = "bincode" @@ -806,16 +823,37 @@ dependencies = [ "hmac 0.11.0", "k256", "ripemd160", - "sha2 0.9.8", + "sha2 0.9.9", "subtle", "zeroize", ] +[[package]] +name = "bitcoin" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a41df6ad9642c5c15ae312dd3d074de38fd3eb7cc87ad4ce10f90292a83fe4d" +dependencies = [ + "bech32 0.8.1", + "bitcoin_hashes", + "secp256k1 0.20.3", + "serde", +] + +[[package]] +name = "bitcoin_hashes" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006cc91e1a1d99819bc5b8214be3555c1f0611b169f527a1fdc54ed1f2b745b0" +dependencies = [ + "serde", +] + [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" @@ -869,16 +907,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ "block-padding 0.2.1", - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] name = "block-buffer" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1d36a02058e76b040de25a4464ba1c80935655595b661505c8b39b664828b95" +checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -897,23 +935,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] -name = "brotli-sys" -version = "0.3.2" +name = "brotli" +version = "3.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" +checksum = "f838e47a451d5a8fa552371f80024dd6ace9b7acdf25c4c3d0f9bc6816fb1c39" dependencies = [ - "cc", - "libc", + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor", ] [[package]] -name = "brotli2" -version = "0.3.2" +name = "brotli-decompressor" +version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" +checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" dependencies = [ - "brotli-sys", - "libc", + "alloc-no-stdlib", + "alloc-stdlib", ] [[package]] @@ -922,14 +961,14 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" dependencies = [ - "sha2 0.9.8", + "sha2 0.9.9", ] [[package]] name = "bumpalo" -version = "3.6.1" +version = "3.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" +checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" [[package]] name = "byte-slice-cast" @@ -975,9 +1014,9 @@ dependencies = [ [[package]] name = "camino" -version = "1.0.5" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52d74260d9bf6944e2208aa46841b4b8f0d7ffc0849a06837b2f510337f86b2b" +checksum = "6f3132262930b0522068049f5870a856ab8affc80c70d08b6ecb785771a6fc23" dependencies = [ "serde", ] @@ -1005,16 +1044,16 @@ checksum = "ba2ae6de944143141f6155a473a6b02f66c7c3f9f47316f802f80204ebfe6e12" dependencies = [ "camino", "cargo-platform", - "semver 1.0.4", + "semver 1.0.5", "serde", "serde_json", ] [[package]] name = "cc" -version = "1.0.67" +version = "1.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd" +checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" dependencies = [ "jobserver", ] @@ -1051,14 +1090,14 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] name = "clap" -version = "3.0.12" +version = "3.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2afefa54b5c7dd40918dc1e09f213a171ab5937aadccab45e804780b238f9f43" +checksum = "b63edc3f163b3c71ec8aa23f9bd6070f77edbf3d1d198b164afa90ff00e4ec62" dependencies = [ "atty", "bitflags", @@ -1073,9 +1112,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.0.12" +version = "3.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd2078197a22f338bd4fbf7d6387eb6f0d6a3c69e6cbc09f5c93e97321fd92a" +checksum = "9a1132dc3944b31c20dd8b906b3a9f0a5d0243e092d59171414969657ac6aa85" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -1086,15 +1125,15 @@ dependencies = [ [[package]] name = "clarity" -version = "0.4.12" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef8749bcae70d65c0705636ee675020490f35e05cf4ec2d4b78455aeca2194f7" +checksum = "309ac0ae526b740d40038944bf41c3679acb212657154e1f6bb678704cba37da" dependencies = [ "lazy_static", - "num-bigint 0.4.0", + "num-bigint 0.4.3", "num-traits", "num256", - "secp256k1 0.20.1", + "secp256k1 0.20.3", "serde", "serde-rlp", "serde_bytes", @@ -1116,7 +1155,7 @@ dependencies = [ "k256", "lazy_static", "serde", - "sha2 0.9.8", + "sha2 0.9.9", "thiserror", ] @@ -1128,12 +1167,12 @@ checksum = "38426029442f91bd49973d6f59f28e3dbb14e633e3019ac4ec6bce402c44f81c" dependencies = [ "bitvec 0.17.4", "coins-bip32", - "getrandom 0.2.3", + "getrandom 0.2.4", "hex", "hmac 0.11.0", "pbkdf2 0.8.0", "rand 0.8.4", - "sha2 0.9.8", + "sha2 0.9.9", "thiserror", ] @@ -1148,12 +1187,12 @@ dependencies = [ "bech32 0.7.3", "blake2", "digest 0.9.0", - "generic-array 0.14.4", + "generic-array 0.14.5", "hex", "ripemd160", "serde", "serde_derive", - "sha2 0.9.8", + "sha2 0.9.9", "sha3", "thiserror", ] @@ -1190,15 +1229,15 @@ checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b" [[package]] name = "const-oid" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d355758f44afa81c21e66e1301d47cbffbbcde4b405cbe46b8b19f213abf9f60" +checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" [[package]] name = "const_fn" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076a6803b0dacd6a88cfe64deba628b01533ff5ef265687e6938280c1afd0a28" +checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" [[package]] name = "contact" @@ -1229,7 +1268,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03a5d7b21829bc7b4bf4754a978a241ae54ea55a40f92bb20216e54096f4b951" dependencies = [ "percent-encoding", - "time 0.2.26", + "time 0.2.27", "version_check", ] @@ -1241,9 +1280,9 @@ checksum = "a2df960f5d869b2dd8532793fde43eb5427cceb126c929747a26823ab0eeb536" [[package]] name = "core-foundation" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", "libc", @@ -1287,7 +1326,7 @@ dependencies = [ "rand 0.8.4", "serde", "sha3", - "tokio 1.13.0", + "tokio 1.16.1", "tonic", "web30", ] @@ -1301,26 +1340,20 @@ dependencies = [ "libc", ] -[[package]] -name = "cpuid-bool" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" - [[package]] name = "crc32fast" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossbeam-channel" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" +checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -1328,11 +1361,10 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" +checksum = "b5e5bed1f1c269533fa816a0a5492b3545209a205ca1a54842be180eb63a16a6" dependencies = [ - "autocfg", "cfg-if 1.0.0", "lazy_static", ] @@ -1349,8 +1381,8 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f83bd3bb4314701c568e340cd8cf78c975aa0ca79e03d3f6d1677d5b0c9c0c03" dependencies = [ - "generic-array 0.14.4", - "rand_core 0.6.2", + "generic-array 0.14.5", + "rand_core 0.6.3", "subtle", "zeroize", ] @@ -1361,19 +1393,19 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" dependencies = [ - "generic-array 0.14.4", - "rand_core 0.6.2", + "generic-array 0.14.5", + "rand_core 0.6.3", "subtle", "zeroize", ] [[package]] name = "crypto-common" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567569e659735adb39ff2d4c20600f7cd78be5471f8c58ab162bce3c03fdbc5f" +checksum = "683d6b536309245c849479fba3da410962a43ed8e51c26b729208ec0ac2798d0" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -1382,27 +1414,27 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", "subtle", ] [[package]] name = "crypto-mac" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" +checksum = "bff07008ec701e8028e2ceb8f83f0e4274ee62bd2dbdc4fefff2e9a91824081a" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", "subtle", ] [[package]] name = "crypto-mac" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", "subtle", ] @@ -1424,7 +1456,7 @@ dependencies = [ "base64 0.13.0", "bech32 0.7.3", "hmac 0.10.1", - "num-bigint 0.3.2", + "num-bigint 0.3.3", "num-traits", "num256", "pbkdf2 0.6.0", @@ -1434,22 +1466,22 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "sha2 0.9.8", + "sha2 0.9.9", "unicode-normalization", ] [[package]] name = "deep_space" version = "2.4.7" -source = "git+https://github.com/iqlusioninc/deep_space/?branch=master#5fb0457ed49aed262e3f18eece038146cf62e321" +source = "git+https://github.com/iqlusioninc/deep_space/?branch=master#e35f52f5e2456a8abd26b1afe6e5cc33508c050b" dependencies = [ "base64 0.13.0", - "bech32 0.8.0", + "bech32 0.8.1", "bytes 1.1.0", "cosmos-sdk-proto", "hmac 0.11.0", "log", - "num-bigint 0.4.0", + "num-bigint 0.4.3", "num-traits", "num256", "pbkdf2 0.9.0", @@ -1458,22 +1490,23 @@ dependencies = [ "rand 0.8.4", "ripemd160", "rust_decimal", - "secp256k1 0.20.1", + "secp256k1 0.20.3", "serde", "serde_derive", "serde_json", - "sha2 0.9.8", + "sha2 0.9.9", "tendermint-proto", - "tokio 1.13.0", + "tiny-keccak", + "tokio 1.16.1", "tonic", "unicode-normalization", ] [[package]] name = "der" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28e98c534e9c8a0483aa01d6f6913bc063de254311bd267c9cf535e9b70e15b2" +checksum = "79b71cca7d95d7681a4b3b9cdf63c8dbc3730d0584c2c74e31416d64a90493f4" dependencies = [ "const-oid 0.6.2", ] @@ -1484,18 +1517,19 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" dependencies = [ - "const-oid 0.7.0", + "const-oid 0.7.1", ] [[package]] name = "derive_more" -version = "0.99.13" +version = "0.99.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f82b1b72f1263f214c0f823371768776c4f5841b942c9883aa8e5ec584fd0ba6" +checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case", "proc-macro2", "quote", + "rustc_version 0.4.0", "syn", ] @@ -1514,18 +1548,18 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] name = "digest" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8549e6bfdecd113b7e221fe60b433087f6957387a20f8118ebca9b12af19143d" +checksum = "b697d66081d42af4fba142d56918a3cb21dc8eb63372c6b85d14f44fb9c5979b" dependencies = [ - "block-buffer 0.10.0", + "block-buffer 0.10.2", "crypto-common", - "generic-array 0.14.4", + "generic-array 0.14.5", ] [[package]] @@ -1552,7 +1586,7 @@ version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43ee23aa5b4f68c7a092b5c3beb25f50c406adc75e2363634f242f28ab255372" dependencies = [ - "der 0.4.4", + "der 0.4.5", "elliptic-curve 0.10.6", "hmac 0.11.0", "signature", @@ -1572,33 +1606,34 @@ checksum = "beca177dcb8eb540133e7680baff45e7cc4d93bf22002676cec549f82343721b" dependencies = [ "crypto-bigint 0.2.11", "ff", - "generic-array 0.14.4", + "generic-array 0.14.5", "group", "pkcs8", - "rand_core 0.6.2", + "rand_core 0.6.3", "subtle", "zeroize", ] [[package]] name = "elliptic-curve" -version = "0.11.5" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f01ff20862362c34074072c8be2de97399633d6b1d2114afa56bf77a8b7f0a4" +checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" dependencies = [ + "base16ct", "crypto-bigint 0.3.2", "der 0.5.1", - "generic-array 0.14.4", - "rand_core 0.6.2", + "generic-array 0.14.5", + "rand_core 0.6.3", "subtle", "zeroize", ] [[package]] name = "encoding_rs" -version = "0.8.28" +version = "0.8.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065" +checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" dependencies = [ "cfg-if 1.0.0", ] @@ -1609,7 +1644,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595" dependencies = [ - "heck 0.3.2", + "heck 0.3.3", "proc-macro2", "quote", "syn", @@ -1617,9 +1652,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" dependencies = [ "atty", "humantime", @@ -1654,7 +1689,7 @@ dependencies = [ "scrypt", "serde", "serde_json", - "sha2 0.9.8", + "sha2 0.9.9", "sha3", "thiserror", "uuid", @@ -1712,7 +1747,7 @@ dependencies = [ "gravity_utils", "log", "sha3", - "tokio 1.13.0", + "tokio 1.16.1", "web30", ] @@ -1742,7 +1777,7 @@ dependencies = [ "futures-util", "hex", "once_cell", - "pin-project 1.0.8", + "pin-project 1.0.10", "serde", "serde_json", "thiserror", @@ -1757,7 +1792,7 @@ dependencies = [ "anyhow", "cfg-if 1.0.0", "ethers-core", - "getrandom 0.2.3", + "getrandom 0.2.4", "hex", "once_cell", "proc-macro2", @@ -1788,14 +1823,14 @@ name = "ethers-core" version = "0.6.0" source = "git+https://github.com/iqlusioninc/ethers-rs.git?branch=zaki/error_abi_support#4959552eb667ed2c765f6c0123bb0b7352cf948e" dependencies = [ - "arrayvec 0.7.2", + "arrayvec", "bytes 1.1.0", "cargo_metadata", "convert_case", "ecdsa", - "elliptic-curve 0.11.5", + "elliptic-curve 0.11.12", "ethabi", - "generic-array 0.14.4", + "generic-array 0.14.5", "hex", "k256", "once_cell", @@ -1841,7 +1876,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "tokio 1.13.0", + "tokio 1.16.1", "tracing", "tracing-futures", "url", @@ -1861,7 +1896,7 @@ dependencies = [ "futures-util", "hex", "parking_lot", - "pin-project 1.0.8", + "pin-project 1.0.10", "reqwest", "serde", "serde_json", @@ -1884,15 +1919,15 @@ dependencies = [ "async-trait", "coins-bip32", "coins-bip39", - "elliptic-curve 0.11.5", + "elliptic-curve 0.11.12", "eth-keystore", "ethers-core", "futures-executor", "futures-util", "hex", "rand 0.8.4", - "semver 1.0.4", - "sha2 0.9.8", + "semver 1.0.5", + "sha2 0.9.9", "thiserror", ] @@ -1903,7 +1938,7 @@ source = "git+https://github.com/iqlusioninc/ethers-rs.git?branch=zaki/error_abi dependencies = [ "colored", "ethers-core", - "getrandom 0.2.3", + "getrandom 0.2.4", "glob", "hex", "home", @@ -1911,10 +1946,10 @@ dependencies = [ "num_cpus", "once_cell", "regex", - "semver 1.0.4", + "semver 1.0.5", "serde", "serde_json", - "sha2 0.9.8", + "sha2 0.9.9", "thiserror", "tiny-keccak", "tracing", @@ -1923,9 +1958,9 @@ dependencies = [ [[package]] name = "eyre" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "221239d1d5ea86bf5d6f91c9d6bc3646ffe471b08ff9b0f91c44f115ac969d2b" +checksum = "bc225d8f637923fe585089fcf03e705c222131232d2c1fb622e84ecf725d0eb8" dependencies = [ "indenter", "once_cell", @@ -1937,13 +1972,22 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" +[[package]] +name = "fastrand" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" +dependencies = [ + "instant", +] + [[package]] name = "ff" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0f40b2dcd8bc322217a5f6559ae5f9e9d1de202a2ecee2e9eafcbece7562a4f" dependencies = [ - "rand_core 0.6.2", + "rand_core 0.6.3", "subtle", ] @@ -1967,9 +2011,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d" [[package]] name = "flate2" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0" +checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" dependencies = [ "cfg-if 1.0.0", "crc32fast", @@ -2044,9 +2088,9 @@ checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" [[package]] name = "futures" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" dependencies = [ "futures-channel", "futures-core", @@ -2059,9 +2103,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" dependencies = [ "futures-core", "futures-sink", @@ -2069,15 +2113,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" [[package]] name = "futures-executor" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" dependencies = [ "futures-core", "futures-task", @@ -2086,15 +2130,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" [[package]] name = "futures-macro" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ "proc-macro2", "quote", @@ -2103,15 +2147,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" [[package]] name = "futures-task" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" [[package]] name = "futures-timer" @@ -2121,9 +2165,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.18" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ "futures-channel", "futures-core", @@ -2132,7 +2176,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.8", "pin-utils", "slab", ] @@ -2157,9 +2201,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" dependencies = [ "typenum", "version_check", @@ -2172,15 +2216,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ "cfg-if 1.0.0", + "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -2191,9 +2237,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.23.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce" +checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" [[package]] name = "glob" @@ -2207,7 +2253,7 @@ version = "0.3.8" dependencies = [ "abscissa_core", "abscissa_tokio", - "actix-rt 2.5.0", + "actix-rt 2.6.0", "bip32", "bytes 1.1.0", "clap", @@ -2227,14 +2273,14 @@ dependencies = [ "pkcs8", "proc-macro2", "prost", - "rand_core 0.6.2", + "rand_core 0.6.3", "regex", "relayer", "rpassword", "serde", "signatory", "thiserror", - "tokio 1.13.0", + "tokio 1.16.1", "toml", "tonic", "web30", @@ -2307,14 +2353,16 @@ name = "gravity_utils" version = "0.1.0" dependencies = [ "actix", + "bitcoin", "clarity", "cosmos-sdk-proto", "deep_space 2.4.7", "ethers", "gravity_abi", "gravity_proto", + "hdpath", "log", - "num-bigint 0.4.0", + "num-bigint 0.4.3", "num256", "rand 0.8.4", "rustc-hex", @@ -2322,7 +2370,8 @@ dependencies = [ "serde_derive", "serde_json", "sha3", - "tokio 1.13.0", + "tiny-bip39", + "tokio 1.16.1", "tonic", "url", "web30", @@ -2335,7 +2384,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912" dependencies = [ "ff", - "rand_core 0.6.2", + "rand_core 0.6.3", "subtle", ] @@ -2361,9 +2410,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.3" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726" +checksum = "d9f1f717ddc7b2ba36df7e871fd88db79326551d3d6f1fc406fbfd28b582ff8e" dependencies = [ "bytes 1.1.0", "fnv", @@ -2373,22 +2422,32 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.13.0", - "tokio-util 0.6.6", + "tokio 1.16.1", + "tokio-util 0.6.9", "tracing", ] [[package]] name = "hashbrown" -version = "0.9.1" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" + +[[package]] +name = "hdpath" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" +checksum = "72adf5a17a0952ecfcddf8d46d071271d5ee52e78443f07ba0b2dcfe3063a132" +dependencies = [ + "bitcoin", + "byteorder", +] [[package]] name = "heck" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ "unicode-segmentation", ] @@ -2401,9 +2460,9 @@ checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" [[package]] name = "hermit-abi" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" dependencies = [ "libc", ] @@ -2423,18 +2482,28 @@ dependencies = [ "hmac 0.11.0", "once_cell", "pbkdf2 0.8.0", - "rand_core 0.6.2", - "sha2 0.9.8", + "rand_core 0.6.3", + "sha2 0.9.9", "zeroize", ] +[[package]] +name = "hmac" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" +dependencies = [ + "crypto-mac 0.8.0", + "digest 0.9.0", +] + [[package]] name = "hmac" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" dependencies = [ - "crypto-mac 0.10.0", + "crypto-mac 0.10.1", "digest 0.9.0", ] @@ -2444,7 +2513,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ - "crypto-mac 0.11.0", + "crypto-mac 0.11.1", "digest 0.9.0", ] @@ -2470,37 +2539,37 @@ dependencies = [ [[package]] name = "http" -version = "0.2.4" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11" +checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" dependencies = [ "bytes 1.1.0", "fnv", - "itoa", + "itoa 1.0.1", ] [[package]] name = "http-body" -version = "0.4.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfb77c123b4e2f72a2069aeae0b4b4949cc7e966df277813fc16347e7549737" +checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ "bytes 1.1.0", "http", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.8", ] [[package]] name = "httparse" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" +checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" [[package]] name = "httpdate" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6456b8a6c8f33fee7d958fcd1b60d55b11940a79e63ae87013e6d22e26034440" +checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "humantime" @@ -2510,23 +2579,23 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.11" +version = "0.14.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b61cf2d1aebcf6e6352c97b81dc2244ca29194be1b276f5d8ad5c6330fffb11" +checksum = "b7ec3e62bdc98a2f0393a5048e4c30ef659440ea6e0e572965103e72bd836f55" dependencies = [ "bytes 1.1.0", "futures-channel", "futures-core", "futures-util", - "h2 0.3.3", + "h2 0.3.11", "http", "http-body", "httparse", "httpdate", - "itoa", - "pin-project-lite 0.2.6", - "socket2 0.4.0", - "tokio 1.13.0", + "itoa 0.4.8", + "pin-project-lite 0.2.8", + "socket2 0.4.4", + "tokio 1.16.1", "tower-service", "tracing", "want", @@ -2541,7 +2610,7 @@ dependencies = [ "http", "hyper", "rustls", - "tokio 1.13.0", + "tokio 1.16.1", "tokio-rustls", ] @@ -2554,7 +2623,7 @@ dependencies = [ "bytes 1.1.0", "hyper", "native-tls", - "tokio 1.13.0", + "tokio 1.16.1", "tokio-native-tls", ] @@ -2566,9 +2635,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21" +checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" dependencies = [ "matches", "unicode-bidi", @@ -2595,18 +2664,18 @@ dependencies = [ [[package]] name = "impl-serde" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b47ca4d2b6931707a55fce5cf66aff80e2178c8b63bbb4ecb5695cbc870ddf6f" +checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c" dependencies = [ "serde", ] [[package]] name = "impl-trait-for-tuples" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee" +checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb" dependencies = [ "proc-macro2", "quote", @@ -2621,9 +2690,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "1.6.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" +checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" dependencies = [ "autocfg", "hashbrown", @@ -2679,24 +2748,30 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.7" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + +[[package]] +name = "itoa" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" +checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" [[package]] name = "jobserver" -version = "0.1.22" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972f5ae5d1cb9c6ae417789196c803205313edde988685da5e3aae0827b9e7fd" +checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc9ffccd38c451a86bf13657df244e9c3f37493cce8e5e21e940963777acc84" +checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" dependencies = [ "wasm-bindgen", ] @@ -2710,7 +2785,7 @@ dependencies = [ "cfg-if 1.0.0", "ecdsa", "elliptic-curve 0.10.6", - "sha2 0.9.8", + "sha2 0.9.9", "sha3", ] @@ -2750,9 +2825,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.106" +version = "0.2.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a60553f9a9e039a333b4e9b20573b9e9b9c0bb3a11e201ccc48ef4283456d673" +checksum = "e74d72e0f9b65b5b4ca49a346af3976df0f9c61d550727f349ecd559f251a26c" [[package]] name = "linked-hash-map" @@ -2774,15 +2849,15 @@ dependencies = [ [[package]] name = "local-waker" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f9a2d3e27ce99ce2c3aad0b09b1a7b916293ea9b2bf624c13fe646fadd8da4" +checksum = "902eb695eb0591864543cbfbf6d742510642a605a61fc5e97fe6ceb5a30ac4fb" [[package]] name = "lock_api" -version = "0.4.3" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176" +checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" dependencies = [ "scopeguard", ] @@ -2822,9 +2897,9 @@ dependencies = [ [[package]] name = "matches" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "md-5" @@ -2832,14 +2907,14 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6a38fc55c8bbc10058782919516f88826e70320db6d206aebc49611d24216ae" dependencies = [ - "digest 0.10.0", + "digest 0.10.1", ] [[package]] name = "memchr" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" +checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" [[package]] name = "mime" @@ -2878,9 +2953,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.11" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" +checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" dependencies = [ "libc", "log", @@ -2985,7 +3060,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606" dependencies = [ - "num-bigint 0.4.0", + "num-bigint 0.4.3", "num-complex 0.4.0", "num-integer", "num-iter", @@ -3006,9 +3081,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" +checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" dependencies = [ "autocfg", "num-integer", @@ -3017,9 +3092,9 @@ dependencies = [ [[package]] name = "num-bigint" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d047c1062aa51e256408c560894e5251f08925980e53cf1aa5bd00eec6512" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" dependencies = [ "autocfg", "num-integer", @@ -3097,7 +3172,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d41702bd167c2df5520b384281bc111a4b5efcf7fbc4c9c222c815b07e0a6a6a" dependencies = [ "autocfg", - "num-bigint 0.4.0", + "num-bigint 0.4.3", "num-integer", "num-traits", ] @@ -3113,9 +3188,9 @@ dependencies = [ [[package]] name = "num256" -version = "0.3.1" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fa34cf745163764b9af28a43f8c9734005651cb6460cb90c0042ad7fb053705" +checksum = "a0027c7b86f25e89d772d0d78e79bdf36dad3960a63be9f45830af4bfa46eac7" dependencies = [ "lazy_static", "num 0.4.0", @@ -3127,9 +3202,9 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ "hermit-abi", "libc", @@ -3137,15 +3212,18 @@ dependencies = [ [[package]] name = "object" -version = "0.23.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4" +checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +dependencies = [ + "memchr", +] [[package]] name = "once_cell" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" +checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" [[package]] name = "opaque-debug" @@ -3161,9 +3239,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.33" +version = "0.10.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577" +checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -3175,24 +3253,24 @@ dependencies = [ [[package]] name = "openssl-probe" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.15.0+1.1.1k" +version = "111.17.0+1.1.1m" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a" +checksum = "05d6a336abd10814198f66e2a91ccd7336611f30334119ca8ce300536666fcf4" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.61" +version = "0.9.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f" +checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" dependencies = [ "autocfg", "cc", @@ -3206,7 +3284,7 @@ dependencies = [ name = "orchestrator" version = "0.4.1" dependencies = [ - "actix-rt 2.5.0", + "actix-rt 2.6.0", "axum", "clarity", "cosmos_gravity", @@ -3230,7 +3308,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "tokio 1.13.0", + "tokio 1.16.1", "tonic", "web30", ] @@ -3256,7 +3334,7 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" dependencies = [ - "arrayvec 0.7.2", + "arrayvec", "bitvec 0.20.4", "byte-slice-cast", "impl-trait-for-tuples", @@ -3278,9 +3356,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7744ac029df22dca6284efe4e898991d28e3085c706c972bcd7da4a27a15eb" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", @@ -3289,9 +3367,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7a782938e745763fe6907fc6ba86946d72f49fe7e21de074e08128a99fb018" +checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" dependencies = [ "cfg-if 1.0.0", "instant", @@ -3308,7 +3386,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77e0b28ace46c5a396546bcf443bf422b57049617433d8854227352a4a9b24e7" dependencies = [ "base64ct", - "rand_core 0.6.2", + "rand_core 0.6.3", "subtle", ] @@ -3319,15 +3397,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d791538a6dcc1e7cb7fe6f6b58aca40e7f79403c45b2bc274008b5e647af1d8" dependencies = [ "base64ct", - "rand_core 0.6.2", + "rand_core 0.6.3", "subtle", ] [[package]] name = "paste" -version = "1.0.5" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" + +[[package]] +name = "pbkdf2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" +checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" +dependencies = [ + "crypto-mac 0.8.0", +] [[package]] name = "pbkdf2" @@ -3336,11 +3423,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3b8c0d71734018084da0c0354193a5edfb81b20d2d57a92c5b154aefc554a4a" dependencies = [ "base64 0.13.0", - "crypto-mac 0.10.0", + "crypto-mac 0.10.1", "hmac 0.10.1", "rand 0.7.3", "rand_core 0.5.1", - "sha2 0.9.8", + "sha2 0.9.9", "subtle", ] @@ -3351,10 +3438,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" dependencies = [ "base64ct", - "crypto-mac 0.11.0", + "crypto-mac 0.11.1", "hmac 0.11.0", "password-hash 0.2.3", - "sha2 0.9.8", + "sha2 0.9.9", ] [[package]] @@ -3363,17 +3450,17 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f05894bce6a1ba4be299d0c5f29563e08af2bc18bb7d48313113bed71e904739" dependencies = [ - "crypto-mac 0.11.0", + "crypto-mac 0.11.1", "hmac 0.11.0", "password-hash 0.3.2", - "sha2 0.9.8", + "sha2 0.9.9", ] [[package]] name = "pem-rfc7468" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f22eb0e3c593294a99e9ff4b24cf6b752d43f193aa4415fe5077c159996d497" +checksum = "84e93a3b1cc0510b03020f33f21e62acdde3dcaef432edc95bea377fbd4c2cd4" dependencies = [ "base64ct", ] @@ -3406,27 +3493,27 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f" +checksum = "9615c18d31137579e9ff063499264ddc1278e7b1982757ebc111028c4d1dc909" dependencies = [ - "pin-project-internal 0.4.28", + "pin-project-internal 0.4.29", ] [[package]] name = "pin-project" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "576bc800220cc65dac09e99e97b08b358cfab6e17078de8dc5fee223bd2d0c08" +checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" dependencies = [ - "pin-project-internal 1.0.8", + "pin-project-internal 1.0.10", ] [[package]] name = "pin-project-internal" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e" +checksum = "044964427019eed9d49d9d5bbce6047ef18f37100ea400912a9fa4a3523ab12a" dependencies = [ "proc-macro2", "quote", @@ -3435,9 +3522,9 @@ dependencies = [ [[package]] name = "pin-project-internal" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e8fe8163d14ce7f0cdac2e040116f22eac817edabff0be91e8aff7e9accf389" +checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ "proc-macro2", "quote", @@ -3452,9 +3539,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905" +checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" [[package]] name = "pin-utils" @@ -3468,7 +3555,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee3ef9b64d26bad0536099c816c6734379e45bbd5f14798def6809e5cc350447" dependencies = [ - "der 0.4.4", + "der 0.4.5", "pem-rfc7468", "spki", "zeroize", @@ -3476,15 +3563,15 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.19" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" +checksum = "58893f751c9b0412871a09abd62ecd2a00298c6c83befa223ef98c52aef40cbe" [[package]] name = "ppv-lite86" -version = "0.2.10" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" +checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "primitive-types" @@ -3541,9 +3628,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb37d2df5df740e582f28f8560cf425f52bb267d872fe58358eadb554909f07a" +checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" dependencies = [ "unicode-xid", ] @@ -3580,7 +3667,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32d3ebd75ac2679c2af3a92246639f9fcc8a442ee420719cc4fe195b98dd5fa3" dependencies = [ "bytes 1.1.0", - "heck 0.3.2", + "heck 0.3.3", "itertools", "log", "multimap", @@ -3616,9 +3703,9 @@ dependencies = [ [[package]] name = "protobuf" -version = "2.24.1" +version = "2.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db50e77ae196458ccd3dc58a31ea1a90b0698ab1b7928d89f644c25d72070267" +checksum = "cf7e6d18738ecd0902d30d1ad232c9125985a3422929b16c65517b38adc14f96" [[package]] name = "quick-error" @@ -3628,9 +3715,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.9" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" +checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" dependencies = [ "proc-macro2", ] @@ -3680,9 +3767,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", - "rand_chacha 0.3.0", - "rand_core 0.6.2", - "rand_hc 0.3.0", + "rand_chacha 0.3.1", + "rand_core 0.6.3", + "rand_hc 0.3.1", ] [[package]] @@ -3697,12 +3784,12 @@ dependencies = [ [[package]] name = "rand_chacha" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.2", + "rand_core 0.6.3", ] [[package]] @@ -3731,11 +3818,11 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.4", ] [[package]] @@ -3749,11 +3836,11 @@ dependencies = [ [[package]] name = "rand_hc" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ - "rand_core 0.6.2", + "rand_core 0.6.3", ] [[package]] @@ -3767,9 +3854,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.6" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8270314b5ccceb518e7e578952f0b72b88222d02e8f77f5ecf7abbb673539041" +checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ "bitflags", ] @@ -3804,7 +3891,7 @@ checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" name = "register_delegate_keys" version = "0.4.1" dependencies = [ - "actix-rt 2.5.0", + "actix-rt 2.6.0", "clarity", "contact", "cosmos_gravity", @@ -3830,7 +3917,7 @@ name = "relayer" version = "0.4.1" dependencies = [ "actix", - "actix-rt 2.5.0", + "actix-rt 2.6.0", "clarity", "cosmos_gravity", "deep_space 2.4.7", @@ -3846,7 +3933,7 @@ dependencies = [ "openssl-probe", "serde", "serde_derive", - "tokio 1.13.0", + "tokio 1.16.1", "tonic", "web30", ] @@ -3862,15 +3949,16 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.11.7" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bea77bc708afa10e59905c3d4af7c8fd43c9214251673095ff8b14345fcbc5" +checksum = "87f242f1488a539a79bac6dbe7c8609ae43b7914b7736210f239a37cccb32525" dependencies = [ "base64 0.13.0", "bytes 1.1.0", "encoding_rs", "futures-core", "futures-util", + "h2 0.3.11", "http", "http-body", "hyper", @@ -3883,13 +3971,13 @@ dependencies = [ "mime", "native-tls", "percent-encoding", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.8", "rustls", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", - "tokio 1.13.0", + "tokio 1.16.1", "tokio-native-tls", "tokio-rustls", "url", @@ -3969,20 +4057,26 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.10.3" +version = "1.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc7f5b8840fb1f83869a3e1dfd06d93db79ea05311ac5b42b8337d3371caa4f1" +checksum = "4214023b1223d02a4aad9f0bb9828317634a56530870a2eaf7200a99c0c10f68" dependencies = [ - "arrayvec 0.5.2", + "arrayvec", "num-traits", "serde", ] [[package]] name = "rustc-demangle" -version = "0.1.18" +version = "0.1.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" + +[[package]] +name = "rustc-hash" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232" +checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-hex" @@ -4005,7 +4099,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.4", + "semver 1.0.5", ] [[package]] @@ -4017,7 +4111,7 @@ dependencies = [ "log", "ring", "sct", - "webpki 0.22.0", + "webpki", ] [[package]] @@ -4031,9 +4125,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.5" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" [[package]] name = "salsa20" @@ -4080,7 +4174,7 @@ dependencies = [ "password-hash 0.2.3", "pbkdf2 0.8.0", "salsa20", - "sha2 0.9.8", + "sha2 0.9.9", ] [[package]] @@ -4104,11 +4198,12 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733b114f058f260c0af7591434eef4272ae1a8ec2751766d3cb89c6df8d5e450" +checksum = "97d03ceae636d0fed5bae6a7f4f664354c5f4fcedf6eef053fef17e49f837d0a" dependencies = [ - "secp256k1-sys 0.4.0", + "secp256k1-sys 0.4.2", + "serde", ] [[package]] @@ -4122,9 +4217,9 @@ dependencies = [ [[package]] name = "secp256k1-sys" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67e4b6455ee49f5901c8985b88f98fb0a0e1d90a6661f5a03f4888bd987dad29" +checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036" dependencies = [ "cc", ] @@ -4141,9 +4236,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.3.1" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" +checksum = "2dc14f172faf8a0194a3aded622712b0de276821addc574fa54fc0a1167e10dc" dependencies = [ "bitflags", "core-foundation", @@ -4154,9 +4249,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.4.2" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" +checksum = "0160a13a177a45bfb43ce71c01580998474f556ad854dcbca936dd2841a5c556" dependencies = [ "core-foundation-sys", "libc", @@ -4173,9 +4268,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" +checksum = "0486718e92ec9a68fbed73bb5ef687d71103b142595b406835649bebd33f72c7" dependencies = [ "serde", ] @@ -4194,9 +4289,9 @@ checksum = "930c0acf610d3fdb5e2ab6213019aaa04e227ebe9547b0649ba599b16d788bd7" [[package]] name = "serde" -version = "1.0.130" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" dependencies = [ "serde_derive", ] @@ -4234,9 +4329,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.130" +version = "1.0.136" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", @@ -4245,45 +4340,65 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e466864e431129c7e0d3476b92f20458e5879919a0596c6472738d9fa2d342f8" +checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" dependencies = [ - "itoa", + "itoa 1.0.1", "ryu", "serde", ] [[package]] name = "serde_urlencoded" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ "form_urlencoded", - "itoa", + "itoa 1.0.1", "ryu", "serde", ] [[package]] name = "sha-1" -version = "0.9.4" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfebf75d25bd900fd1e7d11501efab59bc846dbc76196839663e6637bba9f25f" +checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", - "cpuid-bool", + "cpufeatures", "digest 0.9.0", "opaque-debug 0.3.0", ] +[[package]] +name = "sha-1" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "028f48d513f9678cda28f6e4064755b3fbb2af6acd672f2c209b62323f7aea0f" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.1", +] + [[package]] name = "sha1" -version = "0.6.0" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +dependencies = [ + "sha1_smol", +] + +[[package]] +name = "sha1_smol" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" +checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" [[package]] name = "sha2" @@ -4299,9 +4414,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", "cfg-if 1.0.0", @@ -4343,9 +4458,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" dependencies = [ "libc", ] @@ -4357,7 +4472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfecc059e81632eef1dd9b79e22fc28b8fe69b30d3357512a77a0ad8ee3c782" dependencies = [ "pkcs8", - "rand_core 0.6.2", + "rand_core 0.6.3", "signature", "zeroize", ] @@ -4369,20 +4484,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2807892cfa58e081aa1f1111391c7a0649d4fa127a4ffbe34bcbfb35a1171a4" dependencies = [ "digest 0.9.0", - "rand_core 0.6.2", + "rand_core 0.6.3", ] [[package]] name = "slab" -version = "0.4.2" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" +checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" [[package]] name = "smallvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" +checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" [[package]] name = "socket2" @@ -4397,9 +4512,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.0" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e3dfc207c526015c632472a77be09cf1b6e46866581aecae5cc38fb4235dea2" +checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" dependencies = [ "libc", "winapi 0.3.9", @@ -4417,7 +4532,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c01a0c15da1b0b0e1494112e7af814a678fec9bd157881b49beac661e9b6f32" dependencies = [ - "der 0.4.4", + "der 0.4.5", ] [[package]] @@ -4492,9 +4607,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "subtle" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "subtle-encoding" @@ -4507,9 +4622,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.82" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" +checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" dependencies = [ "proc-macro2", "quote", @@ -4546,13 +4661,13 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "5cdb1ef4eaeeaddc8fbd371e5017057064af0911902ef36b39801f67cc6d79e4" dependencies = [ "cfg-if 1.0.0", + "fastrand", "libc", - "rand 0.8.4", "redox_syscall", "remove_dir_all", "winapi 0.3.9", @@ -4591,7 +4706,7 @@ name = "test_runner" version = "0.1.0" dependencies = [ "actix", - "actix-rt 2.5.0", + "actix-rt 2.6.0", "actix-web", "clarity", "cosmos_gravity", @@ -4611,7 +4726,7 @@ dependencies = [ "rand 0.8.4", "serde", "serde_derive", - "tokio 1.13.0", + "tokio 1.16.1", "tonic", "url", "web30", @@ -4673,9 +4788,9 @@ dependencies = [ [[package]] name = "time" -version = "0.2.26" +version = "0.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08a8cbfbf47955132d0202d1662f49b2423ae35862aee471f3ba4b133358f372" +checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" dependencies = [ "const_fn", "libc", @@ -4698,9 +4813,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", @@ -4709,6 +4824,25 @@ dependencies = [ "syn", ] +[[package]] +name = "tiny-bip39" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" +dependencies = [ + "anyhow", + "hmac 0.8.1", + "once_cell", + "pbkdf2 0.4.0", + "rand 0.7.3", + "rustc-hash", + "sha2 0.9.9", + "thiserror", + "unicode-normalization", + "wasm-bindgen", + "zeroize", +] + [[package]] name = "tiny-keccak" version = "2.0.2" @@ -4720,9 +4854,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.2.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342" +checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" dependencies = [ "tinyvec_macros", ] @@ -4755,19 +4889,18 @@ dependencies = [ [[package]] name = "tokio" -version = "1.13.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "588b2d10a336da58d877567cd8fb8a14b463e2104910f8132cd054b4b96e29ee" +checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" dependencies = [ - "autocfg", "bytes 1.1.0", "libc", "memchr", - "mio 0.7.11", + "mio 0.7.14", "num_cpus", "once_cell", "parking_lot", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.8", "signal-hook-registry", "tokio-macros", "winapi 0.3.9", @@ -4775,9 +4908,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "1.1.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf7b11a536f46a809a8a9f0bb4237020f70ecbf115b842360afb127ea2fda57" +checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ "proc-macro2", "quote", @@ -4791,7 +4924,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" dependencies = [ "native-tls", - "tokio 1.13.0", + "tokio 1.16.1", ] [[package]] @@ -4806,36 +4939,36 @@ dependencies = [ [[package]] name = "tokio-openssl" -version = "0.6.1" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac1bec5c0a4aa71e3459802c7a12e8912c2091ce2151004f9ce95cc5d1c6124e" +checksum = "c08f9ffb7809f1b20c1b398d92acf4cc719874b3b2b2d9ea2f09b4a80350878a" dependencies = [ - "futures", + "futures-util", "openssl", - "pin-project 1.0.8", - "tokio 1.13.0", + "openssl-sys", + "tokio 1.16.1", ] [[package]] name = "tokio-rustls" -version = "0.23.1" +version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4baa378e417d780beff82bf54ceb0d195193ea6a00c14e22359e7f39456b5689" +checksum = "a27d5f2b839802bd8267fa19b0530f5a08b9c08cd417976be2a65d130fe1c11b" dependencies = [ "rustls", - "tokio 1.13.0", - "webpki 0.22.0", + "tokio 1.16.1", + "webpki", ] [[package]] name = "tokio-stream" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e177a5d8c3bf36de9ebe6d58537d8879e964332f93fb3339e43f618c81361af0" +checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" dependencies = [ "futures-core", - "pin-project-lite 0.2.6", - "tokio 1.13.0", + "pin-project-lite 0.2.8", + "tokio 1.16.1", ] [[package]] @@ -4854,16 +4987,16 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.6" +version = "0.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "940a12c99365c31ea8dd9ba04ec1be183ffe4920102bb7122c2f515437601e8e" +checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" dependencies = [ "bytes 1.1.0", "futures-core", "futures-sink", "log", - "pin-project-lite 0.2.6", - "tokio 1.13.0", + "pin-project-lite 0.2.8", + "tokio 1.16.1", ] [[package]] @@ -4877,9 +5010,9 @@ dependencies = [ [[package]] name = "tonic" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "556dc31b450f45d18279cfc3d2519280273f460d5387e6b7b24503e65d206f8b" +checksum = "2ac42cd97ac6bd2339af5bcabf105540e21e45636ec6fa6aae5e85d44db31be0" dependencies = [ "async-stream", "async-trait", @@ -4887,17 +5020,17 @@ dependencies = [ "bytes 1.1.0", "futures-core", "futures-util", - "h2 0.3.3", + "h2 0.3.11", "http", "http-body", "hyper", "percent-encoding", - "pin-project 1.0.8", + "pin-project 1.0.10", "prost", "prost-derive", - "tokio 1.13.0", + "tokio 1.16.1", "tokio-stream", - "tokio-util 0.6.6", + "tokio-util 0.6.9", "tower", "tower-service", "tracing", @@ -4918,19 +5051,20 @@ dependencies = [ [[package]] name = "tower" -version = "0.4.6" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f715efe02c0862926eb463e49368d38ddb119383475686178e32e26d15d06a66" +checksum = "5651b5f6860a99bd1adb59dbfe1db8beb433e73709d9032b413a77e2fb7c066a" dependencies = [ "futures-core", "futures-util", "indexmap", - "pin-project 1.0.8", + "pin-project 1.0.10", + "pin-project-lite 0.2.8", "rand 0.8.4", "slab", - "tokio 1.13.0", + "tokio 1.16.1", "tokio-stream", - "tokio-util 0.6.6", + "tokio-util 0.6.9", "tower-layer", "tower-service", "tracing", @@ -4938,16 +5072,16 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b56efe69aa0ad2b5da6b942e57ea9f6fe683b7a314d4ff48662e2c8838de1" +checksum = "81eca72647e58054bbfa41e6f297c23436f1c60aff6e5eb38455a0f9ca420bb5" dependencies = [ "bytes 1.1.0", "futures-core", "futures-util", "http", "http-body", - "pin-project 1.0.8", + "pin-project 1.0.10", "tower-layer", "tower-service", ] @@ -4966,22 +5100,22 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "2d8d93354fe2a8e50d5953f5ae2e47a3fc2ef03292e7ea46e3cc38f549525fb9" dependencies = [ "cfg-if 1.0.0", "log", - "pin-project-lite 0.2.6", + "pin-project-lite 0.2.8", "tracing-attributes", "tracing-core", ] [[package]] name = "tracing-attributes" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" +checksum = "8276d9a4a3a558d7b7ad5303ad50b53d58264641b82914b7ada36bd762e7a716" dependencies = [ "proc-macro2", "quote", @@ -4990,11 +5124,12 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "03cfcb51380632a72d3111cb8d3447a8d908e577d31beeac006f836383d29a23" dependencies = [ "lazy_static", + "valuable", ] [[package]] @@ -5003,7 +5138,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ - "pin-project 1.0.8", + "pin-project 1.0.10", "tracing", ] @@ -5020,9 +5155,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5312f325fe3588e277415f5a6cca1f4ccad0f248c4cd5a4bd33032d7286abc22" +checksum = "74786ce43333fcf51efe947aed9718fbe46d5c7328ec3f1029e818083966d9aa" dependencies = [ "ansi_term", "lazy_static", @@ -5095,15 +5230,15 @@ checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" [[package]] name = "typenum" -version = "1.13.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06" +checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "uint" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6470ab50f482bde894a037a57064480a246dbfdd5960bd65a44824693f08da5f" +checksum = "12f03af7ccf01dd611cc450a0d10dbc9b745770d096473e2faf0ca6e2d66d1e0" dependencies = [ "byteorder", "crunchy", @@ -5113,33 +5248,30 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0" -dependencies = [ - "matches", -] +checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" [[package]] name = "unicode-normalization" -version = "0.1.17" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.7.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" +checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" [[package]] name = "unicode-xid" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" +checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" [[package]] name = "untrusted" @@ -5165,21 +5297,27 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.4", "serde", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" -version = "0.2.11" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb" +checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" [[package]] name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wait-timeout" @@ -5225,9 +5363,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasm-bindgen" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632f73e236b219150ea279196e54e610f5dbafa5d61786303d4da54f84e47fce" +checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -5235,9 +5373,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a317bf8f9fba2476b4b2c85ef4c4af8ff39c3c7f0cdfeed4f82c34a880aa837b" +checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" dependencies = [ "bumpalo", "lazy_static", @@ -5250,9 +5388,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.28" +version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e8d7523cb1f2a4c96c1317ca690031b714a51cc14e05f712446691f413f5d39" +checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -5262,9 +5400,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56146e7c495528bf6587663bea13a8eb588d39b36b679d83972e1a2dbbdacf9" +checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5272,9 +5410,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7803e0eea25835f8abdc585cd3021b3deb11543c6fe226dcd30b228857c5c5ab" +checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" dependencies = [ "proc-macro2", "quote", @@ -5285,9 +5423,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.78" +version = "0.2.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0237232789cf037d5480773fe568aac745bfe2afbc11a863e97901780a6b47cc" +checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" [[package]] name = "wasm-timer" @@ -5306,9 +5444,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.55" +version = "0.3.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38eb105f1c59d9eaa6b5cdc92b859d85b926e82cb2e0945cd0c9259faa6fe9fb" +checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" dependencies = [ "js-sys", "wasm-bindgen", @@ -5320,7 +5458,7 @@ version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2560569747f3bdfe0011ccd2a5a52fd5e3d455de0578a4d6d50ec41ecbb5235" dependencies = [ - "awc 3.0.0-beta.8", + "awc 3.0.0-beta.20", "clarity", "futures", "lazy_static", @@ -5330,17 +5468,7 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "tokio 1.13.0", -] - -[[package]] -name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring", - "untrusted", + "tokio 1.16.1", ] [[package]] @@ -5355,20 +5483,21 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.21.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aabe153544e473b775453675851ecc86863d2a81d786d741f6b76778f2a48940" +checksum = "552ceb903e957524388c4d3475725ff2c8b7960922063af6ce53c9a43da07449" dependencies = [ - "webpki 0.21.4", + "webpki", ] [[package]] name = "which" -version = "4.1.0" +version = "4.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55551e42cbdf2ce2bedd2203d0cc08dba002c27510f86dab6d0ce304cba3dfe" +checksum = "2a5a7e487e921cf220206864a94a89b6c6905bfc19f1057fa26a4cb360e5c1d2" dependencies = [ "either", + "lazy_static", "libc", ] @@ -5475,18 +5604,18 @@ checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" [[package]] name = "zeroize" -version = "1.4.2" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf68b08513768deaa790264a7fac27a58cbf2705cfcdc9448362229217d7e970" +checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdff2024a851a322b08f179173ae2ba620445aef1e838f0c196820eade4ae0c7" +checksum = "81e8f13fef10b63c06356d65d416b070798ddabcadc10d3ece0c5be9b3c7eddb" dependencies = [ "proc-macro2", "quote", @@ -5496,18 +5625,18 @@ dependencies = [ [[package]] name = "zstd" -version = "0.7.0+zstd.1.4.9" +version = "0.10.0+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9428752481d8372e15b1bf779ea518a179ad6c771cca2d2c60e4fbff3cc2cd52" +checksum = "3b1365becbe415f3f0fcd024e2f7b45bacfb5bdd055f0dc113571394114e7bdd" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "3.1.0+zstd.1.4.9" +version = "4.1.4+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa1926623ad7fe406e090555387daf73db555b948134b4d73eac5eb08fb666d" +checksum = "2f7cd17c9af1a4d6c24beb1cc54b17e2ef7b593dc92f19e9d9acad8b182bbaee" dependencies = [ "libc", "zstd-sys", @@ -5515,9 +5644,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "1.5.0+zstd.1.4.9" +version = "1.6.3+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e6c094340240369025fc6b731b054ee2a834328fa584310ac96aa4baebdc465" +checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" dependencies = [ "cc", "libc", diff --git a/orchestrator/Cargo.toml b/orchestrator/Cargo.toml index a5fd79794..1f66b7a63 100644 --- a/orchestrator/Cargo.toml +++ b/orchestrator/Cargo.toml @@ -41,3 +41,15 @@ gorc = { path = "./gorc" } relayer = { path = "./relayer" } gravity_abi_build = { path = "./gravity_abi_build" } gravity_abi = { path = "./gravity_abi" } + +[features] +ethermint = [ + "orchestrator/ethermint", + "cosmos_gravity/ethermint", + "relayer/ethermint", + "gorc/ethermint", + "register_delegate_keys/ethermint", +] + +[patch.crates-io] +deep_space = { git = "https://github.com/iqlusioninc/deep_space/", branch = "master" } diff --git a/orchestrator/cosmos_gravity/Cargo.toml b/orchestrator/cosmos_gravity/Cargo.toml index ee8100713..fb124245b 100644 --- a/orchestrator/cosmos_gravity/Cargo.toml +++ b/orchestrator/cosmos_gravity/Cargo.toml @@ -11,7 +11,7 @@ gravity_utils = {path = "../gravity_utils"} ethereum_gravity = {path = "../ethereum_gravity"} gravity_proto = {path = "../gravity_proto/"} -deep_space ={git="https://github.com/iqlusioninc/deep_space/", branch="master"} +deep_space = "2.4.7" ethers = { git = "https://github.com/iqlusioninc/ethers-rs.git", branch="zaki/error_abi_support", features = ["abigen"] } clarity = "0.4.11" serde = "1.0" @@ -29,3 +29,6 @@ bytes = "1" env_logger = "0.8" rand = "0.8" actix = "0.12" + +[features] +ethermint = [] diff --git a/orchestrator/cosmos_gravity/src/build.rs b/orchestrator/cosmos_gravity/src/build.rs index e09652e4b..3984a922f 100644 --- a/orchestrator/cosmos_gravity/src/build.rs +++ b/orchestrator/cosmos_gravity/src/build.rs @@ -1,4 +1,3 @@ -use deep_space::private_key::PrivateKey as CosmosPrivateKey; use deep_space::Contact; use deep_space::Msg; use ethereum_gravity::types::EthClient; @@ -13,6 +12,8 @@ use gravity_utils::message_signatures::{ use gravity_utils::types::*; use std::collections::BTreeMap; +use crate::crypto::PrivateKey as CosmosPrivateKey; + pub async fn signer_set_tx_confirmation_messages( contact: &Contact, eth_client: EthClient, diff --git a/orchestrator/cosmos_gravity/src/crypto.rs b/orchestrator/cosmos_gravity/src/crypto.rs new file mode 100644 index 000000000..098a4f9dc --- /dev/null +++ b/orchestrator/cosmos_gravity/src/crypto.rs @@ -0,0 +1,104 @@ +use deep_space::private_key::TxParts; +use std::str::FromStr; + +#[cfg(not(feature = "ethermint"))] +use deep_space::public_key::COSMOS_PUBKEY_URL; +use deep_space::{ + error::{Bip39Error, HdWalletError, PrivateKeyError}, + private_key::{PrivateKey as InnerPrivateKey, SignType}, + Address, MessageArgs, Msg, +}; + +#[cfg(feature = "ethermint")] +pub const DEFAULT_HD_PATH: &str = "m/44'/60'/0'/0/0"; +#[cfg(not(feature = "ethermint"))] +pub const DEFAULT_HD_PATH: &str = "m/44'/118'/0'/0/0"; + +/// PrivateKey wraps cosmos private key, switch between cosmos and ethermint behavior according to cargo features. +#[derive(Debug, Copy, Clone)] +pub struct PrivateKey(InnerPrivateKey); + +impl FromStr for PrivateKey { + type Err = PrivateKeyError; + fn from_str(s: &str) -> Result { + InnerPrivateKey::from_str(s).map(Self) + } +} + +impl Into for PrivateKey { + fn into(self) -> InnerPrivateKey { + self.0 + } +} + +impl PrivateKey { + pub fn from_hd_wallet_path( + hd_path: &str, + phrase: &str, + passphrase: &str, + ) -> Result { + InnerPrivateKey::from_hd_wallet_path(hd_path, phrase, passphrase).map(Self) + } + + pub fn from_phrase(phrase: &str, passphrase: &str) -> Result { + if phrase.is_empty() { + return Err(HdWalletError::Bip39Error(Bip39Error::BadWordCount(0)).into()); + } + Self::from_hd_wallet_path(DEFAULT_HD_PATH, phrase, passphrase) + } + + pub fn from_secret(secret: &[u8]) -> Self { + Self(InnerPrivateKey::from_secret(secret)) + } + + pub fn to_address(&self, prefix: &str) -> Result { + #[cfg(feature = "ethermint")] + let result = { + let pubkey = self.0.to_public_key("")?; + Ok(pubkey.to_ethermint_address_with_prefix(prefix)?) + }; + #[cfg(not(feature = "ethermint"))] + let result = self.0.to_address(prefix); + + result + } + + pub fn sign_std_msg( + &self, + messages: &[Msg], + args: MessageArgs, + memo: impl Into, + ) -> Result, PrivateKeyError> { + #[cfg(feature = "ethermint")] + let result = self.0.sign_std_msg_ethermint( + messages, + args, + memo, + "/ethermint.crypto.v1.ethsecp256k1.PubKey", + ); + #[cfg(not(feature = "ethermint"))] + let result = self.0.sign_std_msg(messages, args, memo); + + result + } + + pub fn build_tx( + &self, + messages: &[Msg], + args: MessageArgs, + memo: impl Into, + ) -> Result { + #[cfg(feature = "ethermint")] + return self.0.build_tx( + messages, + args, + memo, + "/ethermint.crypto.v1.ethsecp256k1.PubKey", + SignType::Ethermint, + ); + #[cfg(not(feature = "ethermint"))] + return self + .0 + .build_tx(messages, args, memo, COSMOS_PUBKEY_URL, SignType::Cosmos); + } +} diff --git a/orchestrator/cosmos_gravity/src/lib.rs b/orchestrator/cosmos_gravity/src/lib.rs index 5106af88f..a8df72da7 100644 --- a/orchestrator/cosmos_gravity/src/lib.rs +++ b/orchestrator/cosmos_gravity/src/lib.rs @@ -7,6 +7,7 @@ extern crate log; pub mod build; +pub mod crypto; pub mod query; pub mod send; pub mod utils; diff --git a/orchestrator/cosmos_gravity/src/send.rs b/orchestrator/cosmos_gravity/src/send.rs index 09a830dc1..957dafdbc 100644 --- a/orchestrator/cosmos_gravity/src/send.rs +++ b/orchestrator/cosmos_gravity/src/send.rs @@ -2,7 +2,6 @@ use bytes::BytesMut; use deep_space::address::Address; use deep_space::coin::Coin; use deep_space::error::CosmosGrpcError; -use deep_space::private_key::PrivateKey as CosmosPrivateKey; use deep_space::Contact; use deep_space::Fee; use deep_space::Msg; @@ -19,6 +18,8 @@ use std::cmp; use std::collections::HashSet; use std::{result::Result, time::Duration}; +use crate::crypto::PrivateKey as CosmosPrivateKey; + pub const MEMO: &str = "Sent using Gravity Bridge Orchestrator"; pub const TIMEOUT: Duration = Duration::from_secs(60); diff --git a/orchestrator/ethereum_gravity/Cargo.toml b/orchestrator/ethereum_gravity/Cargo.toml index 45b49d0c7..a8b77af42 100644 --- a/orchestrator/ethereum_gravity/Cargo.toml +++ b/orchestrator/ethereum_gravity/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" gravity_abi = { path = "../gravity_abi" } gravity_utils = { path = "../gravity_utils" } -deep_space = { git="https://github.com/iqlusioninc/deep_space/", branch = "master" } +deep_space = "2.4.7" ethers = { git = "https://github.com/iqlusioninc/ethers-rs.git", branch = "zaki/error_abi_support", features = ["abigen"] } clarity = "0.4.11" web30 = "0.15.4" diff --git a/orchestrator/gorc/Cargo.toml b/orchestrator/gorc/Cargo.toml index 62277995d..f6c9e7263 100644 --- a/orchestrator/gorc/Cargo.toml +++ b/orchestrator/gorc/Cargo.toml @@ -18,7 +18,7 @@ gravity_utils = { path = "../gravity_utils" } orchestrator = { path = "../orchestrator" } relayer = { path = "../relayer" } -deep_space ={git="https://github.com/iqlusioninc/deep_space/", branch="master"} +deep_space = "2.4.7" ethers = { git = "https://github.com/iqlusioninc/ethers-rs.git", branch = "zaki/error_abi_support", features = ["abigen"] } clarity = "0.4.12" actix-rt = "2.5" @@ -50,4 +50,7 @@ version = "0.6.0-rc.0" [dev-dependencies] abscissa_core = { version = "0.6.0-rc.0", features = ["testing"] } -once_cell = "1.2" \ No newline at end of file +once_cell = "1.2" + +[features] +ethermint = ["cosmos_gravity/ethermint", "orchestrator/ethermint", "relayer/ethermint"] diff --git a/orchestrator/gorc/src/commands/tx/cosmos.rs b/orchestrator/gorc/src/commands/tx/cosmos.rs index c59a68cc0..c99bf2a72 100644 --- a/orchestrator/gorc/src/commands/tx/cosmos.rs +++ b/orchestrator/gorc/src/commands/tx/cosmos.rs @@ -4,10 +4,11 @@ use crate::{application::APP, prelude::*, utils::*}; use abscissa_core::{clap::Parser, Command, Runnable}; use clarity::Uint256; use cosmos_gravity::send::send_to_eth; -use deep_space::{coin::Coin, private_key::PrivateKey as CosmosPrivateKey}; +use deep_space::coin::Coin; use ethers::types::Address as EthAddress; use gravity_proto::gravity::DenomToErc20Request; use gravity_utils::connection_prep::{check_for_fee_denom, create_rpc_connections}; +use cosmos_gravity::crypto::PrivateKey as CosmosPrivateKey; use regex::Regex; use std::process::exit; diff --git a/orchestrator/gorc/src/config.rs b/orchestrator/gorc/src/config.rs index 54d4010f5..96fbc919c 100644 --- a/orchestrator/gorc/src/config.rs +++ b/orchestrator/gorc/src/config.rs @@ -1,3 +1,4 @@ +use cosmos_gravity::crypto::DEFAULT_HD_PATH; use ethers::signers::LocalWallet as EthWallet; use serde::{Deserialize, Serialize}; use signatory::FsKeyStore; @@ -32,7 +33,7 @@ impl GorcConfig { EthWallet::from(self.load_secret_key(name)) } - pub fn load_deep_space_key(&self, name: String) -> deep_space::private_key::PrivateKey { + pub fn load_deep_space_key(&self, name: String) -> cosmos_gravity::crypto::PrivateKey { let key = self.load_secret_key(name).to_bytes(); let key = deep_space::utils::bytes_to_hex_str(&key); key.parse().expect("Could not parse private key") @@ -101,7 +102,7 @@ pub struct CosmosSection { impl Default for CosmosSection { fn default() -> Self { Self { - key_derivation_path: "m/44'/118'/0'/0/0".to_owned(), + key_derivation_path: DEFAULT_HD_PATH.to_owned(), grpc: "http://localhost:9090".to_owned(), prefix: "cosmos".to_owned(), gas_price: GasPrice::default(), diff --git a/orchestrator/gravity_utils/Cargo.toml b/orchestrator/gravity_utils/Cargo.toml index 6b525afba..eff0d947a 100644 --- a/orchestrator/gravity_utils/Cargo.toml +++ b/orchestrator/gravity_utils/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" gravity_abi = { path = "../gravity_abi" } gravity_proto = { path = "../gravity_proto/" } cosmos-sdk-proto = "0.6.3" -deep_space = { git="https://github.com/iqlusioninc/deep_space/", branch="master" } +deep_space = "2.4.7" ethers = { git = "https://github.com/iqlusioninc/ethers-rs.git", branch = "zaki/error_abi_support", features = ["abigen"] } web30 = "0.15" clarity = "0.4.11" @@ -24,7 +24,11 @@ num-bigint = "0.4" log = "0.4" url = "2" sha3 = "0.9" +tiny-bip39 = "0.8.0" +bitcoin = { version = "=0.27", features = ["use-serde"] } +hdpath = { version = "0.6.0", features = ["with-bitcoin"] } rustc-hex = "2.1.0" + [dev_dependencies] rand = "0.8" actix = "0.12" diff --git a/orchestrator/orchestrator/Cargo.toml b/orchestrator/orchestrator/Cargo.toml index 689c86eee..b89fb9b37 100644 --- a/orchestrator/orchestrator/Cargo.toml +++ b/orchestrator/orchestrator/Cargo.toml @@ -16,7 +16,7 @@ gravity_abi = { path = "../gravity_abi" } gravity_utils = { path = "../gravity_utils" } gravity_proto = { path = "../gravity_proto" } -deep_space={git="https://github.com/iqlusioninc/deep_space/", branch = "master" } +deep_space = "2.4.7" ethers = { git = "https://github.com/iqlusioninc/ethers-rs.git", branch = "zaki/error_abi_support", features = ["abigen"] } serde_derive = "1.0" clarity = "0.4.11" @@ -45,3 +45,6 @@ prometheus = "0.12.0" # feature includes it's own OpenSSL version that's compiled on the fly # If ANY crate in this workspace has this it will work for all of them. openssl = { version = "0.10", features = ["vendored"] } + +[features] +ethermint = ["cosmos_gravity/ethermint", "relayer/ethermint"] diff --git a/orchestrator/orchestrator/src/ethereum_event_watcher.rs b/orchestrator/orchestrator/src/ethereum_event_watcher.rs index e6e91004d..8c189fcae 100644 --- a/orchestrator/orchestrator/src/ethereum_event_watcher.rs +++ b/orchestrator/orchestrator/src/ethereum_event_watcher.rs @@ -6,7 +6,7 @@ use crate::get_with_retry::get_chain_id_with_retry; use crate::metrics; use cosmos_gravity::build; use cosmos_gravity::query::get_last_event_nonce; -use deep_space::private_key::PrivateKey as CosmosPrivateKey; +use cosmos_gravity::crypto::PrivateKey as CosmosPrivateKey; use deep_space::{Contact, Msg}; use ethereum_gravity::types::EthClient; use ethers::prelude::*; diff --git a/orchestrator/orchestrator/src/main_loop.rs b/orchestrator/orchestrator/src/main_loop.rs index 3d36a4405..fc2a5e0da 100644 --- a/orchestrator/orchestrator/src/main_loop.rs +++ b/orchestrator/orchestrator/src/main_loop.rs @@ -19,7 +19,7 @@ use cosmos_gravity::{ }; use deep_space::client::ChainStatus; use deep_space::error::CosmosGrpcError; -use deep_space::private_key::PrivateKey as CosmosPrivateKey; +use cosmos_gravity::crypto::PrivateKey as CosmosPrivateKey; use deep_space::{Contact, Msg}; use ethereum_gravity::types::EthClient; use ethereum_gravity::utils::get_gravity_id; diff --git a/orchestrator/register_delegate_keys/Cargo.toml b/orchestrator/register_delegate_keys/Cargo.toml index 71679d100..3e6d4e8b6 100644 --- a/orchestrator/register_delegate_keys/Cargo.toml +++ b/orchestrator/register_delegate_keys/Cargo.toml @@ -15,7 +15,7 @@ cosmos_gravity = {path = "../cosmos_gravity"} gravity_utils = {path = "../gravity_utils"} gravity_proto = {path = "../gravity_proto/"} -deep_space ={git="https://github.com/iqlusioninc/deep_space/", branch="master"} +deep_space = "2.4.7" ethers = { git = "https://github.com/iqlusioninc/ethers-rs.git", branch = "zaki/error_abi_support", features = ["abigen"] } contact = "0.4" serde_derive = "1.0" @@ -28,4 +28,7 @@ web30 = "0.15" env_logger = "0.8" log = "0.4.14" openssl-probe = "0.1" -rand = "0.8" \ No newline at end of file +rand = "0.8" + +[features] +ethermint = ["cosmos_gravity/ethermint", "relayer/ethermint"] diff --git a/orchestrator/register_delegate_keys/src/main.rs b/orchestrator/register_delegate_keys/src/main.rs index 79b418b62..02fa06dc0 100644 --- a/orchestrator/register_delegate_keys/src/main.rs +++ b/orchestrator/register_delegate_keys/src/main.rs @@ -7,13 +7,14 @@ extern crate lazy_static; use clarity::PrivateKey as EthPrivateKey; use cosmos_gravity::send::update_gravity_delegate_addresses; -use deep_space::{mnemonic::Mnemonic, private_key::PrivateKey as CosmosPrivateKey}; +use deep_space::{coin::Coin, mnemonic::Mnemonic}; use docopt::Docopt; use ethers::core::k256::ecdsa::SigningKey; use ethers::prelude::*; use gravity_utils::connection_prep::check_for_fee_denom; use gravity_utils::connection_prep::{create_rpc_connections, wait_for_cosmos_node_ready}; use log::error; +use cosmos_gravity::crypto::PrivateKey as CosmosPrivateKey; use rand::{thread_rng, Rng}; use std::time::Duration; diff --git a/orchestrator/relayer/Cargo.toml b/orchestrator/relayer/Cargo.toml index 23b9b76b1..dfd257bf2 100644 --- a/orchestrator/relayer/Cargo.toml +++ b/orchestrator/relayer/Cargo.toml @@ -19,7 +19,7 @@ gravity_abi = { path = "../gravity_abi" } gravity_utils = { path = "../gravity_utils" } gravity_proto = { path = "../gravity_proto" } -deep_space ={git="https://github.com/iqlusioninc/deep_space/", branch="master"} +deep_space = "2.4.7" ethers = { git = "https://github.com/iqlusioninc/ethers-rs.git", branch = "zaki/error_abi_support", features = ["abigen"] } serde_derive = "1.0" clarity = "0.4.11" @@ -34,6 +34,8 @@ tokio = "1.4" tonic = "0.4" openssl-probe = "0.1" - [dev-dependencies] actix = "0.12" + +[features] +ethermint = ["cosmos_gravity/ethermint"] diff --git a/orchestrator/test_runner/Cargo.toml b/orchestrator/test_runner/Cargo.toml index 41474fdf9..7a2e8e1d5 100644 --- a/orchestrator/test_runner/Cargo.toml +++ b/orchestrator/test_runner/Cargo.toml @@ -17,7 +17,7 @@ gravity_utils = {path = "../gravity_utils"} gravity_proto = {path = "../gravity_proto/"} orchestrator = {path = "../orchestrator/"} -deep_space ={git="https://github.com/iqlusioninc/deep_space/", branch="master"} +deep_space = "2.4.7" serde_derive = "1.0" clarity = "0.4.11" docopt = "1" @@ -36,3 +36,6 @@ rand = "0.8" tonic = "0.4" futures = "0.3.18" hex = "0.4.3" + +[features] +ethermint = ["cosmos_gravity/ethermint", "orchestrator/ethermint"] diff --git a/orchestrator/test_runner/src/bootstrapping.rs b/orchestrator/test_runner/src/bootstrapping.rs index 1d9e12338..ffb2788ac 100644 --- a/orchestrator/test_runner/src/bootstrapping.rs +++ b/orchestrator/test_runner/src/bootstrapping.rs @@ -1,5 +1,5 @@ use crate::utils::ValidatorKeys; -use deep_space::private_key::PrivateKey as CosmosPrivateKey; +use cosmos_gravity::crypto::PrivateKey as CosmosPrivateKey; use ethers::core::k256::ecdsa::SigningKey; use ethers::types::Address as EthAddress; use std::fs::File; diff --git a/orchestrator/test_runner/src/happy_path.rs b/orchestrator/test_runner/src/happy_path.rs index 429f1e86c..4cacc97f4 100644 --- a/orchestrator/test_runner/src/happy_path.rs +++ b/orchestrator/test_runner/src/happy_path.rs @@ -7,11 +7,11 @@ use crate::MINER_CLIENT; use crate::OPERATION_TIMEOUT; use crate::TOTAL_TIMEOUT; use clarity::Uint256; +use cosmos_gravity::crypto::PrivateKey as CosmosPrivateKey; use cosmos_gravity::send::{send_request_batch_tx, send_to_eth}; use cosmos_gravity::{build, query::get_oldest_unsigned_transaction_batch, send}; use deep_space::address::Address as CosmosAddress; use deep_space::coin::Coin; -use deep_space::private_key::PrivateKey as CosmosPrivateKey; use deep_space::Contact; use ethereum_gravity::erc20_utils::get_erc20_balance; use ethereum_gravity::utils::get_valset_nonce; @@ -185,7 +185,7 @@ pub async fn test_valset_update( delegate_address.parse().unwrap(), amount.clone(), get_fee(), - keys_to_change.orch_key, + keys_to_change.orch_key.into(), Some(OPERATION_TIMEOUT), ) .await; diff --git a/orchestrator/test_runner/src/happy_path_v2.rs b/orchestrator/test_runner/src/happy_path_v2.rs index e02f22a20..53e717134 100644 --- a/orchestrator/test_runner/src/happy_path_v2.rs +++ b/orchestrator/test_runner/src/happy_path_v2.rs @@ -120,7 +120,7 @@ pub async fn happy_path_test_v2( send_to_user_coin.clone(), Some(get_fee()), user.cosmos_address, - keys[0].validator_key, + keys[0].validator_key.into(), Some(TOTAL_TIMEOUT), ) .await diff --git a/orchestrator/test_runner/src/orch_keys_update.rs b/orchestrator/test_runner/src/orch_keys_update.rs index ac0f98a67..ffb14322e 100644 --- a/orchestrator/test_runner/src/orch_keys_update.rs +++ b/orchestrator/test_runner/src/orch_keys_update.rs @@ -3,7 +3,7 @@ use crate::utils::ValidatorKeys; use cosmos_gravity::send::update_gravity_delegate_addresses; use deep_space::address::Address as CosmosAddress; -use deep_space::private_key::PrivateKey as CosmosPrivateKey; +use cosmos_gravity::crypto::PrivateKey as CosmosPrivateKey; use deep_space::Contact; use ethers::types::Address as EthAddress; use ethers::{core::k256::ecdsa::SigningKey, prelude::*}; diff --git a/orchestrator/test_runner/src/utils.rs b/orchestrator/test_runner/src/utils.rs index c09ebd9ea..a7197f203 100644 --- a/orchestrator/test_runner/src/utils.rs +++ b/orchestrator/test_runner/src/utils.rs @@ -1,7 +1,7 @@ use crate::one_eth; use deep_space::address::Address as CosmosAddress; use deep_space::coin::Coin; -use deep_space::private_key::PrivateKey as CosmosPrivateKey; +use cosmos_gravity::crypto::PrivateKey as CosmosPrivateKey; use deep_space::Contact; use ethereum_gravity::{erc20_utils::get_erc20_balance, types::EthClient}; use ethers::core::k256::ecdsa::SigningKey;