From 7743c1321acddc7a7d94158fe85a94db872265f7 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 16 Sep 2024 14:48:45 +0200 Subject: [PATCH] chore: prepare release tags * set `publish = false` for multiple Cargo.toml files * cargo update * fix taplo.toml * sort `workspace.dependencies` * add `cargo-release` to nix shell Signed-off-by: Harald Hoyer --- Cargo.lock | 159 +++++++++----------- Cargo.toml | 10 +- bin/tee-key-preexec/Cargo.toml | 1 + bin/tee-ratls-preexec/Cargo.toml | 1 + bin/tee-self-attestation-test/Cargo.toml | 1 + bin/tee-stress-client/Cargo.toml | 1 + bin/tee-vault-admin/Cargo.toml | 1 + bin/tee-vault-unseal/Cargo.toml | 1 + bin/teepot-read/Cargo.toml | 1 + bin/teepot-write/Cargo.toml | 1 + bin/vault-admin/Cargo.toml | 1 + bin/vault-unseal/Cargo.toml | 1 + bin/verify-attestation/Cargo.toml | 1 + bin/verify-era-proof-attestation/Cargo.toml | 3 +- shells/teepot/default.nix | 2 + taplo.toml | 9 +- 16 files changed, 99 insertions(+), 95 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ab50607..412658e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -211,19 +211,13 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" +checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375" dependencies = [ "gimli", ] -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - [[package]] name = "adler2" version = "2.0.0" @@ -325,9 +319,9 @@ checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "argon2" @@ -406,9 +400,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.8.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae74d9bd0a7530e8afd1770739ad34b36838829d6ad61818f9230f683f5ad77" +checksum = "2f95446d919226d587817a7d21379e6eb099b97b45110a7f272a444ca5c54070" dependencies = [ "aws-lc-sys", "mirai-annotations", @@ -418,9 +412,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.20.1" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0e249228c6ad2d240c2dc94b714d711629d52bad946075d8e9b2f5391f0703" +checksum = "234314bd569802ec87011d653d6815c6d7b9ffb969e9fee5b8b20ef860e8dce9" dependencies = [ "bindgen 0.69.4", "cc", @@ -478,17 +472,17 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.73" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" +checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" dependencies = [ "addr2line", - "cc", "cfg-if", "libc", - "miniz_oxide 0.7.4", + "miniz_oxide", "object", "rustc-demangle", + "windows-targets 0.52.6", ] [[package]] @@ -714,9 +708,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" dependencies = [ "bytemuck_derive", ] @@ -774,9 +768,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.15" +version = "1.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +checksum = "2d74707dde2ba56f86ae90effb3b43ddd369504387e718014de010cec7959800" dependencies = [ "jobserver", "libc", @@ -857,9 +851,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -867,9 +861,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstyle", "clap_lex", @@ -971,9 +965,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -1636,7 +1630,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide 0.8.0", + "miniz_oxide", ] [[package]] @@ -1814,9 +1808,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" +checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64" [[package]] name = "glob" @@ -2118,16 +2112,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", "hyper 1.4.1", "hyper-util", "log", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -2177,9 +2171,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-channel", @@ -2329,9 +2323,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "iter-read" @@ -2430,7 +2424,7 @@ dependencies = [ "http 1.1.0", "jsonrpsee-core", "pin-project", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pki-types", "rustls-platform-verifier", "soketto", @@ -2483,7 +2477,7 @@ dependencies = [ "hyper-util", "jsonrpsee-core", "jsonrpsee-types", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-platform-verifier", "serde", "serde_json", @@ -2785,15 +2779,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" -dependencies = [ - "adler", -] - [[package]] name = "miniz_oxide" version = "0.8.0" @@ -3049,9 +3034,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "33ea5043e58958ee56f3e15a90aee535795cd7dfd319846288d93c5b57d85cbe" [[package]] name = "opaque-debug" @@ -3795,9 +3780,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] @@ -4041,9 +4026,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.35" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -4068,9 +4053,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "aws-lc-rs", "log", @@ -4131,7 +4116,7 @@ dependencies = [ "jni", "log", "once_cell", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-native-certs", "rustls-platform-verifier-android", "rustls-webpki", @@ -4149,9 +4134,9 @@ checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" [[package]] name = "rustls-webpki" -version = "0.102.7" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "aws-lc-rs", "ring", @@ -4182,11 +4167,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -4234,12 +4219,12 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.29.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" +checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ "rand", - "secp256k1-sys 0.10.0", + "secp256k1-sys 0.10.1", ] [[package]] @@ -4253,9 +4238,9 @@ dependencies = [ [[package]] name = "secp256k1-sys" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1433bd67156263443f14d603720b082dd3121779323fce20cba2aa07b874bc1b" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" dependencies = [ "cc", ] @@ -4415,9 +4400,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -4434,9 +4419,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", @@ -4445,9 +4430,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "itoa", "memchr", @@ -4849,7 +4834,7 @@ dependencies = [ "anyhow", "clap", "rand", - "secp256k1 0.29.0", + "secp256k1 0.29.1", "teepot", "tracing", "tracing-log 0.2.0", @@ -5211,16 +5196,16 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pki-types", "tokio", ] [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -5229,9 +5214,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -5343,9 +5328,9 @@ dependencies = [ [[package]] name = "tracing-actix-web" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ee9e39a66d9b615644893ffc1704d2a89b5b315b7fd0228ad3182ca9a306b19" +checksum = "284586dc201db407be8c9d721abad1b3a6dacbbce5cccecd4fd15a37db95ab0d" dependencies = [ "actix-web", "mutually_exclusive_features", @@ -5495,9 +5480,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" @@ -5634,7 +5619,7 @@ dependencies = [ "anyhow", "clap", "hex", - "secp256k1 0.29.0", + "secp256k1 0.29.1", "teepot", "zksync_basic_types", ] @@ -5649,7 +5634,7 @@ dependencies = [ "hex", "jsonrpsee-types", "reqwest 0.12.7", - "secp256k1 0.29.0", + "secp256k1 0.29.1", "serde", "teepot", "tokio", @@ -6451,7 +6436,7 @@ dependencies = [ "jsonrpsee", "pin-project-lite", "rlp", - "rustls 0.23.12", + "rustls 0.23.13", "serde", "serde_json", "thiserror", diff --git a/Cargo.toml b/Cargo.toml index 49e0e1c..b2c6d62 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,6 @@ actix-http = "3" actix-tls = "3" actix-web = { version = "4.5", features = ["rustls-0_22"] } anyhow = "1.0.82" -ctrlc = "3.4" awc = { version = "3.4", features = ["rustls-0_22-webpki-roots"] } base64 = "0.22.0" bitflags = "2.5" @@ -28,6 +27,7 @@ bytemuck = { version = "1.15.0", features = ["derive", "min_const_generics", "ex bytes = "1" clap = { version = "4.5", features = ["std", "derive", "env", "error-context", "help", "usage", "wrap_help"], default-features = false } const-oid = { version = "0.9", default-features = false } +ctrlc = "3.4" der = "0.7.9" enumset = { version = "1.1", features = ["serde"] } futures-core = { version = "0.3.30", features = ["alloc"], default-features = false } @@ -36,12 +36,11 @@ hex = { version = "0.4.3", features = ["std"], default-features = false } intel-tee-quote-verification-rs = { package = "teepot-tee-quote-verification-rs", path = "crates/teepot-tee-quote-verification-rs", version = "0.2.3-alpha.1" } intel-tee-quote-verification-sys = { version = "0.2.1" } jsonrpsee-types = { version = "0.23", default-features = false } -secp256k1 = { version = "0.29", features = ["rand-std", "global-context"] } log = "0.4" num-integer = "0.1.46" num-traits = "0.2.18" -pgp = "0.13" p256 = "0.13.2" +pgp = "0.13" pkcs8 = { version = "0.10" } rand = "0.8" reqwest = { version = "0.12", features = ["json"] } @@ -50,6 +49,7 @@ rsa = { version = "0.9.6", features = ["sha2", "pem"] } rustls = { version = "0.22" } rustls-pemfile = "2" sec1 = { version = "0.7.3", features = ["der"], default-features = false } +secp256k1 = { version = "0.29", features = ["rand-std", "global-context"] } serde = { version = "1", features = ["derive", "rc"] } serde_json = "1" serde_with = { version = "3.8", features = ["base64", "hex"] } @@ -64,9 +64,9 @@ tracing-actix-web = "0.7" tracing-log = "0.2" tracing-subscriber = { version = "0.3", features = ["env-filter"] } url = "2.5.2" +webpki-roots = "0.26.1" x509-cert = { version = "0.2", features = ["builder", "signature"] } zeroize = { version = "1.7.0", features = ["serde"] } -webpki-roots = "0.26.1" zksync_basic_types = "=0.1.0" -zksync_web3_decl = "=0.1.0" zksync_types = "=0.1.0" +zksync_web3_decl = "=0.1.0" diff --git a/bin/tee-key-preexec/Cargo.toml b/bin/tee-key-preexec/Cargo.toml index 351ae14..e5a62cc 100644 --- a/bin/tee-key-preexec/Cargo.toml +++ b/bin/tee-key-preexec/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "tee-key-preexec" +publish = false version.workspace = true edition.workspace = true authors.workspace = true diff --git a/bin/tee-ratls-preexec/Cargo.toml b/bin/tee-ratls-preexec/Cargo.toml index d8a3aca..1ac5905 100644 --- a/bin/tee-ratls-preexec/Cargo.toml +++ b/bin/tee-ratls-preexec/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "tee-ratls-preexec" +publish = false version.workspace = true edition.workspace = true authors.workspace = true diff --git a/bin/tee-self-attestation-test/Cargo.toml b/bin/tee-self-attestation-test/Cargo.toml index 193fecd..fcb800f 100644 --- a/bin/tee-self-attestation-test/Cargo.toml +++ b/bin/tee-self-attestation-test/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "tee-self-attestation-test" +publish = false version.workspace = true edition.workspace = true authors.workspace = true diff --git a/bin/tee-stress-client/Cargo.toml b/bin/tee-stress-client/Cargo.toml index 34565c1..1ce3cae 100644 --- a/bin/tee-stress-client/Cargo.toml +++ b/bin/tee-stress-client/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "tee-stress-client" +publish = false version.workspace = true edition.workspace = true authors.workspace = true diff --git a/bin/tee-vault-admin/Cargo.toml b/bin/tee-vault-admin/Cargo.toml index 7233679..7fa206c 100644 --- a/bin/tee-vault-admin/Cargo.toml +++ b/bin/tee-vault-admin/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "tee-vault-admin" +publish = false version.workspace = true edition.workspace = true authors.workspace = true diff --git a/bin/tee-vault-unseal/Cargo.toml b/bin/tee-vault-unseal/Cargo.toml index b8c9359..b803346 100644 --- a/bin/tee-vault-unseal/Cargo.toml +++ b/bin/tee-vault-unseal/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "tee-vault-unseal" +publish = false version.workspace = true edition.workspace = true authors.workspace = true diff --git a/bin/teepot-read/Cargo.toml b/bin/teepot-read/Cargo.toml index 60a38ec..5c3c8e2 100644 --- a/bin/teepot-read/Cargo.toml +++ b/bin/teepot-read/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "teepot-read" +publish = false version.workspace = true edition.workspace = true authors.workspace = true diff --git a/bin/teepot-write/Cargo.toml b/bin/teepot-write/Cargo.toml index 3271924..a2f6c64 100644 --- a/bin/teepot-write/Cargo.toml +++ b/bin/teepot-write/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "teepot-write" +publish = false version.workspace = true edition.workspace = true authors.workspace = true diff --git a/bin/vault-admin/Cargo.toml b/bin/vault-admin/Cargo.toml index 25bd792..3bd199b 100644 --- a/bin/vault-admin/Cargo.toml +++ b/bin/vault-admin/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "vault-admin" +publish = false version.workspace = true edition.workspace = true authors.workspace = true diff --git a/bin/vault-unseal/Cargo.toml b/bin/vault-unseal/Cargo.toml index 03eafc7..b191a04 100644 --- a/bin/vault-unseal/Cargo.toml +++ b/bin/vault-unseal/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "vault-unseal" +publish = false version.workspace = true edition.workspace = true authors.workspace = true diff --git a/bin/verify-attestation/Cargo.toml b/bin/verify-attestation/Cargo.toml index 2cf68a3..ff473d9 100644 --- a/bin/verify-attestation/Cargo.toml +++ b/bin/verify-attestation/Cargo.toml @@ -1,5 +1,6 @@ [package] name = "verify-attestation" +publish = false version.workspace = true edition.workspace = true authors.workspace = true diff --git a/bin/verify-era-proof-attestation/Cargo.toml b/bin/verify-era-proof-attestation/Cargo.toml index 53e0979..b0b8909 100644 --- a/bin/verify-era-proof-attestation/Cargo.toml +++ b/bin/verify-era-proof-attestation/Cargo.toml @@ -1,8 +1,9 @@ [package] +name = "verify-era-proof-attestation" +publish = false authors.workspace = true edition.workspace = true license.workspace = true -name = "verify-era-proof-attestation" repository.workspace = true version.workspace = true diff --git a/shells/teepot/default.nix b/shells/teepot/default.nix index bd3b5f9..faeb573 100644 --- a/shells/teepot/default.nix +++ b/shells/teepot/default.nix @@ -6,6 +6,7 @@ , dive , taplo , vault +, cargo-release }: mkShell { inputsFrom = [ teepot.teepot ]; @@ -18,5 +19,6 @@ mkShell { dive taplo vault + cargo-release ]; } diff --git a/taplo.toml b/taplo.toml index f9577a5..19a418e 100644 --- a/taplo.toml +++ b/taplo.toml @@ -6,8 +6,13 @@ inline_table_expand = false compact_arrays = true [[rule]] -include = ["**/Cargo.toml"] -keys = ["dependencies", "dev-dependencies", "build-dependencies"] +include = ["**/Cargo.toml", "Cargo.toml"] +keys = [ + "dependencies", + "dev-dependencies", + "build-dependencies", + "workspace.dependencies", +] [rule.formatting] reorder_keys = true