From 3a556029097a8d8132903f54bbd22c65334465ca Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Mon, 31 Jul 2023 16:31:22 -0700 Subject: [PATCH 1/4] update versions for crates.io updates --- evm/Cargo.toml | 2 +- field/Cargo.toml | 2 +- maybe_rayon/Cargo.toml | 2 +- plonky2/Cargo.toml | 2 +- starky/Cargo.toml | 2 +- util/Cargo.toml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/evm/Cargo.toml b/evm/Cargo.toml index 068c8219..6e69e0d6 100644 --- a/evm/Cargo.toml +++ b/evm/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "plonky2_evm" description = "Implementation of STARKs for the Ethereum Virtual Machine" -version = "0.1.0" +version = "0.1.1" authors = ["Daniel Lubarov ", "William Borgeaud "] readme = "README.md" repository = "https://github.com/mir-protocol/plonky2" diff --git a/field/Cargo.toml b/field/Cargo.toml index 0ec85af7..08550515 100644 --- a/field/Cargo.toml +++ b/field/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "plonky2_field" description = "Finite field arithmetic" -version = "0.1.0" +version = "0.1.1" license = "MIT OR Apache-2.0" authors = ["Daniel Lubarov ", "William Borgeaud ", "Jacqueline Nabaglo ", "Hamish Ivey-Law "] edition = "2021" diff --git a/maybe_rayon/Cargo.toml b/maybe_rayon/Cargo.toml index 11eebc96..89499e74 100644 --- a/maybe_rayon/Cargo.toml +++ b/maybe_rayon/Cargo.toml @@ -2,7 +2,7 @@ name = "plonky2_maybe_rayon" description = "Feature-gated wrapper around rayon" license = "MIT OR Apache-2.0" -version = "0.1.0" +version = "0.1.1" edition = "2021" [features] diff --git a/plonky2/Cargo.toml b/plonky2/Cargo.toml index 40c4da86..3592e970 100644 --- a/plonky2/Cargo.toml +++ b/plonky2/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "plonky2" description = "Recursive SNARKs based on PLONK and FRI" -version = "0.1.3" +version = "0.1.4" license = "MIT OR Apache-2.0" authors = ["Daniel Lubarov ", "William Borgeaud ", "Nicholas Ward "] readme = "README.md" diff --git a/starky/Cargo.toml b/starky/Cargo.toml index c09ec5af..223ed945 100644 --- a/starky/Cargo.toml +++ b/starky/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "starky" description = "Implementation of STARKs" -version = "0.1.1" +version = "0.1.2" license = "MIT OR Apache-2.0" authors = ["Daniel Lubarov ", "William Borgeaud "] readme = "README.md" diff --git a/util/Cargo.toml b/util/Cargo.toml index f3cb862e..1ece1e57 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "plonky2_util" description = "Utilities used by Plonky2" -version = "0.1.0" +version = "0.1.1" license = "MIT OR Apache-2.0" edition = "2021" From 84321955172cb0eb877af8ca0abc07ad76a409fc Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Mon, 31 Jul 2023 16:34:27 -0700 Subject: [PATCH 2/4] update versions in cross-crate references --- evm/Cargo.toml | 6 +++--- plonky2/Cargo.toml | 6 +++--- starky/Cargo.toml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/evm/Cargo.toml b/evm/Cargo.toml index 6e69e0d6..e1864e90 100644 --- a/evm/Cargo.toml +++ b/evm/Cargo.toml @@ -19,14 +19,14 @@ hex-literal = "0.4.1" itertools = "0.11.0" keccak-hash = "0.10.0" log = "0.4.14" -plonky2_maybe_rayon = "0.1.0" +plonky2_maybe_rayon = "0.1.1" num = "0.4.0" num-bigint = "0.4.3" once_cell = "1.13.0" pest = "2.1.3" pest_derive = "2.1.0" -plonky2 = { version = "0.1.2", default-features = false, features = ["timing"] } -plonky2_util = { version = "0.1.0" } +plonky2 = { version = "0.1.4", default-features = false, features = ["timing"] } +plonky2_util = { version = "0.1.1" } rand = "0.8.5" rand_chacha = "0.3.1" rlp = "0.5.1" diff --git a/plonky2/Cargo.toml b/plonky2/Cargo.toml index 3592e970..c5de1e63 100644 --- a/plonky2/Cargo.toml +++ b/plonky2/Cargo.toml @@ -24,10 +24,10 @@ hashbrown = { version = "0.14.0", default-features = false, features = ["ahash", itertools = { version = "0.11.0", default-features = false } keccak-hash = { version = "0.8.0", default-features = false } log = { version = "0.4.14", default-features = false } -plonky2_maybe_rayon = { version = "0.1.0", default-features = false } +plonky2_maybe_rayon = { version = "0.1.1", default-features = false } num = { version = "0.4", default-features = false, features = ["rand"] } -plonky2_field = { version = "0.1.0", default-features = false } -plonky2_util = { version = "0.1.0", default-features = false } +plonky2_field = { version = "0.1.1", default-features = false } +plonky2_util = { version = "0.1.1", default-features = false } rand = { version = "0.8.4", default-features = false } rand_chacha = { version = "0.3.1", optional = true, default-features = false } serde = { version = "1.0", default-features = false, features = ["derive", "rc"] } diff --git a/starky/Cargo.toml b/starky/Cargo.toml index 223ed945..bc83dadf 100644 --- a/starky/Cargo.toml +++ b/starky/Cargo.toml @@ -20,7 +20,7 @@ timing = ["plonky2/timing"] anyhow = { version = "1.0.40", default-features = false } itertools = { version = "0.11.0", default-features = false } log = { version = "0.4.14", default-features = false } -plonky2_maybe_rayon = { version = "0.1.0", default-features = false } +plonky2_maybe_rayon = { version = "0.1.1", default-features = false } plonky2 = { version = "0.1.2", default-features = false } [dev-dependencies] From f574effe17c0900d86584afd692e3b1f03fd2605 Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Mon, 31 Jul 2023 16:37:02 -0700 Subject: [PATCH 3/4] make imports conditional on config --- plonky2/src/hash/poseidon_goldilocks.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plonky2/src/hash/poseidon_goldilocks.rs b/plonky2/src/hash/poseidon_goldilocks.rs index 0d03b3e9..923b1b20 100644 --- a/plonky2/src/hash/poseidon_goldilocks.rs +++ b/plonky2/src/hash/poseidon_goldilocks.rs @@ -4,7 +4,9 @@ //! `poseidon_constants.sage` script in the `mir-protocol/hash-constants` //! repository. +#[cfg(target_arch="x86_64")] use plonky2_field::types::Field; +#[cfg(target_arch="x86_64")] use unroll::unroll_for_loops; use crate::field::goldilocks_field::GoldilocksField; From b414b8e92bc6b0772b3d645292690c2595f70455 Mon Sep 17 00:00:00 2001 From: Nicholas Ward Date: Mon, 31 Jul 2023 16:53:56 -0700 Subject: [PATCH 4/4] fmt --- plonky2/src/hash/poseidon_goldilocks.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plonky2/src/hash/poseidon_goldilocks.rs b/plonky2/src/hash/poseidon_goldilocks.rs index 923b1b20..78cedec2 100644 --- a/plonky2/src/hash/poseidon_goldilocks.rs +++ b/plonky2/src/hash/poseidon_goldilocks.rs @@ -4,9 +4,9 @@ //! `poseidon_constants.sage` script in the `mir-protocol/hash-constants` //! repository. -#[cfg(target_arch="x86_64")] +#[cfg(target_arch = "x86_64")] use plonky2_field::types::Field; -#[cfg(target_arch="x86_64")] +#[cfg(target_arch = "x86_64")] use unroll::unroll_for_loops; use crate::field::goldilocks_field::GoldilocksField;