Merge pull request #205 from matter-labs/cargo-release

chore: prepare release tags
matter-labs · Sep 16, 2024 · 2b6e68e · 2b6e68e
2 parents 108ef8c + 7743c13
commit 2b6e68e
Show file tree

Hide file tree

Showing 16 changed files with 99 additions and 95 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,14 +20,14 @@ 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"
 bytemuck = { version = "1.15.0", features = ["derive", "min_const_generics", "extern_crate_std"] }
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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