Merge pull request #96 from lita-xyz/prove

Prove
valida-xyz · Jan 18, 2024 · 50f0505 · 50f0505
2 parents 9bfe764 + 9e911a1
commit 50f0505
Show file tree

Hide file tree

Showing 31 changed files with 446 additions and 101 deletions.
diff --git a/alu_u32/Cargo.toml b/alu_u32/Cargo.toml
@@ -12,7 +12,7 @@ p3-baby-bear = { path = "../../Plonky3/baby-bear" }
 p3-field = { path = "../../Plonky3/field" }
 p3-matrix = { path = "../../Plonky3/matrix" }
 p3-maybe-rayon = { path = "../../Plonky3/maybe-rayon" }
-
+p3-uni-stark = { path = "../../Plonky3/uni-stark" }
 valida-bus = { path = "../bus" }
 valida-derive = { path = "../derive" }
 valida-machine = { path = "../machine" }

diff --git a/alu_u32/src/add/mod.rs b/alu_u32/src/add/mod.rs
@@ -14,7 +14,7 @@ use p3_air::VirtualPairCol;
 use p3_field::{AbstractField, Field, PrimeField};
 use p3_matrix::dense::RowMajorMatrix;
 use p3_maybe_rayon::*;
-use valida_machine::config::StarkConfig;
+use p3_uni_stark::StarkConfig;
 use valida_util::pad_to_power_of_two;
 
 pub mod columns;

diff --git a/alu_u32/src/bitwise/mod.rs b/alu_u32/src/bitwise/mod.rs
@@ -13,7 +13,7 @@ use p3_air::VirtualPairCol;
 use p3_field::{AbstractField, Field, PrimeField};
 use p3_matrix::dense::RowMajorMatrix;
 use p3_maybe_rayon::*;
-use valida_machine::config::StarkConfig;
+use p3_uni_stark::StarkConfig;
 use valida_util::pad_to_power_of_two;
 
 pub mod columns;

diff --git a/alu_u32/src/div/mod.rs b/alu_u32/src/div/mod.rs
@@ -15,9 +15,9 @@ use p3_air::VirtualPairCol;
 use p3_field::{AbstractField, Field, PrimeField};
 use p3_matrix::dense::RowMajorMatrix;
 use p3_maybe_rayon::*;
-use valida_machine::config::StarkConfig;
-use valida_util::pad_to_power_of_two;
 
+use valida_util::pad_to_power_of_two;
+use p3_uni_stark::StarkConfig;
 pub mod columns;
 pub mod stark;
 

diff --git a/alu_u32/src/lt/mod.rs b/alu_u32/src/lt/mod.rs
@@ -16,9 +16,9 @@ use p3_air::VirtualPairCol;
 use p3_field::{AbstractField, Field, PrimeField};
 use p3_matrix::dense::RowMajorMatrix;
 use p3_maybe_rayon::*;
-use valida_machine::config::StarkConfig;
-use valida_util::pad_to_power_of_two;
 
+use valida_util::pad_to_power_of_two;
+use p3_uni_stark::StarkConfig;
 pub mod columns;
 pub mod stark;
 

diff --git a/alu_u32/src/mul/mod.rs b/alu_u32/src/mul/mod.rs
@@ -13,7 +13,7 @@ use core::borrow::BorrowMut;
 use p3_air::VirtualPairCol;
 use p3_field::{AbstractField, Field, PrimeField};
 use p3_matrix::dense::RowMajorMatrix;
-use valida_machine::config::StarkConfig;
+use p3_uni_stark::StarkConfig;
 
 pub mod columns;
 pub mod stark;

diff --git a/alu_u32/src/shift/mod.rs b/alu_u32/src/shift/mod.rs
@@ -15,7 +15,7 @@ use p3_air::VirtualPairCol;
 use p3_field::{AbstractField, Field, PrimeField};
 use p3_matrix::dense::RowMajorMatrix;
 use p3_maybe_rayon::*;
-use valida_machine::config::StarkConfig;
+use p3_uni_stark::StarkConfig;
 use valida_util::pad_to_power_of_two;
 
 pub mod columns;

diff --git a/alu_u32/src/sub/mod.rs b/alu_u32/src/sub/mod.rs
@@ -14,7 +14,8 @@ use p3_air::VirtualPairCol;
 use p3_field::{AbstractField, Field, PrimeField};
 use p3_matrix::dense::RowMajorMatrix;
 use p3_maybe_rayon::*;
-use valida_machine::config::StarkConfig;
+use p3_uni_stark::StarkConfig;
+
 use valida_util::pad_to_power_of_two;
 
 pub mod columns;

diff --git a/basic/Cargo.toml b/basic/Cargo.toml
@@ -27,10 +27,15 @@ p3-baby-bear = { path = "../../Plonky3/baby-bear" }
 p3-field = { path = "../../Plonky3/field" }
 p3-maybe-rayon = { path = "../../Plonky3/maybe-rayon" }
 p3-util = { path = "../../Plonky3/util" }
-
+p3-goldilocks = {path = "../../Plonky3/goldilocks" }
+p3-uni-stark = {path = "../../Plonky3/uni-stark" }
+p3-commit = { path = "../../Plonky3/commit" }
+p3-air = { path = "../../Plonky3/air" }
+p3-matrix = { path = "../../Plonky3/matrix" }
 [dev-dependencies]
+
 p3-challenger = { path = "../../Plonky3/challenger" }
-p3-commit = { path = "../../Plonky3/commit" }
+
 p3-dft = { path = "../../Plonky3/dft" }
 p3-field = { path = "../../Plonky3/field" }
 p3-fri = { path = "../../Plonky3/fri" }
@@ -40,4 +45,6 @@ p3-mds = { path = "../../Plonky3/mds" }
 p3-merkle-tree = { path = "../../Plonky3/merkle-tree" }
 p3-poseidon = { path = "../../Plonky3/poseidon" }
 p3-symmetric = { path = "../../Plonky3/symmetric" }
+
+
 rand = "0.8.5"