Skip to content

Commit

Permalink
lattirust -> stark-rings (#163)
Browse files Browse the repository at this point in the history
  • Loading branch information
ElijahVlasov authored Dec 16, 2024
1 parent 6b06ab1 commit d071785
Show file tree
Hide file tree
Showing 43 changed files with 157 additions and 157 deletions.
126 changes: 63 additions & 63 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ ark-crypto-primitives = { version = "0.4.0", default-features = false, features
ark-ff = { version = "0.4.2", default-features = false }
ark-serialize = { version = "0.4.2", features = ["derive"] }
ark-std = { version = "0.4.0", default-features = false }
lattirust-linear-algebra = { git = "ssh://[email protected]/NethermindEth/lattirust.git", branch = "main", default-features = false }
lattirust-poly = { git = "ssh://[email protected]/NethermindEth/lattirust.git", branch = "main", default-features = false }
lattirust-ring = { git = "ssh://[email protected]/NethermindEth/lattirust.git", branch = "main", default-features = false }
stark-rings = { git = "ssh://[email protected]/NethermindEth/stark-rings.git", branch = "main", default-features = false }
stark-rings-linalg = { git = "ssh://[email protected]/NethermindEth/stark-rings.git", branch = "main", default-features = false }
stark-rings-poly = { git = "ssh://[email protected]/NethermindEth/stark-rings.git", branch = "main", default-features = false }
num-bigint = { version = "0.4.5", default-features = false }
rand = { version = "0.8.5", default-features = false }
thiserror = { version = "2.0.3", default-features = false }
Expand Down
6 changes: 3 additions & 3 deletions cyclotomic-rings/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ ark-std = { workspace = true }
ark-crypto-primitives = { workspace = true }
num-bigint = { workspace = true }
rand = { workspace = true }
lattirust-linear-algebra = { workspace = true }
lattirust-poly = { workspace = true }
lattirust-ring = { workspace = true }
stark-rings = { workspace = true }
stark-rings-linalg = { workspace = true }
stark-rings-poly = { workspace = true }
thiserror = { workspace = true }

[features]
Expand Down
2 changes: 1 addition & 1 deletion cyclotomic-rings/src/rings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use ark_crypto_primitives::sponge::{poseidon::PoseidonConfig, Absorb};
use ark_ff::Field;
use ark_ff::PrimeField;
use ark_std::ops::MulAssign;
use lattirust_ring::{
use stark_rings::{
balanced_decomposition::Decompose,
cyclotomic_ring::{CRT, ICRT},
traits::MulUnchecked,
Expand Down
4 changes: 2 additions & 2 deletions cyclotomic-rings/src/rings/babybear.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use lattirust_ring::cyclotomic_ring::models::babybear::{Fq, RqNTT, RqPoly};
use stark_rings::cyclotomic_ring::models::babybear::{Fq, RqNTT, RqPoly};

use super::SuitableRing;
use crate::ark_base::*;
Expand Down Expand Up @@ -69,7 +69,7 @@ impl LatticefoldChallengeSet<BabyBearRingNTT> for BabyBearChallengeSet {
#[cfg(test)]
mod tests {
use ark_ff::BigInt;
use lattirust_ring::cyclotomic_ring::models::babybear::Fq;
use stark_rings::cyclotomic_ring::models::babybear::Fq;

use super::*;

Expand Down
4 changes: 2 additions & 2 deletions cyclotomic-rings/src/rings/frog.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use lattirust_ring::cyclotomic_ring::models::frog_ring::{Fq, RqNTT, RqPoly};
use stark_rings::cyclotomic_ring::models::frog_ring::{Fq, RqNTT, RqPoly};

use crate::ark_base::*;
use crate::challenge_set::{error, LatticefoldChallengeSet};
Expand Down Expand Up @@ -57,7 +57,7 @@ impl LatticefoldChallengeSet<FrogRingNTT> for FrogChallengeSet {
#[cfg(test)]
mod tests {
use ark_ff::BigInt;
use lattirust_ring::cyclotomic_ring::models::frog_ring::Fq;
use stark_rings::cyclotomic_ring::models::frog_ring::Fq;

use super::*;

Expand Down
4 changes: 2 additions & 2 deletions cyclotomic-rings/src/rings/goldilocks.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use lattirust_ring::cyclotomic_ring::models::goldilocks::{Fq, RqNTT, RqPoly};
use stark_rings::cyclotomic_ring::models::goldilocks::{Fq, RqNTT, RqPoly};

use super::SuitableRing;
use crate::ark_base::*;
Expand Down Expand Up @@ -69,7 +69,7 @@ impl LatticefoldChallengeSet<GoldilocksRingNTT> for GoldilocksChallengeSet {
#[cfg(test)]
mod tests {
use ark_ff::BigInt;
use lattirust_ring::cyclotomic_ring::models::goldilocks::Fq;
use stark_rings::cyclotomic_ring::models::goldilocks::Fq;

use super::*;

Expand Down
2 changes: 1 addition & 1 deletion cyclotomic-rings/src/rings/poseidon/babybear.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use ark_crypto_primitives::sponge::poseidon::PoseidonConfig;
use ark_std::convert::From;
use lattirust_ring::cyclotomic_ring::models::babybear::Fq;
use stark_rings::cyclotomic_ring::models::babybear::Fq;

use crate::rings::{BabyBearPoseidonConfig, GetPoseidonParams};

Expand Down
2 changes: 1 addition & 1 deletion cyclotomic-rings/src/rings/poseidon/frog.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use ark_crypto_primitives::sponge::poseidon::PoseidonConfig;
use lattirust_ring::cyclotomic_ring::models::frog_ring::Fq;
use stark_rings::cyclotomic_ring::models::frog_ring::Fq;

use crate::ark_base::*;
use crate::rings::{FrogPoseidonConfig, GetPoseidonParams};
Expand Down
2 changes: 1 addition & 1 deletion cyclotomic-rings/src/rings/poseidon/goldilocks.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use ark_crypto_primitives::sponge::poseidon::PoseidonConfig;
use ark_std::convert::From;
use lattirust_ring::cyclotomic_ring::models::goldilocks::Fq;
use stark_rings::cyclotomic_ring::models::goldilocks::Fq;

use crate::rings::{GetPoseidonParams, GoldilocksPoseidonConfig};

Expand Down
2 changes: 1 addition & 1 deletion cyclotomic-rings/src/rings/poseidon/stark.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use ark_crypto_primitives::sponge::poseidon::PoseidonConfig;
use ark_ff::MontFp;
use lattirust_ring::cyclotomic_ring::models::stark_prime::Fq;
use stark_rings::cyclotomic_ring::models::stark_prime::Fq;

use crate::ark_base::*;
use crate::rings::{GetPoseidonParams, StarkPoseidonConfig};
Expand Down
2 changes: 1 addition & 1 deletion cyclotomic-rings/src/rings/stark.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// PGold = 2^64 − 2^32 + 1
use lattirust_ring::cyclotomic_ring::models::stark_prime::{Fq, RqNTT, RqPoly};
use stark_rings::cyclotomic_ring::models::stark_prime::{Fq, RqNTT, RqPoly};

use crate::ark_base::*;
use crate::{challenge_set::error, challenge_set::LatticefoldChallengeSet};
Expand Down
4 changes: 2 additions & 2 deletions cyclotomic-rings/src/rotation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
//!
use ark_ff::{Field, Zero};
use lattirust_ring::{Cyclotomic, PolyRing};
use stark_rings::{Cyclotomic, PolyRing};

use crate::ark_base::*;
use crate::rings::SuitableRing;
Expand Down Expand Up @@ -107,7 +107,7 @@ pub fn rot_lin_combination<R: SuitableRing>(
#[cfg(test)]
mod tests {
use ark_ff::UniformRand;
use lattirust_ring::cyclotomic_ring::models::goldilocks::{Fq, Fq3};
use stark_rings::cyclotomic_ring::models::goldilocks::{Fq, Fq3};

use super::*;
use crate::rings::{GoldilocksRingNTT, GoldilocksRingPoly};
Expand Down
4 changes: 2 additions & 2 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ unused = 'deny'
[sources]
unknown-registry = "deny"
unknown-git = "deny"
# TODO remove this git dependency after the lattirust status is clarified
# TODO remove this git dependency after the stark-rings status is clarified
allow-git = [
"ssh://[email protected]/NethermindEth/lattirust.git",
"ssh://[email protected]/NethermindEth/stark-rings.git",
]

[sources.allow-org]
Expand Down
12 changes: 6 additions & 6 deletions latticefold/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ ark-serialize = { workspace = true }
ark-std = { workspace = true }
cyclotomic-rings = { workspace = true }
hashbrown = "0.15"
lattirust-linear-algebra = { workspace = true }
lattirust-poly = { workspace = true }
lattirust-ring = { workspace = true }
stark-rings = { workspace = true }
stark-rings-linalg = { workspace = true }
stark-rings-poly = { workspace = true }
num-traits = { version = "0.2.19", default-features = false }
paste = "1.0.15"
rand = { workspace = true }
Expand All @@ -28,9 +28,9 @@ parallel = [
"dep:rayon",
"std",
"ark-std/parallel",
"lattirust-linear-algebra/parallel",
"lattirust-poly/parallel",
"lattirust-ring/parallel",
"stark-rings/parallel",
"stark-rings-linalg/parallel",
"stark-rings-poly/parallel",
]
getrandom = [ "ark-std/getrandom" ]

Expand Down
2 changes: 1 addition & 1 deletion latticefold/benches/ajtai.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use cyclotomic_rings::rings::{
BabyBearRingNTT, FrogRingNTT, GoldilocksRingNTT, StarkRingNTT, SuitableRing,
};
use latticefold::commitment::AjtaiCommitmentScheme;
use lattirust_ring::cyclotomic_ring::{CRT, ICRT};
use stark_rings::cyclotomic_ring::{CRT, ICRT};
use std::fmt::Debug;

fn ajtai_benchmark<
Expand Down
8 changes: 4 additions & 4 deletions latticefold/src/arith.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ use core::mem;
use ark_ff::Field;
use ark_std::log2;
use cyclotomic_rings::rings::SuitableRing;
use lattirust_linear_algebra::SparseMatrix;
use lattirust_poly::mle::DenseMultilinearExtension;
use lattirust_ring::{
use stark_rings::{
balanced_decomposition::{gadget_decompose, gadget_recompose},
cyclotomic_ring::{CRT, ICRT},
PolyRing, Ring,
};
use stark_rings_linalg::SparseMatrix;
use stark_rings_poly::mle::DenseMultilinearExtension;

use crate::{
ark_base::*,
Expand Down Expand Up @@ -432,7 +432,7 @@ pub mod tests {
use cyclotomic_rings::rings::{
BabyBearRingNTT, GoldilocksRingNTT, GoldilocksRingPoly, StarkRingNTT,
};
use lattirust_ring::cyclotomic_ring::models::goldilocks::{Fq, Fq3};
use stark_rings::cyclotomic_ring::models::goldilocks::{Fq, Fq3};

pub(crate) fn get_test_ccs<R: Ring>(W: usize, L: usize) -> CCS<R> {
let r1cs = get_test_r1cs::<R>();
Expand Down
4 changes: 2 additions & 2 deletions latticefold/src/arith/ccs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
use ark_std::{log2, vec::Vec};
use cyclotomic_rings::rings::SuitableRing;
use lattirust_linear_algebra::SparseMatrix;
use lattirust_ring::Ring;
use stark_rings::Ring;
use stark_rings_linalg::SparseMatrix;

use super::{
r1cs::{create_dummy_identity_sparse_matrix, to_F_matrix, to_F_vec},
Expand Down
6 changes: 3 additions & 3 deletions latticefold/src/arith/r1cs.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//! Defines behaviour of R1CS, a degree two constraint system
use cyclotomic_rings::rings::SuitableRing;
use lattirust_linear_algebra::sparse_matrix::dense_matrix_u64_to_sparse;
use lattirust_linear_algebra::SparseMatrix;
use lattirust_ring::Ring;
use stark_rings::Ring;
use stark_rings_linalg::sparse_matrix::dense_matrix_u64_to_sparse;
use stark_rings_linalg::SparseMatrix;

use super::{
error::CSError as Error,
Expand Down
Loading

0 comments on commit d071785

Please sign in to comment.