Update licenses and dependencies (0xPolygonZero#1534)

topos-protocol · Feb 19, 2024 · 6c9588a · 6c9588a
1 parent da85f1b
commit 6c9588a
Show file tree

Hide file tree

Showing 14 changed files with 85 additions and 711 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,6 +2,18 @@
 members = ["field", "maybe_rayon", "plonky2", "starky", "util"]
 resolver = "2"
 
+[workspace.dependencies]
+ahash = { version = "0.8.3", default-features = false, features = ["compile-time-rng"] } # NOTE: Be sure to keep this version the same as the dependency in `hashbrown`.
+anyhow = { version = "1.0.40", default-features = false }
+hashbrown = { version = "0.14.0", default-features = false, features = ["ahash", "serde"] } # NOTE: When upgrading, see `ahash` dependency.
+itertools = { version = "0.11.0", default-features = false }
+log = { version = "0.4.14", default-features = false }
+num = { version = "0.4", default-features = false, features = ["rand"] }
+rand = { version = "0.8.4", default-features = false }
+serde = { version = "1.0", default-features = false, features = ["derive"] }
+static_assertions = { version = "1.1.0", default-features = false }
+unroll = { version = "0.1.5", default-features = false }
+
 [profile.release]
 opt-level = 3
 incremental = true
@@ -10,3 +22,11 @@ incremental = true
 
 [profile.bench]
 opt-level = 3
+
+[workspace.package]
+edition = "2021"
+license = "MIT OR Apache-2.0"
+homepage = "https://github.com/0xPolygonZero/plonky2"
+repository = "https://github.com/0xPolygonZero/plonky2"
+keywords = ["cryptography", "SNARK", "PLONK", "FRI", "plonky2"]
+categories = ["cryptography"]
diff --git a/field/LICENSE-APACHE → LICENSE-APACHE b/field/LICENSE-APACHE → LICENSE-APACHE
diff --git a/field/LICENSE-MIT → LICENSE-MIT b/field/LICENSE-MIT → LICENSE-MIT
diff --git a/README.md b/README.md
@@ -165,7 +165,12 @@ description for a performance improvement must clearly identify
 
 ## Licenses
 
-As this is a monorepo, see the individual crates within for license information.
+All crates of this monorepo are licensed under either of
+
+* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
+* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+
+at your option.
 
 
 ## Security

diff --git a/field/Cargo.toml b/field/Cargo.toml
@@ -2,19 +2,26 @@
 name = "plonky2_field"
 description = "Finite field arithmetic"
 version = "0.1.1"
-license = "MIT OR Apache-2.0"
 authors = ["Daniel Lubarov <[email protected]>", "William Borgeaud <[email protected]>", "Jacqueline Nabaglo <[email protected]>", "Hamish Ivey-Law <[email protected]>"]
-edition = "2021"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
 
 [dependencies]
-anyhow = { version = "1.0.40", default-features = false }
-itertools = { version = "0.11.0", default-features = false, features = ["use_alloc"] }
-num = { version = "0.4", default-features = false, features = ["alloc", "rand"] }
+anyhow = { workspace = true }
+itertools = { workspace = true, features = ["use_alloc"] }
+num = { workspace = true, features = ["alloc"] }
+rand = { workspace = true, features = ["getrandom"] }
+serde = { workspace = true, features = ["alloc"] }
+static_assertions = { workspace = true }
+unroll = { workspace = true }
+
+# Local dependencies
 plonky2_util = { path = "../util", default-features = false }
-rand = { version = "0.8.5", default-features = false, features = ["getrandom"] }
-serde = { version = "1.0", default-features = false, features = ["alloc", "derive"] }
-static_assertions = { version = "1.1.0", default-features = false }
-unroll = { version = "0.1.5", default-features = false }
+
 
 # Display math equations properly in documentation
 [package.metadata.docs.rs]

diff --git a/maybe_rayon/Cargo.toml b/maybe_rayon/Cargo.toml
@@ -1,9 +1,13 @@
 [package]
 name = "plonky2_maybe_rayon"
 description = "Feature-gated wrapper around rayon"
-license = "MIT OR Apache-2.0"
 version = "0.1.1"
-edition = "2021"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
 
 [features]
 parallel = ["rayon"]

diff --git a/maybe_rayon/LICENSE-APACHE b/maybe_rayon/LICENSE-APACHE
diff --git a/maybe_rayon/LICENSE-MIT b/maybe_rayon/LICENSE-MIT
diff --git a/plonky2/Cargo.toml b/plonky2/Cargo.toml
@@ -2,13 +2,14 @@
 name = "plonky2"
 description = "Recursive SNARKs based on PLONK and FRI"
 version = "0.1.4"
-license = "MIT OR Apache-2.0"
 authors = ["Daniel Lubarov <[email protected]>", "William Borgeaud <[email protected]>", "Nicholas Ward <[email protected]>"]
 readme = "README.md"
-repository = "https://github.com/0xPolygonZero/plonky2"
-keywords = ["cryptography", "SNARK", "PLONK", "FRI"]
-categories = ["cryptography"]
-edition = "2021"
+edition.workspace = true
+license.workspace = true
+homepage.workspace = true
+repository.workspace = true
+keywords.workspace = true
+categories.workspace = true
 
 [features]
 default = ["gate_testing", "parallel", "rand_chacha", "std", "timing"]
@@ -18,31 +19,34 @@ std = ["anyhow/std", "rand/std", "itertools/use_std"]
 timing = ["std", "dep:web-time"]
 
 [dependencies]
-ahash = { version = "0.8.3", default-features = false, features = ["compile-time-rng"] } # NOTE: Be sure to keep this version the same as the dependency in `hashbrown`.
-anyhow = { version = "1.0.40", default-features = false }
-hashbrown = { version = "0.14.0", default-features = false, features = ["ahash", "serde"] } # NOTE: When upgrading, see `ahash` dependency.
-itertools = { version = "0.11.0", default-features = false }
+ahash = { workspace = true }
+anyhow = { workspace = true }
+hashbrown = { workspace = true }
+itertools = { workspace = true }
 keccak-hash = { version = "0.8.0", default-features = false }
-log = { version = "0.4.14", default-features = false }
-plonky2_maybe_rayon = { path = "../maybe_rayon", default-features = false }
-num = { version = "0.4", default-features = false, features = ["rand"] }
-plonky2_field = { path = "../field", default-features = false }
-plonky2_util = { path = "../util", default-features = false }
-rand = { version = "0.8.4", default-features = false }
+log = { workspace = true }
+num = { workspace = true }
+rand = { workspace = true }
 rand_chacha = { version = "0.3.1", optional = true, default-features = false }
-serde = { version = "1.0", default-features = false, features = ["derive", "rc"] }
-static_assertions = { version = "1.1.0", default-features = false }
-unroll = { version = "0.1.5", default-features = false }
+serde = { workspace = true, features = ["rc"] }
+static_assertions = { workspace = true }
+unroll = { workspace = true }
 web-time = { version = "1.0.0", optional = true }
 
+# Local dependencies
+plonky2_field = { path = "../field", default-features = false }
+plonky2_maybe_rayon = { path = "../maybe_rayon", default-features = false }
+plonky2_util = { path = "../util", default-features = false }
+
+
 [target.'cfg(all(target_arch = "wasm32", target_os = "unknown"))'.dependencies]
 getrandom = { version = "0.2", default-features = false, features = ["js"] }
 
 [dev-dependencies]
 criterion = { version = "0.5.1", default-features = false }
 env_logger = { version = "0.9.0", default-features = false }
 num_cpus = { version = "1.14.0", default-features = false }
-rand = { version = "0.8.4", default-features = false, features = ["getrandom"] }
+rand = { workspace = true, features = ["getrandom"] }
 rand_chacha = { version = "0.3.1", default-features = false }
 serde_cbor = { version = "0.11.2" }
 serde_json = { version = "1.0" }