diff --git a/Cargo.lock b/Cargo.lock index ec9a7b12d..e1aa1a5f2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -55,7 +55,7 @@ dependencies = [ "actix-tls", "actix-utils", "ahash 0.8.3", - "base64 0.21.2", + "base64 0.21.3", "bitflags 1.3.2", "brotli", "bytes", @@ -108,9 +108,9 @@ dependencies = [ [[package]] name = "actix-rt" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15265b6b8e2347670eb363c47fc8c75208b4a4994b27192f345fcbe707804f3e" +checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d" dependencies = [ "actix-macros", "futures-core", @@ -119,9 +119,9 @@ dependencies = [ [[package]] name = "actix-server" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e8613a75dd50cc45f473cee3c34d59ed677c0f7b44480ce3b8247d7dc519327" +checksum = "3eb13e7eef0423ea6eab0e59f6c72e7cb46d33691ad56a726b3cd07ddec2c2d4" dependencies = [ "actix-rt", "actix-service", @@ -129,8 +129,7 @@ dependencies = [ "futures-core", "futures-util", "mio", - "num_cpus", - "socket2 0.4.9", + "socket2 0.5.3", "tokio", "tracing", ] @@ -148,21 +147,22 @@ dependencies = [ [[package]] name = "actix-tls" -version = "3.0.3" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fde0cf292f7cdc7f070803cb9a0d45c018441321a78b1042ffbbb81ec333297" +checksum = "a70bd48b6604191a700372f60bdc997db560eff5e4d41a7f00664390b5228b38" dependencies = [ - "actix-codec", "actix-rt", "actix-service", "actix-utils", "futures-core", "http", - "log", + "impl-more", "openssl", "pin-project-lite", + "tokio", "tokio-openssl", "tokio-util", + "tracing", ] [[package]] @@ -308,7 +308,6 @@ version = "0.1.0" dependencies = [ "althea_types", "ipnetwork", - "itertools", "lazy_static", "log", "mac_address", @@ -316,7 +315,6 @@ dependencies = [ "regex", "serde", "serde_derive", - "serde_json", ] [[package]] @@ -345,7 +343,6 @@ dependencies = [ "bincode", "clarity", "deep_space", - "hex", "ipnetwork", "lettre", "num256", @@ -380,7 +377,6 @@ name = "antenna_forwarding_protocol" version = "0.1.0" dependencies = [ "althea_types", - "clarity", "lazy_static", "log", "rand", @@ -405,12 +401,6 @@ dependencies = [ "serde", ] -[[package]] -name = "ascii" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d92bec98840b8f03a5ff5413de5293bfcd8bf96467cf5452609f939ec6f5de16" - [[package]] name = "async-stream" version = "0.3.5" @@ -452,12 +442,9 @@ dependencies = [ "clarity", "futures 0.3.28", "log", - "num", "num256", - "rand", "serde", "serde_derive", - "tokio", "web30", ] @@ -480,7 +467,7 @@ dependencies = [ "actix-tls", "actix-utils", "ahash 0.7.6", - "base64 0.21.2", + "base64 0.21.3", "bytes", "cfg-if", "cookie", @@ -551,8 +538,6 @@ dependencies = [ name = "babel_monitor" version = "0.1.0" dependencies = [ - "ascii", - "env_logger", "ipnetwork", "log", "serde", @@ -593,9 +578,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.2" +version = "0.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" +checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" [[package]] name = "bech32" @@ -822,14 +807,11 @@ dependencies = [ "althea_types", "clarity", "deep_space", - "env_logger", "ipgen", "lazy_static", "log", "rand", "regex", - "serde", - "serde_derive", "serde_json", "settings", "sodiumoxide", @@ -962,7 +944,7 @@ version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e" dependencies = [ - "nix 0.26.2", + "nix 0.26.3", "windows-sys", ] @@ -973,7 +955,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15d26a222539536b33bdbf45d3fe5673acb520a2d62cd564cb19b528dfa41e40" dependencies = [ "althea_proto", - "base64 0.21.2", + "base64 0.21.3", "bech32", "bytes", "clarity", @@ -1102,7 +1084,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbfb21b9878cf7a348dcb8559109aabc0ec40d69924bd706fa5149846c4fef75" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "memchr", ] @@ -1286,7 +1268,6 @@ dependencies = [ "futures-core", "futures-task", "futures-util", - "num_cpus", ] [[package]] @@ -1461,12 +1442,6 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - [[package]] name = "hex-literal" version = "0.3.4" @@ -1608,6 +1583,12 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "impl-more" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "206ca75c9c03ba3d4ace2460e57b189f39f43de612c2f85836e65c929701bb2d" + [[package]] name = "indexmap" version = "1.9.3" @@ -1660,7 +1641,7 @@ dependencies = [ "ipnetwork", "lazy_static", "log", - "nix 0.26.2", + "nix 0.26.3", "num-traits", "num256", "petgraph", @@ -1787,7 +1768,7 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76bd09637ae3ec7bd605b8e135e757980b3968430ff2b1a4a94fb7769e50166d" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "email-encoding", "email_address", "fastrand 1.9.0", @@ -1912,9 +1893,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "76fc44e2588d5b436dbc3c6cf62aef290f90dab6235744a93dfe1cc18f451e2c" [[package]] name = "memoffset" @@ -2021,16 +2002,15 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" +checksum = "abbbc55ad7b13aac85f9401c796dcda1b864e07fcad40ad47792eaa8932ea502" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cfg-if", "libc", "memoffset 0.7.1", "pin-utils", - "static_assertions", ] [[package]] @@ -2043,73 +2023,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "num" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af" -dependencies = [ - "num-bigint", - "num-complex", - "num-integer", - "num-iter", - "num-rational", - "num-traits", -] - -[[package]] -name = "num-bigint" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-complex" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" -dependencies = [ - "autocfg", - "num-bigint", - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.16" @@ -2167,7 +2080,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c75a0ec2d1b302412fb503224289325fcc0e44600176864804c7211b055cfd58" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "byteorder", "md-5", "sha2", @@ -2176,11 +2089,11 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.56" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729b745ad4a5575dd06a3e1af1414bd330ee561c01b3899eb584baeaa8def17e" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.0", "cfg-if", "foreign-types", "libc", @@ -2217,9 +2130,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.91" +version = "0.9.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "866b5f16f90776b9bb8dc1e1802ac6f0513de3a7a7465867bfbc563dc737faac" +checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" dependencies = [ "cc", "libc", @@ -2380,9 +2293,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -2564,25 +2477,25 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a" +checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" dependencies = [ "aho-corasick", "memchr", "regex-automata", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] name = "regex-automata" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69" +checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.4", + "regex-syntax 0.7.5", ] [[package]] @@ -2605,9 +2518,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" [[package]] name = "rend" @@ -2624,7 +2537,7 @@ version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", "bytes", "encoding_rs", "futures-core", @@ -2721,7 +2634,6 @@ version = "0.21.1" dependencies = [ "actix", "actix-web", - "actix-web-httpauth", "althea_kernel_interface", "althea_types", "antenna_forwarding_client", @@ -2729,9 +2641,7 @@ dependencies = [ "awc", "babel_monitor", "clarity", - "clu", "compressed_log", - "deep_space", "futures 0.3.28", "hex-literal", "ipnetwork", @@ -2788,11 +2698,9 @@ dependencies = [ "compressed_log", "cosmos-sdk-proto-althea 0.13.3", "deep_space", - "docopt", "env_logger", "flate2", "futures 0.3.28", - "hex-literal", "ipnetwork", "lazy_static", "log", @@ -2817,11 +2725,9 @@ dependencies = [ "actix-web", "althea_kernel_interface", "althea_types", - "arrayvec", "awc", "babel_monitor", "clarity", - "compressed_log", "deep_space", "handlebars", "ipnetwork", @@ -2830,8 +2736,6 @@ dependencies = [ "log", "num256", "phonenumber", - "r2d2", - "rand", "reqwest", "rita_client_registration", "rita_common", @@ -2923,9 +2827,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.8" +version = "0.38.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ed4fa021d81c8392ce04db050a3da9a60299050b7ae1cf482d862b54a7218f" +checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" dependencies = [ "bitflags 2.4.0", "errno", @@ -2964,7 +2868,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.2", + "base64 0.21.3", ] [[package]] @@ -3071,9 +2975,9 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.186" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f5db24220c009de9bd45e69fb2938f4b6d2df856aa9304ce377b3180f83b7c1" +checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" dependencies = [ "serde_derive", ] @@ -3090,9 +2994,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.186" +version = "1.0.188" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad697f7e0b65af4983a4ce8f56ed5b357e8d3c36651bf6a7e13639c17b8e670" +checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" dependencies = [ "proc-macro2", "quote", @@ -3131,7 +3035,6 @@ dependencies = [ "arrayvec", "auto-bridge", "clarity", - "deep_space", "ipnetwork", "lazy_static", "log", @@ -3249,12 +3152,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" version = "0.10.0" @@ -3359,9 +3256,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.27" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07" +checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" dependencies = [ "deranged", "itoa", @@ -3378,9 +3275,9 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" [[package]] name = "time-macros" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "733d258752e9303d392b94b75230d07b0b9c489350c69b851fc6c065fde3e8f9" +checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" dependencies = [ "time-core", ] @@ -3684,9 +3581,9 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna 0.4.0", diff --git a/althea_kernel_interface/Cargo.toml b/althea_kernel_interface/Cargo.toml index 2ae9e4a6d..96a4bda59 100644 --- a/althea_kernel_interface/Cargo.toml +++ b/althea_kernel_interface/Cargo.toml @@ -8,7 +8,6 @@ edition = "2018" [dependencies] oping = "0.3" -itertools = "0.10" lazy_static = "1.4" log = "0.4" serde_derive = "1.0" @@ -16,7 +15,6 @@ serde = "1.0" althea_types = { path = "../althea_types" } ipnetwork = "0.20" mac_address = "1.1.4" -serde_json = "1.0" [dependencies.regex] version = "1.6" @@ -25,4 +23,4 @@ features = ["std"] [features] -integration_test = [] \ No newline at end of file +integration_test = [] diff --git a/althea_types/Cargo.toml b/althea_types/Cargo.toml index cf02686e7..e8c59c005 100644 --- a/althea_types/Cargo.toml +++ b/althea_types/Cargo.toml @@ -13,16 +13,14 @@ base64 = "0.13" serde_derive = "1.0" serde = "1.0" serde_json = "1.0" -hex = "0.4" sodiumoxide = "0.2" clarity = "1.2" -arrayvec = {version= "0.7", features = ["serde"]} +arrayvec = { version = "0.7", features = ["serde"] } phonenumber = "0.3" -lettre = {version = "0.10", features = ["serde"]} +lettre = { version = "0.10", features = ["serde"] } ipnetwork = "0.20" bincode = "1.3" -deep_space = {version = "2", features = ["althea"]} +deep_space = { version = "2", features = ["althea"] } [dev-dependencies] rand = "0.8" - diff --git a/antenna_forwarding_protocol/Cargo.toml b/antenna_forwarding_protocol/Cargo.toml index 6fc6a6c8f..bd08d15b9 100644 --- a/antenna_forwarding_protocol/Cargo.toml +++ b/antenna_forwarding_protocol/Cargo.toml @@ -5,14 +5,13 @@ authors = ["Justin Kilpatrick "] edition = "2018" [dependencies] -althea_types = { path = "../althea_types"} +althea_types = { path = "../althea_types" } serde_json = "1.0" serde_derive = "1.0" serde = "1.0" sodiumoxide = "0.2" -clarity = "1.2" log = "0.4" lazy_static = "1.4" [dev-dependencies] -rand = "0.8" \ No newline at end of file +rand = "0.8" diff --git a/auto_bridge/Cargo.toml b/auto_bridge/Cargo.toml index 961ed5566..723b6d49d 100644 --- a/auto_bridge/Cargo.toml +++ b/auto_bridge/Cargo.toml @@ -8,13 +8,9 @@ edition = "2018" web30 = "1.0" num256 = "0.5" clarity = "1.2" -rand = "0.8" -num = "0.4" log = "0.4" serde_derive = "1.0" serde = "1.0" -tokio = "1.2" -futures = {version="0.3", features = ["thread-pool"]} [dev-dependencies] actix = "0.13" diff --git a/babel_monitor/Cargo.toml b/babel_monitor/Cargo.toml index 9fe47060f..cb073194b 100644 --- a/babel_monitor/Cargo.toml +++ b/babel_monitor/Cargo.toml @@ -5,8 +5,6 @@ version = "0.1.0" edition = "2018" [dependencies] -ascii = "1.0" -env_logger = "0.10" ipnetwork = "0.20" log = "0.4" serde = "1.0" diff --git a/clu/Cargo.toml b/clu/Cargo.toml index c078c76ba..fa37af8ed 100644 --- a/clu/Cargo.toml +++ b/clu/Cargo.toml @@ -10,15 +10,12 @@ althea_kernel_interface = { path = "../althea_kernel_interface" } althea_types = { path = "../althea_types" } lazy_static = "1.4" log = "0.4" -env_logger = "0.10.0" ipgen = "1.0.1" rand = "0.8" -serde = "1.0" -serde_derive = "1.0" serde_json = "1.0" clarity = "1.2" sodiumoxide = "0.2" -deep_space = {version = "2", features = ["althea"]} +deep_space = { version = "2", features = ["althea"] } [dependencies.regex] version = "1.5" diff --git a/rita_client/Cargo.toml b/rita_client/Cargo.toml index 2aae8022c..a67b6ee38 100644 --- a/rita_client/Cargo.toml +++ b/rita_client/Cargo.toml @@ -7,7 +7,7 @@ license = "Apache-2.0" [dependencies] compressed_log = "0.5" -num-traits="0.2" +num-traits = "0.2" num256 = "0.5" serde = "1.0" serde_derive = "1.0" @@ -25,20 +25,19 @@ lettre = "0.10" rand = "0.8.0" phonenumber = "0.3" babel_monitor = { path = "../babel_monitor" } -arrayvec = {version= "0.7", features = ["serde"]} +arrayvec = { version = "0.7", features = ["serde"] } sodiumoxide = "0.2" -clu = { path = "../clu" } web30 = "1.0" awc = "3.1" ipnetwork = "0.20" -actix-async = {package="actix", version = "0.13"} -actix-web-async = { package="actix-web", version = "4.3", default_features = false, features= ["openssl"]} -actix-web-httpauth-async = { package="actix-web-httpauth", version = "0.8.0"} +actix-async = { package = "actix", version = "0.13" } +actix-web-async = { package = "actix-web", version = "4.3", default_features = false, features = [ + "openssl", +] } clarity = "1.2" openssh-keys = "0.6" mac_address = "1.1.4" futures = { version = "0.3", features = ["compat"] } -deep_space = {version = "2", features = ["althea"]} [lib] name = "rita_client" diff --git a/rita_common/Cargo.toml b/rita_common/Cargo.toml index f852f17a9..a605f0ac2 100644 --- a/rita_common/Cargo.toml +++ b/rita_common/Cargo.toml @@ -8,37 +8,45 @@ license = "Apache-2.0" rand = "0.8.0" ipnetwork = "0.20" serde_derive = "1.0" -hex-literal = "0.3" -docopt = "1.1" serde = "1.0" bytes = "1.0" compressed_log = "0.5.4" byteorder = { version = "1.4", features = ["i128"] } -arrayvec = {version= "0.7", features = ["serde"]} +arrayvec = { version = "0.7", features = ["serde"] } babel_monitor = { path = "../babel_monitor" } -flate2 = { version = "1.0", features = ["rust_backend"], default-features = false } -actix-async = {package="actix", version = "0.13"} -auto-bridge = {path = "../auto_bridge"} +flate2 = { version = "1.0", features = [ + "rust_backend", +], default-features = false } +actix-async = { package = "actix", version = "0.13" } +auto-bridge = { path = "../auto_bridge" } serde_json = "1.0" log = { version = "0.4", features = ["release_max_level_info"] } settings = { path = "../settings" } clarity = "1.2" futures = { version = "0.3", features = ["compat"] } num256 = "0.5" -num-traits="0.2" +num-traits = "0.2" bincode = "1.3" serde_cbor = "0.11" lazy_static = "1.4" althea_kernel_interface = { path = "../althea_kernel_interface" } -actix-web-httpauth-async = { package="actix-web-httpauth", version = "0.8.0"} -actix-web-async = { package="actix-web", version = "4.3", default_features = false, features= ["openssl"]} -awc = {version = "3.1", default-features = false, features=["openssl", "compress-gzip", "compress-zstd"]} +actix-web-httpauth-async = { package = "actix-web-httpauth", version = "0.8.0" } +actix-web-async = { package = "actix-web", version = "4.3", default_features = false, features = [ + "openssl", +] } +awc = { version = "3.1", default-features = false, features = [ + "openssl", + "compress-gzip", + "compress-zstd", +] } actix-service = "2.0.2" web30 = "1.0" althea_types = { path = "../althea_types" } -deep_space = {version = "2", features = ["althea"]} -cosmos-sdk-proto-althea = {package = "cosmos-sdk-proto-althea", version = "0.13", features = ["ethermint"]} -prost-types ="0.10" +deep_space = { version = "2", features = ["althea"] } +cosmos-sdk-proto-althea = { package = "cosmos-sdk-proto-althea", version = "0.13", features = [ + "ethermint", +] } +prost-types = "0.10" [dependencies.regex] version = "1.6" diff --git a/rita_exit/Cargo.toml b/rita_exit/Cargo.toml index f6a820bf4..fd7e39137 100644 --- a/rita_exit/Cargo.toml +++ b/rita_exit/Cargo.toml @@ -7,7 +7,6 @@ license = "Apache-2.0" [dependencies] # debug is used here to make sure exit logs remain accessible locally -compressed_log = { version = "0.5", features = ["debug"] } sodiumoxide = "0.2" num256 = "0.5" rita_common = { path = "../rita_common" } @@ -19,7 +18,6 @@ babel_monitor = { path = "../babel_monitor" } actix-async = { package = "actix", version = "0.13" } awc = "3.1" handlebars = "4.0" -rand = "0.8.0" lazy_static = "1.4" ipnetwork = "0.20" clarity = "1.2" @@ -28,8 +26,6 @@ serde_derive = "1.0" serde_json = "1.0" lettre = { version = "0.10", features = ["file-transport"] } phonenumber = "0.3" -r2d2 = "0.8" -arrayvec = { version = "0.7", features = ["serde"] } log = { version = "0.4", features = ["release_max_level_info"] } reqwest = { version = "0.11", features = ["blocking", "json"] } actix-web-async = { package = "actix-web", version = "4.3", default_features = false, features = [ diff --git a/settings/Cargo.toml b/settings/Cargo.toml index 9ffb02f42..8b7826dd7 100644 --- a/settings/Cargo.toml +++ b/settings/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Ben "] edition = "2018" [dependencies] -althea_types = { path = "../althea_types"} +althea_types = { path = "../althea_types" } althea_kernel_interface = { path = "../althea_kernel_interface" } auto-bridge = { path = "../auto_bridge" } num256 = "0.5" @@ -16,9 +16,8 @@ toml = "0.5" log = "0.4" lazy_static = "1.4" clarity = "1.2" -arrayvec = {version= "0.7", features = ["serde"]} +arrayvec = { version = "0.7", features = ["serde"] } phonenumber = "0.3" ipnetwork = "0.20" -deep_space = {version = "2", features = ["althea"]} -[features] \ No newline at end of file +[features]