From a02a2ecb973228563c9494fe47c41cc2bb59916f Mon Sep 17 00:00:00 2001 From: BGluth Date: Thu, 12 Oct 2023 11:07:11 -0600 Subject: [PATCH] Updated `mir-protocol` --> `0xPolygonZero` - Recently the underlying org name on Github changed to `0xPolygonZero`. - This was causing some issues with dependencies downstream where a dependency pointing to the old org name was seen as a different dependency that was using the new org name. - Using a `[patch] section in `Cargo.toml` was running into issues where we couldn't get it to get all dependency versions using a single org name. --- README.md | 10 +++++----- evm/Cargo.toml | 4 ++-- plonky2/Cargo.toml | 2 +- plonky2/README.md | 2 +- plonky2/src/hash/poseidon_goldilocks.rs | 2 +- plonky2/src/plonk/circuit_builder.rs | 2 +- plonky2/src/util/reducing.rs | 2 +- starky/Cargo.toml | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index ed20b8e9a6..ab40a5c918 100644 --- a/README.md +++ b/README.md @@ -178,8 +178,8 @@ Plonky2's default hash function is Poseidon, configured with 8 full rounds, 22 p ## Links -- [System Zero](https://github.com/mir-protocol/system-zero), a zkVM built on top of Starky (no longer maintained) -- [Waksman](https://github.com/mir-protocol/plonky2-waksman), Plonky2 gadgets for permutation checking using Waksman networks (no longer maintained) -- [Insertion](https://github.com/mir-protocol/plonky2-insertion), Plonky2 gadgets for insertion into a list (no longer maintained) -- [u32](https://github.com/mir-protocol/plonky2-u32), Plonky2 gadgets for u32 arithmetic (no longer actively maintained) -- [ECDSA](https://github.com/mir-protocol/plonky2-ecdsa), Plonky2 gadgets for the ECDSA algorithm (no longer actively maintained) +- [System Zero](https://github.com/0xPolygonZero/system-zero), a zkVM built on top of Starky (no longer maintained) +- [Waksman](https://github.com/0xPolygonZero/plonky2-waksman), Plonky2 gadgets for permutation checking using Waksman networks (no longer maintained) +- [Insertion](https://github.com/0xPolygonZero/plonky2-insertion), Plonky2 gadgets for insertion into a list (no longer maintained) +- [u32](https://github.com/0xPolygonZero/plonky2-u32), Plonky2 gadgets for u32 arithmetic (no longer actively maintained) +- [ECDSA](https://github.com/0xPolygonZero/plonky2-ecdsa), Plonky2 gadgets for the ECDSA algorithm (no longer actively maintained) diff --git a/evm/Cargo.toml b/evm/Cargo.toml index 998e2effec..e328aa0c97 100644 --- a/evm/Cargo.toml +++ b/evm/Cargo.toml @@ -4,7 +4,7 @@ description = "Implementation of STARKs for the Ethereum Virtual Machine" version = "0.1.1" authors = ["Daniel Lubarov ", "William Borgeaud "] readme = "README.md" -repository = "https://github.com/mir-protocol/plonky2" +repository = "https://github.com/0xPolygonZero/plonky2" keywords = ["EVM", "STARK", "Ethereum"] categories = ["cryptography"] edition = "2021" @@ -13,7 +13,7 @@ edition = "2021" anyhow = "1.0.40" bytes = "1.4.0" env_logger = "0.10.0" -eth_trie_utils = { git = "https://github.com/mir-protocol/eth_trie_utils.git", rev = "e9ec4ec2aa2ae976b7c699ef40c1ffc716d87ed5" } +eth_trie_utils = { git = "https://github.com/0xPolygonZero/eth_trie_utils.git", rev = "e9ec4ec2aa2ae976b7c699ef40c1ffc716d87ed5" } ethereum-types = "0.14.0" hex = { version = "0.4.3", optional = true } hex-literal = "0.4.1" diff --git a/plonky2/Cargo.toml b/plonky2/Cargo.toml index fc6df1b4f3..ad586679de 100644 --- a/plonky2/Cargo.toml +++ b/plonky2/Cargo.toml @@ -5,7 +5,7 @@ version = "0.1.4" license = "MIT OR Apache-2.0" authors = ["Daniel Lubarov ", "William Borgeaud ", "Nicholas Ward "] readme = "README.md" -repository = "https://github.com/mir-protocol/plonky2" +repository = "https://github.com/0xPolygonZero/plonky2" keywords = ["cryptography", "SNARK", "PLONK", "FRI"] categories = ["cryptography"] edition = "2021" diff --git a/plonky2/README.md b/plonky2/README.md index ed55704582..7d3a3d65bd 100644 --- a/plonky2/README.md +++ b/plonky2/README.md @@ -1,6 +1,6 @@ # Plonky2 -Plonky2 is a SNARK implementation based on techniques from PLONK and FRI. It is the successor of [Plonky](https://github.com/mir-protocol/plonky), which was based on PLONK and Halo. +Plonky2 is a SNARK implementation based on techniques from PLONK and FRI. It is the successor of [Plonky](https://github.com/0xPolygonZero/plonky), which was based on PLONK and Halo. Plonky2 is built for speed, and features a highly efficient recursive circuit. On a Macbook Pro, recursive proofs can be generated in about 170 ms. diff --git a/plonky2/src/hash/poseidon_goldilocks.rs b/plonky2/src/hash/poseidon_goldilocks.rs index c784a1db01..e2c72d858f 100644 --- a/plonky2/src/hash/poseidon_goldilocks.rs +++ b/plonky2/src/hash/poseidon_goldilocks.rs @@ -1,7 +1,7 @@ //! Implementations for Poseidon over Goldilocks field of widths 8 and 12. //! //! These contents of the implementations *must* be generated using the -//! `poseidon_constants.sage` script in the `mir-protocol/hash-constants` +//! `poseidon_constants.sage` script in the `0xPolygonZero/hash-constants` //! repository. #[cfg(not(all(target_arch = "aarch64", target_feature = "neon")))] diff --git a/plonky2/src/plonk/circuit_builder.rs b/plonky2/src/plonk/circuit_builder.rs index bd436f2c85..67db68649a 100644 --- a/plonky2/src/plonk/circuit_builder.rs +++ b/plonky2/src/plonk/circuit_builder.rs @@ -906,7 +906,7 @@ impl, const D: usize> CircuitBuilder { /// In PLONK's permutation argument, there's a slight chance of division by zero. We can /// mitigate this by randomizing some unused witness elements, so if proving fails with /// division by zero, the next attempt will have an (almost) independent chance of success. - /// See https://github.com/mir-protocol/plonky2/issues/456 + /// See https://github.com/0xPolygonZero/plonky2/issues/456 fn randomize_unused_pi_wires(&mut self, pi_gate: usize) { for wire in PublicInputGate::wires_public_inputs_hash().end..self.config.num_wires { self.add_simple_generator(RandomValueGenerator { diff --git a/plonky2/src/util/reducing.rs b/plonky2/src/util/reducing.rs index aaf905d5b8..bde484e875 100644 --- a/plonky2/src/util/reducing.rs +++ b/plonky2/src/util/reducing.rs @@ -20,7 +20,7 @@ use crate::plonk::circuit_builder::CircuitBuilder; /// scale the second one by `a^(r-1-k)`, and add them up. /// This struct abstract away these operations by implementing Horner's method and keeping track /// of the number of multiplications by `a` to compute the scaling factor. -/// See for more details and discussions. +/// See for more details and discussions. #[derive(Debug, Clone)] pub struct ReducingFactor { base: F, diff --git a/starky/Cargo.toml b/starky/Cargo.toml index da0ad1b723..62a67ee78e 100644 --- a/starky/Cargo.toml +++ b/starky/Cargo.toml @@ -5,7 +5,7 @@ version = "0.1.2" license = "MIT OR Apache-2.0" authors = ["Daniel Lubarov ", "William Borgeaud "] readme = "README.md" -repository = "https://github.com/mir-protocol/plonky2" +repository = "https://github.com/0xPolygonZero/plonky2" keywords = ["cryptography", "STARK", "FRI"] categories = ["cryptography"] edition = "2021"