logos-storage/plonky2
1
0
Fork 0
mirror of https://github.com/logos-storage/plonky2.git synced 2026-01-04 06:43:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix GMiMCEvalGate

Browse Source
This commit is contained in:
Daniel Lubarov 2021-04-28 13:50:40 -07:00
parent 815a294305
commit aabfbe82cd
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gates/gmimc.rs
View File

@ -166,7 +166,7 @@ impl<F: Field, const R: usize> Gate<F> for GMiMCGate<F, R> {
cubing_input, cubing_input,
Target::Wire(Wire { Target::Wire(Wire {
gate, gate,
input: GMiMCEvalGate::WIRE_CUBING_INPUT, input: GMiMCEvalGate::<F>::WIRE_CUBING_INPUT,
}), }),
); );
@ -174,7 +174,7 @@ impl<F: Field, const R: usize> Gate<F> for GMiMCGate<F, R> {
addition_buffer, addition_buffer,
Target::Wire(Wire { Target::Wire(Wire {
gate, gate,
input: GMiMCEvalGate::WIRE_ADDITION_BUFFER_OLD, input: GMiMCEvalGate::<F>::WIRE_ADDITION_BUFFER_OLD,
}), }),
); );
@ -182,23 +182,23 @@ impl<F: Field, const R: usize> Gate<F> for GMiMCGate<F, R> {
state[active], state[active],
Target::Wire(Wire { Target::Wire(Wire {
gate, gate,
input: GMiMCEvalGate::WIRE_STATE_A_OLD, input: GMiMCEvalGate::<F>::WIRE_STATE_A_OLD,
}), }),
); );
constraints.push(Target::Wire(Wire { constraints.push(Target::Wire(Wire {
gate, gate,
input: GMiMCEvalGate::WIRE_CONSTRAINT, input: GMiMCEvalGate::<F>::WIRE_CONSTRAINT,
})); }));
addition_buffer = Target::Wire(Wire { addition_buffer = Target::Wire(Wire {
gate, gate,
input: GMiMCEvalGate::WIRE_ADDITION_BUFFER_NEW, input: GMiMCEvalGate::<F>::WIRE_ADDITION_BUFFER_NEW,
}); });
state[active] = Target::Wire(Wire { state[active] = Target::Wire(Wire {
gate, gate,
input: GMiMCEvalGate::WIRE_STATE_A_NEW, input: GMiMCEvalGate::<F>::WIRE_STATE_A_NEW,
}); });
} }

33
src/gates/gmimc_eval.rs
View File

@ -6,6 +6,7 @@ use crate::target::Target;
use crate::vars::{EvaluationTargets, EvaluationVars}; use crate::vars::{EvaluationTargets, EvaluationVars};
use crate::wire::Wire; use crate::wire::Wire;
use crate::witness::PartialWitness; use crate::witness::PartialWitness;
use std::marker::PhantomData;
/// Performs some arithmetic involved in the evaluation of GMiMC's constraint polynomials for one /// Performs some arithmetic involved in the evaluation of GMiMC's constraint polynomials for one
/// round. In particular, this performs the following computations: /// round. In particular, this performs the following computations:
@ -20,11 +21,13 @@ use crate::witness::PartialWitness;
/// element; see https://affine.group/2020/02/starkware-challenge. `C_r` represents the round /// element; see https://affine.group/2020/02/starkware-challenge. `C_r` represents the round
/// constant for round `r`. /// constant for round `r`.
#[derive(Debug)] #[derive(Debug)]
pub struct GMiMCEvalGate; pub struct GMiMCEvalGate<F: Field> {
_phantom: PhantomData<F>,
}
impl GMiMCEvalGate { impl<F: Field> GMiMCEvalGate<F> {
pub fn get<F: Field>() -> GateRef<F> { pub fn get() -> GateRef<F> {
GateRef::new(GMiMCEvalGate) GateRef::new(GMiMCEvalGate { _phantom: PhantomData })
} }
pub const CONST_C_R: usize = 0; pub const CONST_C_R: usize = 0;
@ -38,7 +41,7 @@ impl GMiMCEvalGate {
const WIRE_F: usize = 6; const WIRE_F: usize = 6;
} }
impl<F: Field> Gate<F> for GMiMCEvalGate { impl<F: Field> Gate<F> for GMiMCEvalGate<F> {
fn id(&self) -> String { fn id(&self) -> String {
format!("{:?}", self) format!("{:?}", self)
} }
@ -151,15 +154,15 @@ impl<F: Field> SimpleGenerator<F> for GMiMCEvalGenerator<F> {
vec![ vec![
Target::Wire(Wire { Target::Wire(Wire {
gate, gate,
input: GMiMCEvalGate::WIRE_CUBING_INPUT, input: GMiMCEvalGate::<F>::WIRE_CUBING_INPUT,
}), }),
Target::Wire(Wire { Target::Wire(Wire {
gate, gate,
input: GMiMCEvalGate::WIRE_ADDITION_BUFFER_OLD, input: GMiMCEvalGate::<F>::WIRE_ADDITION_BUFFER_OLD,
}), }),
Target::Wire(Wire { Target::Wire(Wire {
gate, gate,
input: GMiMCEvalGate::WIRE_STATE_A_OLD, input: GMiMCEvalGate::<F>::WIRE_STATE_A_OLD,
}), }),
] ]
} }
@ -168,31 +171,31 @@ impl<F: Field> SimpleGenerator<F> for GMiMCEvalGenerator<F> {
let gate = self.gate_index; let gate = self.gate_index;
let wire_constraint = Wire { let wire_constraint = Wire {
gate, gate,
input: GMiMCEvalGate::WIRE_CONSTRAINT, input: GMiMCEvalGate::<F>::WIRE_CONSTRAINT,
}; };
let wire_state_a_old = Wire { let wire_state_a_old = Wire {
gate, gate,
input: GMiMCEvalGate::WIRE_STATE_A_OLD, input: GMiMCEvalGate::<F>::WIRE_STATE_A_OLD,
}; };
let wire_state_a_new = Wire { let wire_state_a_new = Wire {
gate, gate,
input: GMiMCEvalGate::WIRE_STATE_A_NEW, input: GMiMCEvalGate::<F>::WIRE_STATE_A_NEW,
}; };
let wire_addition_buffer_old = Wire { let wire_addition_buffer_old = Wire {
gate, gate,
input: GMiMCEvalGate::WIRE_ADDITION_BUFFER_OLD, input: GMiMCEvalGate::<F>::WIRE_ADDITION_BUFFER_OLD,
}; };
let wire_addition_buffer_new = Wire { let wire_addition_buffer_new = Wire {
gate, gate,
input: GMiMCEvalGate::WIRE_ADDITION_BUFFER_NEW, input: GMiMCEvalGate::<F>::WIRE_ADDITION_BUFFER_NEW,
}; };
let wire_cubing_input = Wire { let wire_cubing_input = Wire {
gate, gate,
input: GMiMCEvalGate::WIRE_CUBING_INPUT, input: GMiMCEvalGate::<F>::WIRE_CUBING_INPUT,
}; };
let wire_f = Wire { let wire_f = Wire {
gate, gate,
input: GMiMCEvalGate::WIRE_F, input: GMiMCEvalGate::<F>::WIRE_F,
}; };
let addition_buffer_old = witness.get_wire(wire_addition_buffer_old); let addition_buffer_old = witness.get_wire(wire_addition_buffer_old);