From 17c31c2a02a513629fccace6d4ca355e47068efb Mon Sep 17 00:00:00 2001 From: irriden Date: Sat, 17 Jun 2023 18:45:26 +0000 Subject: [PATCH] set common dependencies in workspace --- Cargo.lock | 176 +----------------------------------------- Cargo.toml | 15 ++++ factory/Cargo.toml | 26 +++---- sphinx-key/Cargo.toml | 24 +++--- 4 files changed, 42 insertions(+), 199 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d81b9dc..aba2a0e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -137,7 +137,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide 0.6.2", + "miniz_oxide", "object", "rustc-demangle", ] @@ -148,12 +148,6 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" -[[package]] -name = "base64" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d" - [[package]] name = "bech32" version = "0.9.1" @@ -304,16 +298,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "cargo_toml" -version = "0.15.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "599aa35200ffff8f04c1925aa1acc92fa2e08874379ef42e210a80e527e60838" -dependencies = [ - "serde", - "toml", -] - [[package]] name = "cc" version = "1.0.79" @@ -438,15 +422,6 @@ dependencies = [ "libc", ] -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - [[package]] name = "critical-section" version = "1.1.1" @@ -636,7 +611,6 @@ dependencies = [ "anyhow", "bindgen", "bitflags", - "cargo_toml", "cmake", "filetime", "globwalk", @@ -649,8 +623,6 @@ dependencies = [ "strum 0.24.1", "tempfile", "thiserror", - "toml", - "ureq", "which", ] @@ -784,16 +756,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "flate2" -version = "1.0.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" -dependencies = [ - "crc32fast", - "miniz_oxide 0.7.1", -] - [[package]] name = "fnv" version = "1.0.7" @@ -991,7 +953,7 @@ dependencies = [ "hash32", "rustc_version", "serde", - "spin 0.9.8", + "spin", "stable_deref_trait", ] @@ -1272,15 +1234,6 @@ dependencies = [ "adler", ] -[[package]] -name = "miniz_oxide" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" -dependencies = [ - "adler", -] - [[package]] name = "nb" version = "0.1.3" @@ -1573,21 +1526,6 @@ dependencies = [ "windows-sys 0.45.0", ] -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin 0.5.2", - "untrusted", - "web-sys", - "winapi", -] - [[package]] name = "rmp" version = "0.8.11" @@ -1645,28 +1583,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "rustls" -version = "0.21.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32ca28af694bc1bbf399c33a516dbdf1c90090b8ab23c2bc24f834aa2247f5f" -dependencies = [ - "log", - "ring", - "rustls-webpki", - "sct", -] - -[[package]] -name = "rustls-webpki" -version = "0.100.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "rustversion" version = "1.0.12" @@ -1694,16 +1610,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "secp256k1" version = "0.24.3" @@ -1785,15 +1691,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_spanned" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d" -dependencies = [ - "serde", -] - [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -1812,7 +1709,7 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07ff71d2c147a7b57362cead5e22f772cd52f6ab31cfcd9edcd7f6aeb2a0afbe" dependencies = [ - "base64 0.13.1", + "base64", "chrono", "hex", "serde", @@ -1863,7 +1760,7 @@ version = "0.1.12" source = "git+https://github.com/stakwork/sphinx-rs.git#057476d30a233d82d85456a83a10401b72533a8c" dependencies = [ "anyhow", - "base64 0.13.1", + "base64", "hex", "log", "secp256k1", @@ -1930,7 +1827,6 @@ dependencies = [ "esp-idf-svc", "esp-idf-sys", "log", - "rand", ] [[package]] @@ -1952,12 +1848,6 @@ dependencies = [ "vls-protocol-signer", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -2117,26 +2007,11 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" -[[package]] -name = "toml" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6135d499e69981f9ff0ef2167955a5333c35e36f6937d382974566b3d5b94ec" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - [[package]] name = "toml_datetime" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f" -dependencies = [ - "serde", -] [[package]] name = "toml_edit" @@ -2145,8 +2020,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739" dependencies = [ "indexmap", - "serde", - "serde_spanned", "toml_datetime", "winnow", ] @@ -2220,28 +2093,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "ureq" -version = "2.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4b45063f47caea744e48f5baa99169bd8bd9b882d80a99941141327bbb00f99" -dependencies = [ - "base64 0.21.2", - "flate2", - "log", - "once_cell", - "rustls", - "rustls-webpki", - "url", - "webpki-roots", -] - [[package]] name = "url" version = "2.3.0" @@ -2402,25 +2253,6 @@ version = "0.2.87" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" -[[package]] -name = "web-sys" -version = "0.3.64" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki", -] - [[package]] name = "which" version = "4.4.0" diff --git a/Cargo.toml b/Cargo.toml index 502112c..d6c3fce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,6 +12,21 @@ exclude = [ "tester", ] +[workspace.package] +edition = "2021" +rust-version = "1.66" + +[workspace.dependencies] +esp-idf-sys = { version = "0.33.1", features = ["binstart"] } +esp-idf-svc = { version = "0.46.0", features = ["experimental", "alloc"] } +esp-idf-hal = "0.41.1" +embedded-svc = "0.25.0" +embedded-hal = "=1.0.0-alpha.10" +anyhow = { version = "1", features = ["backtrace"]} +log = "0.4.17" +bitflags = "1.3.2" +embuild = "0.31.2" + [profile.release] strip = true # Automatically strip symbols from the binary. opt-level = "z" # Optimize for size. diff --git a/factory/Cargo.toml b/factory/Cargo.toml index b1e8e9e..b98d700 100644 --- a/factory/Cargo.toml +++ b/factory/Cargo.toml @@ -2,25 +2,21 @@ name = "sphinx-key-factory" version = "0.1.0" authors = ["decentclock "] -edition = "2021" -rust-version = "1.66" - -[features] -pio = ["esp-idf-sys/pio"] +edition.workspace = true +rust-version.workspace = true [dependencies] -esp-idf-sys = { version = "0.33.1", features = ["binstart"] } -esp-idf-svc = { version = "0.46.0", features = ["experimental", "alloc"] } -esp-idf-hal = "0.41.1" -embedded-svc = "0.25.0" -embedded-hal = "=1.0.0-alpha.10" -anyhow = { version = "1", features = ["backtrace"]} -rand = "0.8.5" -log = "0.4.17" -bitflags = "1.3.2" +esp-idf-sys.workspace = true +esp-idf-svc.workspace = true +esp-idf-hal.workspace = true +embedded-svc.workspace = true +embedded-hal.workspace = true +anyhow.workspace = true +log.workspace = true +bitflags.workspace = true [build-dependencies] -embuild = "0.31.2" +embuild.workspace = true [package.metadata.espflash] partition_table = "table.csv" diff --git a/sphinx-key/Cargo.toml b/sphinx-key/Cargo.toml index 3712cfb..93886c5 100644 --- a/sphinx-key/Cargo.toml +++ b/sphinx-key/Cargo.toml @@ -2,13 +2,12 @@ name = "sphinx-key" version = "0.1.0" authors = ["Evan Feenstra "] -edition = "2021" -rust-version = "1.66" +edition.workspace = true +rust-version.workspace = true [features] default = ["std"] std = ["sphinx-signer"] -pio = ["esp-idf-sys/pio"] pingpong = [] no_persist = [] @@ -18,14 +17,6 @@ sphinx-signer = { git = "https://github.com/stakwork/sphinx-rs.git", optional = # lss-connector = { path = "../../sphinx-rs/lss-connector", default-features = false } lss-connector = { git = "https://github.com/stakwork/sphinx-rs.git", default-features = false } sphinx-crypter = { git = "https://github.com/stakwork/sphinx-rs.git" } -bitflags = "1.3.2" -esp-idf-sys = { version = "0.33.1", features = ["binstart"] } -embedded-svc = "0.25.0" -esp-idf-svc = { version = "0.46.0", features = ["experimental", "alloc"] } -esp-idf-hal = "0.41.1" -embedded-hal = "=1.0.0-alpha.10" -anyhow = {version = "1", features = ["backtrace"]} -log = "0.4" url = "2" serde_urlencoded = "0.7.1" serde = { version = "1.0.137", default-features = false } @@ -33,8 +24,17 @@ serde_json = { version = "1.0.81", default-features = false } hex = "0.4.3" rmp-serde = "1.1.0" +bitflags.workspace = true +esp-idf-sys.workspace = true +embedded-svc.workspace = true +esp-idf-svc.workspace = true +esp-idf-hal.workspace = true +embedded-hal.workspace = true +anyhow.workspace = true +log.workspace = true + [build-dependencies] -embuild = "0.31.2" +embuild.workspace = true [[bin]] name = "clear"