Release v0.5.4 (#187)

* chore: prepare release-v0.5.4 Signed-off-by: Brandon H. Gomes <[email protected]> * chore: fix hakari dependencies Signed-off-by: Brandon H. Gomes <[email protected]> * feat: remove redundant text in release template Signed-off-by: Brandon H. Gomes <[email protected]> * fix: disable cargo hakari verify for now, this is an internal verification anyway Signed-off-by: Brandon H. Gomes <[email protected]>
Manta-Network · Jul 28, 2022 · aef233c · aef233c
1 parent d8d5862
commit aef233c
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 77 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -8,3 +8,4 @@ Before we can merge this PR, please make sure that all the following items have
 - [ ] Added **one** line describing your change in [`CHANGELOG.md`](https://github.com/manta-network/manta-rs/blob/main/CHANGELOG.md) and added the appropriate `changelog` label to the PR.
 - [ ] Re-reviewed `Files changed` in the GitHub PR explorer.
 - [ ] Checked that changes and commits conform to the standards outlined in [`CONTRIBUTING.md`](https://github.com/manta-network/manta-rs/blob/main/CONTRIBUTING.md).
+- [ ] Ran `cargo hakari generate` to update the `workspace-hack` system
diff --git a/.github/RELEASE_TEMPLATE.md b/.github/RELEASE_TEMPLATE.md
@@ -1,8 +1,7 @@
-## Release vX.Y.Z
-
 **Each reviewer needs to check that these conditions are met before approving the PR.**
 
-- [ ] Checked that the release is on the correct branch name of the form `release-vX.Y.Z` 
+- [ ] Checked that the release is on the correct branch name of the form `release-vX.Y.Z` and the PR title matches `Release vX.Y.Z`
 - [ ] Added the `changelog:skip` label and the relevant `release` label to this PR
 - [ ] Updated the [`CHANGELOG.md`](https://github.com/manta-network/manta-rs/blob/main/CHANGELOG.md)
 - [ ] Updated the version numbers in the `Cargo.toml` for each crate in the workspace
+- [ ] Ran `cargo hakari disable` to disable the `workspace-hack` system and checked that `workspace-hack/Cargo.toml` has no dependencies
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,8 +22,6 @@ jobs:
       - uses: actions/checkout@v3
       - run: rustup update nightly && rustup default nightly
       - run: cargo install cargo-hakari
-      - run: cargo hakari verify
-      - run: cargo hakari generate --diff
       - run: cargo hakari manage-deps --dry-run
   format:
     name: Format

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,9 +5,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 ### Added
-- [\#131](https://github.com/Manta-Network/manta-rs/pull/131) Add abstract Phase 1 for Groth16 trusted setup
-- [\#176](https://github.com/Manta-Network/manta-rs/pull/176) Add ECLAIR utilities for the new circuits
-- [\#175](https://github.com/Manta-Network/manta-rs/pull/175) Add more documentation around `cargo-hakari`
 
 ### Changed
 
@@ -19,6 +16,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Security
 
+## [0.5.4] - 2022-07-28
+### Added
+- [\#131](https://github.com/Manta-Network/manta-rs/pull/131) Add abstract Phase 1 for Groth16 trusted setup
+- [\#176](https://github.com/Manta-Network/manta-rs/pull/176) Add ECLAIR utilities for the new circuits
+- [\#175](https://github.com/Manta-Network/manta-rs/pull/175) Add more documentation around `cargo-hakari`
+
 ## [0.5.3] - 2022-07-08
 ### Added
 - [\#141](https://github.com/Manta-Network/manta-rs/pull/141) Add `U128` type and range assertion trait to ECLAIR
@@ -95,7 +98,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Security
 - [\#50](https://github.com/Manta-Network/manta-rs/pull/50) Remove Trapdoor from Circuit
 
-[Unreleased]: https://github.com/Manta-Network/manta-rs/compare/v0.5.3...HEAD
+[Unreleased]: https://github.com/Manta-Network/manta-rs/compare/v0.5.4...HEAD
+[0.5.3]: https://github.com/Manta-Network/manta-rs/releases/tag/v0.5.4
 [0.5.3]: https://github.com/Manta-Network/manta-rs/releases/tag/v0.5.3
 [0.5.2]: https://github.com/Manta-Network/manta-rs/releases/tag/v0.5.2
 [0.5.1]: https://github.com/Manta-Network/manta-rs/releases/tag/v0.5.1

diff --git a/manta-accounting/Cargo.toml b/manta-accounting/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "manta-accounting"
-version = "0.5.3"
+version = "0.5.4"
 edition = "2021"
 authors = ["Manta Network <[email protected]>"]
 readme = "README.md"
@@ -64,7 +64,7 @@ manta-util = { path = "../manta-util", default-features = false, features = ["al
 parking_lot = { version = "0.12.0", optional = true, default-features = false }
 rand_chacha = { version = "0.3.1", optional = true, default-features = false }
 statrs = { version = "0.15.0", optional = true, default-features = false }
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack = { version = "0.1.0", path = "../workspace-hack" }
 
 [dev-dependencies]
 manta-crypto = { path = "../manta-crypto", default-features = false, features = ["getrandom"] }
diff --git a/manta-benchmark/Cargo.toml b/manta-benchmark/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "manta-benchmark"
-version = "0.5.3"
+version = "0.5.4"
 edition = "2021"
 authors = ["Manta Network <[email protected]>"]
 readme = "README.md"
@@ -55,7 +55,7 @@ manta-pay = { path = "../manta-pay", default-features = false, features = ["grot
 wasm-bindgen = { version = "0.2.82", default-features = false }
 wasm-bindgen-test = { version = "0.3.30", default-features = false }
 web-sys = { version = "0.3.59", default-features = false, features = ["console"] }
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack = { version = "0.1.0", path = "../workspace-hack" }
 
 [dev-dependencies]
 criterion = { version = "0.3.4", default-features = false }
diff --git a/manta-crypto/Cargo.toml b/manta-crypto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "manta-crypto"
-version = "0.5.3"
+version = "0.5.4"
 edition = "2021"
 authors = ["Manta Network <[email protected]>"]
 readme = "README.md"
@@ -42,7 +42,7 @@ derivative = { version = "2.2.0", default-features = false, features = ["use_cor
 manta-util = { path = "../manta-util", default-features = false, features = ["alloc"] }
 rand = { version = "0.8.4", optional = true, default-features = false, features = ["alloc"] }
 rand_core = { version = "0.6.3", default-features = false }
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack = { version = "0.1.0", path = "../workspace-hack" }
 
 [dev-dependencies]
 rand = "0.8.4"
diff --git a/manta-parameters/Cargo.toml b/manta-parameters/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "manta-parameters"
-version = "0.5.3"
+version = "0.5.4"
 edition = "2021"
 authors = ["Manta Network <[email protected]>"]
 readme = "README.md"
@@ -35,7 +35,7 @@ std = ["anyhow?/std"]
 anyhow = { version = "1.0.57", optional = true, default-features = false }
 attohttpc = { version = "0.19.1", optional = true }
 blake3 = { version = "1.3.1", default-features = false }
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack = { version = "0.1.0", path = "../workspace-hack" }
 
 [dev-dependencies]
 git2 = { version = "0.14.4", default-features = false }

diff --git a/manta-pay/Cargo.toml b/manta-pay/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "manta-pay"
-version = "0.5.3"
+version = "0.5.4"
 edition = "2021"
 authors = ["Manta Network <[email protected]>"]
 readme = "README.md"
@@ -59,7 +59,7 @@ groth16 = ["ark-groth16", "ark-snark", "arkworks"]
 http = ["reqwest", "serde"]
 
 # SCALE Codec and Type Info
-scale = ["scale-codec", "scale-info", "syn"]
+scale = ["scale-codec", "scale-info"]
 
 # SCALE Codec and Type Info with the Standard Library Enabled
 scale-std = ["scale", "scale-codec/std", "scale-info/std", "std"]
@@ -132,12 +132,11 @@ reqwest = { version = "0.11.9", optional = true, default-features = false, featu
 scale-codec = { package = "parity-scale-codec", version = "3.1.2", optional = true, default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.1.2", optional = true, default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.82", optional = true, default-features = false, features = ["alloc"] }
-syn = { version = "=1.0.96", optional = true, default-features = false } # FIXME: Workaround until polkadot-v0.9.24 for https://github.com/paritytech/substrate/issues/11706
 tempfile = { version = "3.3.0", optional = true, default-features = false }
 tide = { version = "0.16.0", optional = true, default-features = false, features = ["h1-server"] }
 tokio = { version = "1.20.1", optional = true, default-features = false }
 tokio-tungstenite = { version = "0.17.2", optional = true, default-features = false, features = ["native-tls"] }
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack = { version = "0.1.0", path = "../workspace-hack" }
 ws_stream_wasm = { version = "0.7.3", optional = true, default-features = false }
 
 [dev-dependencies]

diff --git a/manta-trusted-setup/Cargo.toml b/manta-trusted-setup/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "manta-trusted-setup"
-version = "0.5.3"
+version = "0.5.4"
 edition = "2021"
 authors = ["Manta Network <[email protected]>"]
 readme = "README.md"
@@ -44,4 +44,4 @@ derivative = { version = "2.2.0", default-features = false, features = ["use_cor
 manta-crypto = { path = "../manta-crypto", default-features = false, features = ["getrandom"] }
 manta-util = { path = "../manta-util", default-features = false, features = ["alloc"] }
 rayon = { version = "1.5.3", optional = true, default-features = false }
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack = { version = "0.1.0", path = "../workspace-hack" }
diff --git a/manta-util/Cargo.toml b/manta-util/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "manta-util"
-version = "0.5.3"
+version = "0.5.4"
 edition = "2021"
 authors = ["Manta Network <[email protected]>"]
 readme = "README.md"
@@ -42,4 +42,4 @@ crossbeam-channel = { version = "0.5.6", optional = true, default-features = fal
 rayon = { version = "1.5.3", optional = true, default-features = false }
 serde = { version = "1.0.140", optional = true, default-features = false, features = ["derive"] }
 serde_with = { version = "1.14.0", optional = true, default-features = false, features = ["macros"] }
-workspace-hack = { version = "0.1", path = "../workspace-hack" }
+workspace-hack = { version = "0.1.0", path = "../workspace-hack" }
diff --git a/workspace-hack/Cargo.toml b/workspace-hack/Cargo.toml
@@ -13,57 +13,8 @@ publish = false
 # are managed by hakari.
 
 ### BEGIN HAKARI SECTION
-[dependencies]
-aes-gcm = { version = "0.9.4", features = ["aes", "alloc"] }
-anyhow = { version = "1.0.58", features = ["std"] }
-bitflags = { version = "1.3.2" }
-blake3 = { version = "1.3.1", default-features = false, features = ["digest", "std"] }
-crypto-common = { version = "0.1.6", default-features = false, features = ["std"] }
-digest-93f6ce9d446188ac = { package = "digest", version = "0.10.3", features = ["alloc", "block-buffer", "core-api", "mac", "std", "subtle"] }
-digest-274715c4dabd11b0 = { package = "digest", version = "0.9.0", default-features = false, features = ["alloc", "std"] }
-futures = { version = "0.3.21", features = ["alloc", "async-await", "executor", "futures-executor", "std"] }
-futures-channel = { version = "0.3.21", default-features = false, features = ["alloc", "futures-sink", "sink", "std"] }
-futures-core = { version = "0.3.21", features = ["alloc", "std"] }
-futures-io = { version = "0.3.21", features = ["std"] }
-futures-sink = { version = "0.3.21", default-features = false, features = ["alloc", "std"] }
-futures-task = { version = "0.3.21", default-features = false, features = ["alloc", "std"] }
-futures-util = { version = "0.3.21", features = ["alloc", "async-await", "async-await-macro", "channel", "futures-channel", "futures-io", "futures-macro", "futures-sink", "io", "memchr", "sink", "slab", "std"] }
-generic-array = { version = "0.14.5", default-features = false, features = ["more_lengths"] }
-getrandom = { version = "0.2.7", default-features = false, features = ["js", "js-sys", "std", "wasm-bindgen"] }
-indexmap = { version = "1.9.1", default-features = false, features = ["std"] }
-log = { version = "0.4.17", default-features = false, features = ["kv_unstable", "kv_unstable_std", "std", "value-bag"] }
-memchr = { version = "2.5.0", features = ["std"] }
-num-traits = { version = "0.2.15", features = ["i128", "libm", "std"] }
-ppv-lite86 = { version = "0.2.16", default-features = false, features = ["simd", "std"] }
-proc-macro2 = { version = "1.0.42", features = ["proc-macro"] }
-quote = { version = "1.0.20", features = ["proc-macro"] }
-rand = { version = "0.8.5", features = ["alloc", "getrandom", "libc", "rand_chacha", "std", "std_rng"] }
-rand_chacha = { version = "0.3.1", default-features = false, features = ["std"] }
-rand_core = { version = "0.6.3", default-features = false, features = ["alloc", "getrandom", "std"] }
-serde = { version = "1.0.140", features = ["alloc", "derive", "serde_derive", "std"] }
-serde_json = { version = "1.0.82", features = ["alloc", "std"] }
-sha2 = { version = "0.9.9", features = ["std"] }
-standback = { version = "0.2.17", default-features = false, features = ["std"] }
-subtle = { version = "2.4.1", default-features = false, features = ["i128"] }
-syn = { version = "1.0.96", features = ["clone-impls", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
-url = { version = "2.2.2", default-features = false, features = ["serde"] }
-web-sys = { version = "0.3.59", default-features = false, features = ["BinaryType", "Blob", "CloseEvent", "DomException", "Event", "EventTarget", "MessageEvent", "WebSocket", "console"] }
-zeroize = { version = "1.5.7", default-features = false, features = ["alloc", "zeroize_derive"] }
-
-[build-dependencies]
-anyhow = { version = "1.0.58", features = ["std"] }
-blake3 = { version = "1.3.1", default-features = false, features = ["digest", "std"] }
-cc = { version = "1.0.73", default-features = false, features = ["jobserver", "parallel"] }
-crypto-common = { version = "0.1.6", default-features = false, features = ["std"] }
-digest-93f6ce9d446188ac = { package = "digest", version = "0.10.3", features = ["alloc", "block-buffer", "core-api", "mac", "std", "subtle"] }
-generic-array = { version = "0.14.5", default-features = false, features = ["more_lengths"] }
-log = { version = "0.4.17", default-features = false, features = ["kv_unstable", "kv_unstable_std", "std", "value-bag"] }
-num-traits = { version = "0.2.15", features = ["i128", "libm", "std"] }
-proc-macro2 = { version = "1.0.42", features = ["proc-macro"] }
-quote = { version = "1.0.20", features = ["proc-macro"] }
-serde = { version = "1.0.140", features = ["alloc", "derive", "serde_derive", "std"] }
-standback = { version = "0.2.17", default-features = false, features = ["std"] }
-subtle = { version = "2.4.1", default-features = false, features = ["i128"] }
-syn = { version = "1.0.96", features = ["clone-impls", "derive", "extra-traits", "fold", "full", "parsing", "printing", "proc-macro", "quote", "visit", "visit-mut"] }
 
+# Disabled by running `cargo hakari disable`.
+# To re-enable, run:
+#     cargo hakari generate
 ### END HAKARI SECTION
diff --git a/workspace-hack/README.md b/workspace-hack/README.md
@@ -5,3 +5,7 @@ This crate will never contain any code, it is just used by [`cargo-hakari`](http
 ## Updating the Dependency List
 
 When a dependency on `Cargo.toml` needs to be updated, the CI for a PR will fail because `cargo hakari generate --diff` will return with error code `1`. In this case, the `cargo hakari generate` command should be run on a local machine and the updates pushed to the relevant development branch. Be sure to install `cargo-hakari` with `cargo install cargo-hakari`, just as in the [CI workflow](./../.github/workflows/ci.yml).
+
+## Disabling before Release
+
+Before releasing a new version of the project, we need to disable the workspace hack so that it's dependencies don't get added to downstream depdendents. To do this `cargo hakari disable` is run before a release.