Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion _typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ sie = "sie"
Sie = "Sie"
tou = "tou"
leafs = "leafs"
LEAFS = "LEAFS"
LEAFS = "LEAFS"
INOT = "INOT"
inot = "inot"
4 changes: 2 additions & 2 deletions circuit_defs/bigint_with_control/verifier/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions circuit_defs/blake2_with_compression/verifier/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions circuit_defs/keccak_special5/verifier/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions circuit_defs/reduced_risc_v_machine/verifier/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions circuit_defs/risc_v_cycles/verifier/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions circuit_defs/unrolled_circuits/mul_div/verifier/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ fn test_unified_cycle_or_delegation() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down Expand Up @@ -132,7 +132,7 @@ fn test_unrolled_circuit() {
match result {
Ok(..) => {}
Err(err) => {
panic!("Verifier thread failes with {}", err);
panic!("Verifier thread fails with {}", err);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions cs/src/cs/cs_reference.rs
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ impl<F: PrimeField, W: WitnessPlacer<F>> Circuit<F> for BasicAssembly<F, W> {
rs1_index: self.add_variable(),
rs2_index: self.add_variable(),
rd_index: self.add_variable(),
rd_is_zero: self.add_variable(), // boolean in nature, but constrainted by prover directly
rd_is_zero: self.add_variable(), // boolean in nature, but constrained by prover directly
imm: std::array::from_fn(|_| self.add_variable()),
funct3: self.add_variable(),
funct7: Some(self.add_variable()),
Expand Down Expand Up @@ -777,7 +777,7 @@ impl<F: PrimeField, W: WitnessPlacer<F>> Circuit<F> for BasicAssembly<F, W> {
rs1_index: self.add_variable(),
rs2_index: self.add_variable(),
rd_index: self.add_variable(),
rd_is_zero: self.add_variable(), // boolean in nature, but constrainted by prover directly
rd_is_zero: self.add_variable(), // boolean in nature, but constrained by prover directly
imm: std::array::from_fn(|_| self.add_variable()),
funct3: self.add_variable(),
funct7: if ASSUME_PREPROCESSED_DECODER_TABLE {
Expand Down Expand Up @@ -847,7 +847,7 @@ impl<F: PrimeField, W: WitnessPlacer<F>> Circuit<F> for BasicAssembly<F, W> {
todo!();
}

// not make a final state - opcode family circuit is reponsible to create a PC,
// not make a final state - opcode family circuit is responsible to create a PC,
// and timestamps bump comes from compiler

let pc: [Variable; 2] = std::array::from_fn(|_| self.add_variable());
Expand Down
4 changes: 2 additions & 2 deletions cs/src/cs/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,14 @@ pub struct PreprocessedConstraintForEval<F: PrimeField> {

impl<F: PrimeField> PreprocessedConstraintForEval<F> {
pub fn from_constraint(constraint: Constraint<F>) -> Self {
let (quatratic_terms, linear_terms, constant_term) =
let (quadratic_terms, linear_terms, constant_term) =
constraint.clone().split_max_quadratic();

// split quadratic terms and linear terms into cases where coefficient is 1 or not
let mut quadratic_trivial_additions = vec![];
let mut quadratic_trivial_subtractions = vec![];
let mut quadratic_nontrivial = vec![];
for (c, a, b) in quatratic_terms.into_iter() {
for (c, a, b) in quadratic_terms.into_iter() {
assert!(c != F::ZERO);
if c == F::ONE {
quadratic_trivial_additions.push((a, b));
Expand Down
4 changes: 2 additions & 2 deletions cs/src/definitions/stage2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ impl LookupAndMemoryArgumentLayout {
memory_layout.batched_ram_accesses.is_empty()
&& memory_layout.register_and_indirect_accesses.is_empty()
);
// itermediate accumulators per access
// intermediate accumulators per access
let num_set_polys_for_memory_shuffle = memory_layout.shuffle_ram_access_sets.len();

AlignedColumnSet::layout_at(&mut offset, num_set_polys_for_memory_shuffle)
Expand All @@ -389,7 +389,7 @@ impl LookupAndMemoryArgumentLayout {
num_intermediate_polys_for_register_or_indirect_accesses +=
el.indirect_accesses.len();
}
// itermediate accumulators per access
// intermediate accumulators per access
let num_set_polys_for_memory_shuffle = num_intermediate_polys_for_batched_ram
+ num_intermediate_polys_for_register_or_indirect_accesses;

Expand Down
2 changes: 1 addition & 1 deletion cs/src/delegation/keccak_special5/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ pub fn define_keccak_special5_delegation_circuit<F: PrimeField, CS: Circuit<F>>(

cs.add_constraint_allow_explicit_linear(Constraint::from(control_reg[0])); // we expect low 16 bits to be empty
cs.add_constraint_allow_explicit_linear(Constraint::from(control_reg_next[0])); // we expect low 16 bits to be empty
(control_reg[1], control_reg_next[1]) // only the high 16 bits contain control info (to accomodate for LUI)
(control_reg[1], control_reg_next[1]) // only the high 16 bits contain control info (to accommodate for LUI)
};
let state_indexes = {
// we can't assign to these variables by lookup since these variables belong to memory subtree
Expand Down
Loading
Loading