Merge branch 'main' into finish_prover

valida-xyz · Jan 23, 2024 · 1b439f7 · 1b439f7
2 parents 213198c + 3019431
commit 1b439f7
Show file tree

Hide file tree

Showing 24 changed files with 388 additions and 76 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,9 +18,10 @@ jobs:
       - name: Checkout Plonky3
         uses: actions/checkout@v4
         with:
-          repository: Plonky3/Plonky3
+          repository: lita-xyz/Plonky3
           path: Plonky3
-
+          ref: batch_prover
+
       - name: Checkout Valida
         uses: actions/checkout@v4
         with:
@@ -48,8 +49,9 @@ jobs:
       - name: Checkout Plonky3
         uses: actions/checkout@v4
         with:
-          repository: Plonky3/Plonky3
+          repository: lita-xyz/Plonky3
           path: Plonky3
+          ref: batch_prover
 
       - name: Checkout Valida
         uses: actions/checkout@v4

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/div/mod.rs b/alu_u32/src/div/mod.rs
@@ -6,17 +6,17 @@ use columns::{Div32Cols, DIV_COL_MAP, NUM_DIV_COLS};
 use core::mem::transmute;
 use valida_bus::MachineWithGeneralBus;
 use valida_cpu::MachineWithCpuChip;
+use valida_machine::config::StarkConfig;
 use valida_machine::core::SDiv;
 use valida_machine::{instructions, Chip, Instruction, Interaction, Operands, Word};
 use valida_opcodes::{DIV32, SDIV32};
 use valida_range::MachineWithRangeChip;
+use valida_util::pad_to_power_of_two;
 
 use p3_air::VirtualPairCol;
 use p3_field::{AbstractField, Field, PrimeField};
 use p3_matrix::dense::RowMajorMatrix;
 use p3_maybe_rayon::prelude::*;
-use valida_machine::config::StarkConfig;
-use valida_util::pad_to_power_of_two;
 
 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::prelude::*;
+
 use valida_machine::config::StarkConfig;
 use valida_util::pad_to_power_of_two;
-
 pub mod columns;
 pub mod stark;
 

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"