ProvableHQ/leo
1
1
Fork 0
mirror of https://github.com/ProvableHQ/leo.git synced 2024-09-11 05:45:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

remove snarkos group trait from compiler

Browse Source
This commit is contained in:
collin 2020-05-29 15:55:57 -07:00
parent dfcf2d3dbd
commit 19f6e64c48
49 changed files with 595 additions and 738 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
benchmark/src/main.rs
View File

@ -6,9 +6,7 @@ use snarkos_algorithms::snark::{
create_random_proof, generate_random_parameters, prepare_verifying_key, verify_proof,
};
use snarkos_curves::bls12_377::{Bls12_377, Fr};
use snarkos_curves::edwards_bls12::EdwardsProjective;
use snarkos_errors::gadgets::SynthesisError;
use snarkos_models::curves::Group;
use snarkos_models::{
curves::{Field, PrimeField},
gadgets::r1cs::{ConstraintSynthesizer, ConstraintSystem},
@ -20,19 +18,17 @@ use std::{
};
#[derive(Clone)]
pub struct Benchmark<F: Field + PrimeField, G: Group> {
program: Program<F, G>,
parameters: Vec<Option<InputValue<F, G>>>,
_group: PhantomData<G>,
pub struct Benchmark<F: Field + PrimeField> {
program: Program<F>,
parameters: Vec<Option<InputValue<F>>>,
_engine: PhantomData<F>,
}
impl<F: Field + PrimeField, G: Group> Benchmark<F, G> {
impl<F: Field + PrimeField> Benchmark<F> {
pub fn new() -> Self {
Self {
program: Program::new(),
parameters: vec![],
_group: PhantomData,
_engine: PhantomData,
}
}
@ -48,7 +44,7 @@ impl<F: Field + PrimeField, G: Group> Benchmark<F, G> {
let syntax_tree = ast::File::from_pest(&mut file).expect("infallible");
// Build a leo program from the syntax tree
self.program = Program::<F, G>::from(syntax_tree, "simple".into());
self.program = Program::<F>::from(syntax_tree, "simple".into());
self.parameters = vec![None; self.program.num_parameters];
println!(" compiled: {:#?}\n", self.program);
@ -57,7 +53,7 @@ impl<F: Field + PrimeField, G: Group> Benchmark<F, G> {
}
}
impl<F: Field + PrimeField, G: Group> ConstraintSynthesizer<F> for Benchmark<F, G> {
impl<F: Field + PrimeField> ConstraintSynthesizer<F> for Benchmark<F> {
fn generate_constraints<CS: ConstraintSystem<F>>(
self,
cs: &mut CS,
@ -81,7 +77,7 @@ fn main() {
let start = Instant::now();
// Load and compile program
let mut program = Benchmark::<Fr, EdwardsProjective>::new();
let mut program = Benchmark::<Fr>::new();
program.evaluate_program().unwrap();
// Generate proof parameters

20
compiler/src/compiler.rs
View File

@ -9,7 +9,7 @@ use crate::{
use snarkos_errors::gadgets::SynthesisError;
use snarkos_models::{
curves::{Field, Group, PrimeField},
curves::{Field, PrimeField},
gadgets::r1cs::{ConstraintSynthesizer, ConstraintSystem},
};
@ -18,16 +18,16 @@ use sha2::{Digest, Sha256};
use std::{fs, marker::PhantomData, path::PathBuf};
#[derive(Clone)]
pub struct Compiler<F: Field + PrimeField, G: Group> {
pub struct Compiler<F: Field + PrimeField> {
package_name: String,
main_file_path: PathBuf,
program: Program<F, G>,
program_inputs: Vec<Option<InputValue<F, G>>>,
output: Option<ConstrainedValue<F, G>>,
program: Program<F>,
program_inputs: Vec<Option<InputValue<F>>>,
output: Option<ConstrainedValue<F>>,
_engine: PhantomData<F>,
}
impl<F: Field + PrimeField, G: Group> Compiler<F, G> {
impl<F: Field + PrimeField> Compiler<F> {
pub fn init(package_name: String, main_file_path: PathBuf) -> Result<Self, CompilerError> {
let mut program = Self {
package_name,
@ -44,7 +44,7 @@ impl<F: Field + PrimeField, G: Group> Compiler<F, G> {
Ok(program)
}
pub fn set_inputs(&mut self, program_inputs: Vec<Option<InputValue<F, G>>>) {
pub fn set_inputs(&mut self, program_inputs: Vec<Option<InputValue<F>>>) {
self.program_inputs = program_inputs;
}
@ -64,7 +64,7 @@ impl<F: Field + PrimeField, G: Group> Compiler<F, G> {
pub fn compile_constraints<CS: ConstraintSystem<F>>(
self,
cs: &mut CS,
) -> Result<ConstrainedValue<F, G>, CompilerError> {
) -> Result<ConstrainedValue<F>, CompilerError> {
generate_constraints(cs, self.program, self.program_inputs)
}
@ -98,7 +98,7 @@ impl<F: Field + PrimeField, G: Group> Compiler<F, G> {
// Build program from abstract syntax tree
let package_name = self.package_name.clone();
self.program = Program::<F, G>::from(syntax_tree, package_name);
self.program = Program::<F>::from(syntax_tree, package_name);
self.program_inputs = vec![None; self.program.num_parameters];
log::debug!("Program parsing complete\n{:#?}", self.program);
@ -107,7 +107,7 @@ impl<F: Field + PrimeField, G: Group> Compiler<F, G> {
}
}
impl<F: Field + PrimeField, G: Group> ConstraintSynthesizer<F> for Compiler<F, G> {
impl<F: Field + PrimeField> ConstraintSynthesizer<F> for Compiler<F> {
fn generate_constraints<CS: ConstraintSystem<F>>(
self,
cs: &mut CS,

28
compiler/src/constraints/boolean.rs
View File

@ -8,21 +8,21 @@ use crate::{
use snarkos_errors::gadgets::SynthesisError;
use snarkos_models::{
curves::{Field, Group, PrimeField},
curves::{Field, PrimeField},
gadgets::{
r1cs::ConstraintSystem,
utilities::{alloc::AllocGadget, boolean::Boolean, eq::EqGadget},
},
};
impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgram<F, G, CS> {
impl<F: Field + PrimeField, CS: ConstraintSystem<F>> ConstrainedProgram<F, CS> {
pub(crate) fn bool_from_input(
&mut self,
cs: &mut CS,
name: String,
private: bool,
input_value: Option<InputValue<F, G>>,
) -> Result<ConstrainedValue<F, G>, BooleanError> {
input_value: Option<InputValue<F>>,
) -> Result<ConstrainedValue<F>, BooleanError> {
// Check that the input value is the correct type
let bool_value = match input_value {
Some(input) => {
@ -49,13 +49,13 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
Ok(ConstrainedValue::Boolean(number))
}
pub(crate) fn get_boolean_constant(bool: Boolean) -> ConstrainedValue<F, G> {
pub(crate) fn get_boolean_constant(bool: Boolean) -> ConstrainedValue<F> {
ConstrainedValue::Boolean(bool)
}
pub(crate) fn evaluate_not(
value: ConstrainedValue<F, G>,
) -> Result<ConstrainedValue<F, G>, BooleanError> {
value: ConstrainedValue<F>,
) -> Result<ConstrainedValue<F>, BooleanError> {
match value {
ConstrainedValue::Boolean(boolean) => Ok(ConstrainedValue::Boolean(boolean.not())),
value => Err(BooleanError::CannotEvaluate(format!("!{}", value))),
@ -65,9 +65,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
pub(crate) fn enforce_or(
&mut self,
cs: &mut CS,
left: ConstrainedValue<F, G>,
right: ConstrainedValue<F, G>,
) -> Result<ConstrainedValue<F, G>, BooleanError> {
left: ConstrainedValue<F>,
right: ConstrainedValue<F>,
) -> Result<ConstrainedValue<F>, BooleanError> {
match (left, right) {
(ConstrainedValue::Boolean(left_bool), ConstrainedValue::Boolean(right_bool)) => Ok(
ConstrainedValue::Boolean(Boolean::or(cs, &left_bool, &right_bool)?),
@ -82,9 +82,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
pub(crate) fn enforce_and(
&mut self,
cs: &mut CS,
left: ConstrainedValue<F, G>,
right: ConstrainedValue<F, G>,
) -> Result<ConstrainedValue<F, G>, BooleanError> {
left: ConstrainedValue<F>,
right: ConstrainedValue<F>,
) -> Result<ConstrainedValue<F>, BooleanError> {
match (left, right) {
(ConstrainedValue::Boolean(left_bool), ConstrainedValue::Boolean(right_bool)) => Ok(
ConstrainedValue::Boolean(Boolean::and(cs, &left_bool, &right_bool)?),
@ -96,7 +96,7 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
}
}
pub(crate) fn boolean_eq(left: Boolean, right: Boolean) -> ConstrainedValue<F, G> {
pub(crate) fn boolean_eq(left: Boolean, right: Boolean) -> ConstrainedValue<F> {
ConstrainedValue::Boolean(Boolean::Constant(left.eq(&right)))
}

170
compiler/src/constraints/expression.rs
View File

@ -12,22 +12,22 @@ use crate::{
};
use snarkos_models::{
curves::{Field, Group, PrimeField},
curves::{Field, PrimeField},
gadgets::{
r1cs::ConstraintSystem,
utilities::{boolean::Boolean, select::CondSelectGadget},
},
};
impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgram<F, G, CS> {
impl<F: Field + PrimeField, CS: ConstraintSystem<F>> ConstrainedProgram<F, CS> {
/// Enforce a variable expression by getting the resolved value
pub(crate) fn evaluate_identifier(
&mut self,
file_scope: String,
function_scope: String,
expected_types: &Vec<Type<F, G>>,
unresolved_identifier: Identifier<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
expected_types: &Vec<Type<F>>,
unresolved_identifier: Identifier<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
// Evaluate the identifier name in the current function scope
let variable_name = new_scope(function_scope, unresolved_identifier.to_string());
let identifier_name = new_scope(file_scope, unresolved_identifier.to_string());
@ -53,9 +53,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
fn enforce_add_expression(
&mut self,
cs: &mut CS,
left: ConstrainedValue<F, G>,
right: ConstrainedValue<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
left: ConstrainedValue<F>,
right: ConstrainedValue<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
match (left, right) {
(ConstrainedValue::Integer(num_1), ConstrainedValue::Integer(num_2)) => {
Ok(Self::enforce_integer_add(cs, num_1, num_2)?)
@ -63,9 +63,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
(ConstrainedValue::FieldElement(fe_1), ConstrainedValue::FieldElement(fe_2)) => {
Ok(self.enforce_field_add(cs, fe_1, fe_2)?)
}
(ConstrainedValue::GroupElement(ge_1), ConstrainedValue::GroupElement(ge_2)) => {
Ok(Self::evaluate_group_add(ge_1, ge_2))
}
// (ConstrainedValue::Group(ge_1), ConstrainedValue::Group(ge_2)) => {
// Ok(Self::evaluate_group_add(ge_1, ge_2))
// }
(ConstrainedValue::Unresolved(string), val_2) => {
let val_1 = ConstrainedValue::from_other(string, &val_2)?;
self.enforce_add_expression(cs, val_1, val_2)
@ -84,9 +84,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
fn enforce_sub_expression(
&mut self,
cs: &mut CS,
left: ConstrainedValue<F, G>,
right: ConstrainedValue<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
left: ConstrainedValue<F>,
right: ConstrainedValue<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
match (left, right) {
(ConstrainedValue::Integer(num_1), ConstrainedValue::Integer(num_2)) => {
Ok(Self::enforce_integer_sub(cs, num_1, num_2)?)
@ -94,9 +94,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
(ConstrainedValue::FieldElement(fe_1), ConstrainedValue::FieldElement(fe_2)) => {
Ok(self.enforce_field_sub(cs, fe_1, fe_2)?)
}
(ConstrainedValue::GroupElement(ge_1), ConstrainedValue::GroupElement(ge_2)) => {
Ok(Self::evaluate_group_sub(ge_1, ge_2))
}
// (ConstrainedValue::Group(ge_1), ConstrainedValue::Group(ge_2)) => {
// Ok(Self::evaluate_group_sub(ge_1, ge_2))
// }
(ConstrainedValue::Unresolved(string), val_2) => {
let val_1 = ConstrainedValue::from_other(string, &val_2)?;
self.enforce_sub_expression(cs, val_1, val_2)
@ -115,9 +115,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
fn enforce_mul_expression(
&mut self,
cs: &mut CS,
left: ConstrainedValue<F, G>,
right: ConstrainedValue<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
left: ConstrainedValue<F>,
right: ConstrainedValue<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
match (left, right) {
(ConstrainedValue::Integer(num_1), ConstrainedValue::Integer(num_2)) => {
Ok(Self::enforce_integer_mul(cs, num_1, num_2)?)
@ -148,9 +148,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
fn enforce_div_expression(
&mut self,
cs: &mut CS,
left: ConstrainedValue<F, G>,
right: ConstrainedValue<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
left: ConstrainedValue<F>,
right: ConstrainedValue<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
match (left, right) {
(ConstrainedValue::Integer(num_1), ConstrainedValue::Integer(num_2)) => {
Ok(Self::enforce_integer_div(cs, num_1, num_2)?)
@ -177,9 +177,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
fn enforce_pow_expression(
&mut self,
cs: &mut CS,
left: ConstrainedValue<F, G>,
right: ConstrainedValue<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
left: ConstrainedValue<F>,
right: ConstrainedValue<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
match (left, right) {
(ConstrainedValue::Integer(num_1), ConstrainedValue::Integer(num_2)) => {
Ok(Self::enforce_integer_pow(cs, num_1, num_2)?)
@ -208,9 +208,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
/// Evaluate Boolean operations
fn evaluate_eq_expression(
&mut self,
left: ConstrainedValue<F, G>,
right: ConstrainedValue<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
left: ConstrainedValue<F>,
right: ConstrainedValue<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
match (left, right) {
(ConstrainedValue::Boolean(bool_1), ConstrainedValue::Boolean(bool_2)) => {
Ok(Self::boolean_eq(bool_1, bool_2))
@ -221,9 +221,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
// (ResolvedValue::FieldElement(fe_1), ResolvedValue::FieldElement(fe_2)) => {
// Self::field_eq(fe_1, fe_2)
// }
(ConstrainedValue::GroupElement(ge_1), ConstrainedValue::GroupElement(ge_2)) => {
Ok(Self::evaluate_group_eq(ge_1, ge_2))
}
// (ConstrainedValue::Group(ge_1), ConstrainedValue::Group(ge_2)) => {
// Ok(Self::evaluate_group_eq(ge_1, ge_2))
// }
(ConstrainedValue::Unresolved(string), val_2) => {
let val_1 = ConstrainedValue::from_other(string, &val_2)?;
self.evaluate_eq_expression(val_1, val_2)
@ -241,9 +241,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
fn evaluate_geq_expression(
&mut self,
left: ConstrainedValue<F, G>,
right: ConstrainedValue<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
left: ConstrainedValue<F>,
right: ConstrainedValue<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
match (left, right) {
// (ResolvedValue::FieldElement(fe_1), ResolvedValue::FieldElement(fe_2)) => {
// Self::field_geq(fe_1, fe_2)
@ -265,9 +265,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
fn evaluate_gt_expression(
&mut self,
left: ConstrainedValue<F, G>,
right: ConstrainedValue<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
left: ConstrainedValue<F>,
right: ConstrainedValue<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
match (left, right) {
// (ResolvedValue::FieldElement(fe_1), ResolvedValue::FieldElement(fe_2)) => {
// Self::field_gt(fe_1, fe_2)
@ -289,9 +289,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
fn evaluate_leq_expression(
&mut self,
left: ConstrainedValue<F, G>,
right: ConstrainedValue<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
left: ConstrainedValue<F>,
right: ConstrainedValue<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
match (left, right) {
// (ResolvedValue::FieldElement(fe_1), ResolvedValue::FieldElement(fe_2)) => {
// Self::field_leq(fe_1, fe_2)
@ -313,9 +313,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
fn evaluate_lt_expression(
&mut self,
left: ConstrainedValue<F, G>,
right: ConstrainedValue<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
left: ConstrainedValue<F>,
right: ConstrainedValue<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
match (left, right) {
// (ResolvedValue::FieldElement(fe_1), ResolvedValue::FieldElement(fe_2)) => {
// Self::field_lt(fe_1, fe_2)
@ -341,11 +341,11 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
expected_types: &Vec<Type<F, G>>,
first: Expression<F, G>,
second: Expression<F, G>,
third: Expression<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
expected_types: &Vec<Type<F>>,
first: Expression<F>,
second: Expression<F>,
third: Expression<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
let resolved_first = match self.enforce_expression(
cs,
file_scope.clone(),
@ -392,9 +392,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
expected_types: &Vec<Type<F, G>>,
array: Vec<Box<SpreadOrExpression<F, G>>>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
expected_types: &Vec<Type<F>>,
array: Vec<Box<SpreadOrExpression<F>>>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
// Check explicit array type dimension if given
let mut expected_types = expected_types.clone();
let expected_dimensions = vec![];
@ -456,7 +456,7 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
index: Expression<F, G>,
index: Expression<F>,
) -> Result<usize, ExpressionError> {
let expected_types = vec![Type::IntegerType(IntegerType::U32)];
match self.enforce_branch(
@ -476,10 +476,10 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
expected_types: &Vec<Type<F, G>>,
array: Box<Expression<F, G>>,
index: RangeOrExpression<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
expected_types: &Vec<Type<F>>,
array: Box<Expression<F>>,
index: RangeOrExpression<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
let array = match self.enforce_branch(
cs,
file_scope.clone(),
@ -517,9 +517,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
identifier: Identifier<F, G>,
members: Vec<CircuitFieldDefinition<F, G>>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
identifier: Identifier<F>,
members: Vec<CircuitFieldDefinition<F>>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
let mut program_identifier = new_scope(file_scope.clone(), identifier.to_string());
if identifier.is_self() {
@ -591,10 +591,10 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
expected_types: &Vec<Type<F, G>>,
circuit_identifier: Box<Expression<F, G>>,
circuit_member: Identifier<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
expected_types: &Vec<Type<F>>,
circuit_identifier: Box<Expression<F>>,
circuit_member: Identifier<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
let (circuit_name, members) = match self.enforce_branch(
cs,
file_scope.clone(),
@ -652,10 +652,10 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
expected_types: &Vec<Type<F, G>>,
circuit_identifier: Box<Expression<F, G>>,
circuit_member: Identifier<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
expected_types: &Vec<Type<F>>,
circuit_identifier: Box<Expression<F>>,
circuit_member: Identifier<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
// Get defined circuit
let circuit = match self.enforce_expression(
cs,
@ -706,10 +706,10 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
expected_types: &Vec<Type<F, G>>,
function: Box<Expression<F, G>>,
arguments: Vec<Expression<F, G>>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
expected_types: &Vec<Type<F>>,
function: Box<Expression<F>>,
arguments: Vec<Expression<F>>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
let function_value = self.enforce_expression(
cs,
file_scope.clone(),
@ -745,9 +745,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
}
pub(crate) fn enforce_number_implicit(
expected_types: &Vec<Type<F, G>>,
expected_types: &Vec<Type<F>>,
value: String,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
) -> Result<ConstrainedValue<F>, ExpressionError> {
if expected_types.len() == 1 {
return Ok(ConstrainedValue::from_type(value, &expected_types[0])?);
}
@ -763,9 +763,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
expected_types: &Vec<Type<F, G>>,
expression: Expression<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
expected_types: &Vec<Type<F>>,
expression: Expression<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
let mut branch =
self.enforce_expression(cs, file_scope, function_scope, expected_types, expression)?;
@ -780,10 +780,10 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
expected_types: &Vec<Type<F, G>>,
left: Expression<F, G>,
right: Expression<F, G>,
) -> Result<(ConstrainedValue<F, G>, ConstrainedValue<F, G>), ExpressionError> {
expected_types: &Vec<Type<F>>,
left: Expression<F>,
right: Expression<F>,
) -> Result<(ConstrainedValue<F>, ConstrainedValue<F>), ExpressionError> {
let resolved_left = self.enforce_branch(
cs,
file_scope.clone(),
@ -807,9 +807,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
expected_types: &Vec<Type<F, G>>,
expression: Expression<F, G>,
) -> Result<ConstrainedValue<F, G>, ExpressionError> {
expected_types: &Vec<Type<F>>,
expression: Expression<F>,
) -> Result<ConstrainedValue<F>, ExpressionError> {
match expression {
// Variables
Expression::Identifier(unresolved_variable) => self.evaluate_identifier(
@ -822,7 +822,7 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
// Values
Expression::Integer(integer) => Ok(Self::get_integer_constant(integer)),
Expression::FieldElement(fe) => Ok(Self::get_field_element_constant(fe)),
Expression::GroupElement(gr) => Ok(ConstrainedValue::GroupElement(gr)),
Expression::Group(gr) => Ok(ConstrainedValue::Group(gr)),
Expression::Boolean(bool) => Ok(Self::get_boolean_constant(bool)),
Expression::Implicit(value) => Self::enforce_number_implicit(expected_types, value),

20
compiler/src/constraints/field_element.rs
View File

@ -8,18 +8,18 @@ use crate::{
use snarkos_errors::gadgets::SynthesisError;
use snarkos_models::{
curves::{Field, Group, PrimeField},
curves::{Field, PrimeField},
gadgets::r1cs::{ConstraintSystem, LinearCombination, Variable as R1CSVariable},
};
impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgram<F, G, CS> {
impl<F: Field + PrimeField, CS: ConstraintSystem<F>> ConstrainedProgram<F, CS> {
pub(crate) fn field_element_from_input(
&mut self,
cs: &mut CS,
name: String,
private: bool,
input_value: Option<InputValue<F, G>>,
) -> Result<ConstrainedValue<F, G>, FieldElementError> {
input_value: Option<InputValue<F>>,
) -> Result<ConstrainedValue<F>, FieldElementError> {
// Check that the parameter value is the correct type
let field_option = match input_value {
Some(input) => {
@ -51,7 +51,7 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
)))
}
pub(crate) fn get_field_element_constant(fe: FieldElement<F>) -> ConstrainedValue<F, G> {
pub(crate) fn get_field_element_constant(fe: FieldElement<F>) -> ConstrainedValue<F> {
ConstrainedValue::FieldElement(fe)
}
@ -124,7 +124,7 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
fe_1: FieldElement<F>,
fe_2: FieldElement<F>,
) -> Result<ConstrainedValue<F, G>, FieldElementError> {
) -> Result<ConstrainedValue<F>, FieldElementError> {
Ok(match (fe_1, fe_2) {
// if both constants, then return a constant result
(FieldElement::Constant(fe_1_constant), FieldElement::Constant(fe_2_constant)) => {
@ -201,7 +201,7 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
fe_1: FieldElement<F>,
fe_2: FieldElement<F>,
) -> Result<ConstrainedValue<F, G>, FieldElementError> {
) -> Result<ConstrainedValue<F>, FieldElementError> {
Ok(match (fe_1, fe_2) {
// if both constants, then return a constant result
(FieldElement::Constant(fe_1_constant), FieldElement::Constant(fe_2_constant)) => {
@ -278,7 +278,7 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
fe_1: FieldElement<F>,
fe_2: FieldElement<F>,
) -> Result<ConstrainedValue<F, G>, FieldElementError> {
) -> Result<ConstrainedValue<F>, FieldElementError> {
Ok(match (fe_1, fe_2) {
// if both constants, then return a constant result
(FieldElement::Constant(fe_1_constant), FieldElement::Constant(fe_2_constant)) => {
@ -355,7 +355,7 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
fe_1: FieldElement<F>,
fe_2: FieldElement<F>,
) -> Result<ConstrainedValue<F, G>, FieldElementError> {
) -> Result<ConstrainedValue<F>, FieldElementError> {
Ok(match (fe_1, fe_2) {
// if both constants, then return a constant result
(FieldElement::Constant(fe_1_constant), FieldElement::Constant(fe_2_constant)) => {
@ -443,7 +443,7 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
fe_1: FieldElement<F>,
num: Integer,
) -> Result<ConstrainedValue<F, G>, FieldElementError> {
) -> Result<ConstrainedValue<F>, FieldElementError> {
Ok(match fe_1 {
// if both constants, then return a constant result
FieldElement::Constant(fe_1_constant) => ConstrainedValue::FieldElement(

42
compiler/src/constraints/function.rs
View File

@ -8,11 +8,11 @@ use crate::{
};
use snarkos_models::{
curves::{Field, Group, PrimeField},
curves::{Field, PrimeField},
gadgets::r1cs::ConstraintSystem,
};
impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgram<F, G, CS> {
impl<F: Field + PrimeField, CS: ConstraintSystem<F>> ConstrainedProgram<F, CS> {
fn check_arguments_length(expected: usize, actual: usize) -> Result<(), FunctionError> {
// Make sure we are given the correct number of arguments
if expected != actual {
@ -28,9 +28,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
scope: String,
caller_scope: String,
function_name: String,
expected_types: Vec<Type<F, G>>,
input: Expression<F, G>,
) -> Result<ConstrainedValue<F, G>, FunctionError> {
expected_types: Vec<Type<F>>,
input: Expression<F>,
) -> Result<ConstrainedValue<F>, FunctionError> {
// Evaluate the function input value as pass by value from the caller or
// evaluate as an expression in the current function scope
match input {
@ -55,9 +55,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
scope: String,
caller_scope: String,
function: Function<F, G>,
inputs: Vec<Expression<F, G>>,
) -> Result<ConstrainedValue<F, G>, FunctionError> {
function: Function<F>,
inputs: Vec<Expression<F>>,
) -> Result<ConstrainedValue<F>, FunctionError> {
let function_name = new_scope(scope.clone(), function.get_name());
// Make sure we are given the correct number of inputs
@ -116,10 +116,10 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
name: String,
private: bool,
array_type: Type<F, G>,
array_type: Type<F>,
array_dimensions: Vec<usize>,
input_value: Option<InputValue<F, G>>,
) -> Result<ConstrainedValue<F, G>, FunctionError> {
input_value: Option<InputValue<F>>,
) -> Result<ConstrainedValue<F>, FunctionError> {
let expected_length = array_dimensions[0];
let mut array_value = vec![];
@ -168,11 +168,11 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
fn allocate_main_function_input(
&mut self,
cs: &mut CS,
_type: Type<F, G>,
_type: Type<F>,
name: String,
private: bool,
input_value: Option<InputValue<F, G>>,
) -> Result<ConstrainedValue<F, G>, FunctionError> {
input_value: Option<InputValue<F>>,
) -> Result<ConstrainedValue<F>, FunctionError> {
match _type {
Type::IntegerType(integer_type) => {
Ok(self.integer_from_parameter(cs, integer_type, name, private, input_value)?)
@ -180,9 +180,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
Type::FieldElement => {
Ok(self.field_element_from_input(cs, name, private, input_value)?)
}
Type::GroupElement => {
Ok(self.group_element_from_input(cs, name, private, input_value)?)
}
// Type::Group => {
// Ok(self.group_element_from_input(cs, name, private, input_value)?)
// }
Type::Boolean => Ok(self.bool_from_input(cs, name, private, input_value)?),
Type::Array(_type, dimensions) => {
self.allocate_array(cs, name, private, *_type, dimensions, input_value)
@ -195,9 +195,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
&mut self,
cs: &mut CS,
scope: String,
function: Function<F, G>,
inputs: Vec<Option<InputValue<F, G>>>,
) -> Result<ConstrainedValue<F, G>, FunctionError> {
function: Function<F>,
inputs: Vec<Option<InputValue<F>>>,
) -> Result<ConstrainedValue<F>, FunctionError> {
let function_name = new_scope(scope.clone(), function.get_name());
// Make sure we are given the correct number of inputs
@ -231,7 +231,7 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
pub(crate) fn resolve_definitions(
&mut self,
cs: &mut CS,
program: Program<F, G>,
program: Program<F>,
) -> Result<(), ImportError> {
let program_name = program.name.clone();

1
compiler/src/constraints/group.rs Normal file
View File

@ -0,0 +1 @@

67
compiler/src/constraints/group_element.rs
View File

@ -1,67 +0,0 @@
use crate::errors::GroupElementError;
use crate::{ConstrainedProgram, ConstrainedValue, InputValue};
use snarkos_models::{
curves::{Field, Group, PrimeField},
gadgets::{r1cs::ConstraintSystem, utilities::boolean::Boolean},
};
impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgram<F, G, CS> {
pub(crate) fn group_element_from_input(
&mut self,
_cs: &mut CS,
_name: String,
_private: bool,
input_value: Option<InputValue<F, G>>,
) -> Result<ConstrainedValue<F, G>, GroupElementError> {
// Check that the parameter value is the correct type
// let group_option = match input_value {
// Some(input) => {
// if let InputValue::Group(group) = input {
// Some(group)
// } else {
// return Err(GroupElementError::InvalidGroup(input.to_string()));
// }
// }
// None => None,
// };
//
// // Check visibility of parameter
// let group_value = if private {
// cs.alloc(
// || name,
// || group_option.ok_or(SynthesisError::AssignmentMissing),
// )?
// } else {
// cs.alloc_input(
// || name,
// || group_option.ok_or(SynthesisError::AssignmentMissing),
// )?
// };
//
// Ok(ConstrainedValue::GroupElement())
// TODO: use group gadget to allocate groups
if let Some(InputValue::Group(group)) = input_value {
return Ok(ConstrainedValue::GroupElement(group));
}
Ok(ConstrainedValue::GroupElement(G::default()))
}
pub fn evaluate_group_eq(group_element_1: G, group_element_2: G) -> ConstrainedValue<F, G> {
ConstrainedValue::Boolean(Boolean::constant(group_element_1.eq(&group_element_2)))
}
pub fn evaluate_group_add(group_element_1: G, group_element_2: G) -> ConstrainedValue<F, G> {
ConstrainedValue::GroupElement(group_element_1.add(&group_element_2))
}
pub fn evaluate_group_sub(group_element_1: G, group_element_2: G) -> ConstrainedValue<F, G> {
ConstrainedValue::GroupElement(group_element_1.sub(&group_element_2))
}
//
// pub fn evaluate_group_mul(group_element: G, scalar_field: G::ScalarField) -> ConstrainedValue<F, G> {
// ConstrainedValue::GroupElement(group_element.mul(&scalar_field))
// }
}

6
compiler/src/constraints/import.rs
View File

@ -9,18 +9,18 @@ use crate::{
use from_pest::FromPest;
use snarkos_models::{
curves::{Field, Group, PrimeField},
curves::{Field, PrimeField},
gadgets::r1cs::ConstraintSystem,
};
use std::env::current_dir;
use std::fs;
impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgram<F, G, CS> {
impl<F: Field + PrimeField, CS: ConstraintSystem<F>> ConstrainedProgram<F, CS> {
pub fn enforce_import(
&mut self,
cs: &mut CS,
scope: String,
import: Import<F, G>,
import: Import<F>,
) -> Result<(), ImportError> {
let path = current_dir().map_err(|error| ImportError::DirectoryError(error))?;

22
compiler/src/constraints/integer/integer.rs
View File

@ -9,7 +9,7 @@ use crate::{
use snarkos_errors::gadgets::SynthesisError;
use snarkos_models::{
curves::{Field, Group, PrimeField},
curves::{Field, PrimeField},
gadgets::{
r1cs::ConstraintSystem,
utilities::{
@ -73,15 +73,15 @@ impl<F: Field + PrimeField> CondSelectGadget<F> for Integer {
}
}
impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgram<F, G, CS> {
pub(crate) fn get_integer_constant(integer: Integer) -> ConstrainedValue<F, G> {
impl<F: Field + PrimeField, CS: ConstraintSystem<F>> ConstrainedProgram<F, CS> {
pub(crate) fn get_integer_constant(integer: Integer) -> ConstrainedValue<F> {
ConstrainedValue::Integer(integer)
}
pub(crate) fn evaluate_integer_eq(
left: Integer,
right: Integer,
) -> Result<ConstrainedValue<F, G>, IntegerError> {
) -> Result<ConstrainedValue<F>, IntegerError> {
Ok(ConstrainedValue::Boolean(Boolean::Constant(
match (left, right) {
(Integer::U8(left_u8), Integer::U8(right_u8)) => left_u8.eq(&right_u8),
@ -105,8 +105,8 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
integer_type: IntegerType,
name: String,
private: bool,
integer_value: Option<InputValue<F, G>>,
) -> Result<ConstrainedValue<F, G>, IntegerError> {
integer_value: Option<InputValue<F>>,
) -> Result<ConstrainedValue<F>, IntegerError> {
// Check that the input value is the correct type
let integer_option = match integer_value {
Some(input) => {
@ -162,7 +162,7 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
left: Integer,
right: Integer,
) -> Result<ConstrainedValue<F, G>, IntegerError> {
) -> Result<ConstrainedValue<F>, IntegerError> {
Ok(ConstrainedValue::Integer(match (left, right) {
(Integer::U8(left_u8), Integer::U8(right_u8)) => {
Integer::U8(Self::enforce_u8_add(cs, left_u8, right_u8)?)
@ -188,7 +188,7 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
left: Integer,
right: Integer,
) -> Result<ConstrainedValue<F, G>, IntegerError> {
) -> Result<ConstrainedValue<F>, IntegerError> {
Ok(ConstrainedValue::Integer(match (left, right) {
(Integer::U8(left_u8), Integer::U8(right_u8)) => {
Integer::U8(Self::enforce_u8_sub(cs, left_u8, right_u8)?)
@ -214,7 +214,7 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
left: Integer,
right: Integer,
) -> Result<ConstrainedValue<F, G>, IntegerError> {
) -> Result<ConstrainedValue<F>, IntegerError> {
Ok(ConstrainedValue::Integer(match (left, right) {
(Integer::U8(left_u8), Integer::U8(right_u8)) => {
Integer::U8(Self::enforce_u8_mul(cs, left_u8, right_u8)?)
@ -240,7 +240,7 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
left: Integer,
right: Integer,
) -> Result<ConstrainedValue<F, G>, IntegerError> {
) -> Result<ConstrainedValue<F>, IntegerError> {
Ok(ConstrainedValue::Integer(match (left, right) {
(Integer::U8(left_u8), Integer::U8(right_u8)) => {
Integer::U8(Self::enforce_u8_div(cs, left_u8, right_u8)?)
@ -266,7 +266,7 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
left: Integer,
right: Integer,
) -> Result<ConstrainedValue<F, G>, IntegerError> {
) -> Result<ConstrainedValue<F>, IntegerError> {
Ok(ConstrainedValue::Integer(match (left, right) {
(Integer::U8(left_u8), Integer::U8(right_u8)) => {
Integer::U8(Self::enforce_u8_pow(cs, left_u8, right_u8)?)

6
compiler/src/constraints/integer/uint128.rs
View File

@ -8,21 +8,21 @@ use crate::{
use snarkos_errors::gadgets::SynthesisError;
use snarkos_models::{
curves::{Field, Group, PrimeField},
curves::{Field, PrimeField},
gadgets::{
r1cs::ConstraintSystem,
utilities::{alloc::AllocGadget, eq::EqGadget, uint128::UInt128},
},
};
impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgram<F, G, CS> {
impl<F: Field + PrimeField, CS: ConstraintSystem<F>> ConstrainedProgram<F, CS> {
pub(crate) fn u128_from_input(
&mut self,
cs: &mut CS,
name: String,
private: bool,
integer_option: Option<usize>,
) -> Result<ConstrainedValue<F, G>, IntegerError> {
) -> Result<ConstrainedValue<F>, IntegerError> {
// Type cast to u128 in rust.
// If this fails should we return our own error?
let u128_option = integer_option.map(|integer| integer as u128);

6
compiler/src/constraints/integer/uint16.rs
View File

@ -8,21 +8,21 @@ use crate::{
use snarkos_errors::gadgets::SynthesisError;
use snarkos_models::{
curves::{Field, Group, PrimeField},
curves::{Field, PrimeField},
gadgets::{
r1cs::ConstraintSystem,
utilities::{alloc::AllocGadget, eq::EqGadget, uint16::UInt16},
},
};
impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgram<F, G, CS> {
impl<F: Field + PrimeField, CS: ConstraintSystem<F>> ConstrainedProgram<F, CS> {
pub(crate) fn u16_from_input(
&mut self,
cs: &mut CS,
name: String,
private: bool,
integer_option: Option<usize>,
) -> Result<ConstrainedValue<F, G>, IntegerError> {
) -> Result<ConstrainedValue<F>, IntegerError> {
// Type cast to u16 in rust.
// If this fails should we return our own error?
let u16_option = integer_option.map(|integer| integer as u16);

6
compiler/src/constraints/integer/uint32.rs
View File

@ -8,21 +8,21 @@ use crate::{
use snarkos_errors::gadgets::SynthesisError;
use snarkos_models::{
curves::{Field, Group, PrimeField},
curves::{Field, PrimeField},
gadgets::{
r1cs::ConstraintSystem,
utilities::{alloc::AllocGadget, eq::EqGadget, uint32::UInt32},
},
};
impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgram<F, G, CS> {
impl<F: Field + PrimeField, CS: ConstraintSystem<F>> ConstrainedProgram<F, CS> {
pub(crate) fn u32_from_input(
&mut self,
cs: &mut CS,
name: String,
private: bool,
integer_option: Option<usize>,
) -> Result<ConstrainedValue<F, G>, IntegerError> {
) -> Result<ConstrainedValue<F>, IntegerError> {
// Type cast to integers.u32 in rust.
// If this fails should we return our own error?
let u32_option = integer_option.map(|integer| integer as u32);

6
compiler/src/constraints/integer/uint64.rs
View File

@ -8,21 +8,21 @@ use crate::{
use snarkos_errors::gadgets::SynthesisError;
use snarkos_models::{
curves::{Field, Group, PrimeField},
curves::{Field, PrimeField},
gadgets::{
r1cs::ConstraintSystem,
utilities::{alloc::AllocGadget, eq::EqGadget, uint64::UInt64},
},
};
impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgram<F, G, CS> {
impl<F: Field + PrimeField, CS: ConstraintSystem<F>> ConstrainedProgram<F, CS> {
pub(crate) fn u64_from_input(
&mut self,
cs: &mut CS,
name: String,
private: bool,
integer_option: Option<usize>,
) -> Result<ConstrainedValue<F, G>, IntegerError> {
) -> Result<ConstrainedValue<F>, IntegerError> {
// Type cast to u64 in rust.
// If this fails should we return our own error?
let u64_option = integer_option.map(|integer| integer as u64);

6
compiler/src/constraints/integer/uint8.rs
View File

@ -8,21 +8,21 @@ use crate::{
use snarkos_errors::gadgets::SynthesisError;
use snarkos_models::{
curves::{Field, Group, PrimeField},
curves::{Field, PrimeField},
gadgets::{
r1cs::ConstraintSystem,
utilities::{alloc::AllocGadget, eq::EqGadget, uint8::UInt8},
},
};
impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgram<F, G, CS> {
impl<F: Field + PrimeField, CS: ConstraintSystem<F>> ConstrainedProgram<F, CS> {
pub(crate) fn u8_from_input(
&mut self,
cs: &mut CS,
name: String,
private: bool,
integer_option: Option<usize>,
) -> Result<ConstrainedValue<F, G>, IntegerError> {
) -> Result<ConstrainedValue<F>, IntegerError> {
// Type cast to u8 in rust.
// If this fails should we return our own error?
let u8_option = integer_option.map(|integer| integer as u8);

14
compiler/src/constraints/mod.rs
View File

@ -18,8 +18,8 @@ pub use integer::*;
pub mod field_element;
pub use field_element::*;
pub mod group_element;
pub use group_element::*;
pub mod group;
pub use group::*;
pub mod program;
pub use program::*;
@ -36,15 +36,15 @@ use crate::{
};
use snarkos_models::{
curves::{Field, Group, PrimeField},
curves::{Field, PrimeField},
gadgets::r1cs::ConstraintSystem,
};
pub fn generate_constraints<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>>(
pub fn generate_constraints<F: Field + PrimeField, CS: ConstraintSystem<F>>(
cs: &mut CS,
program: Program<F, G>,
parameters: Vec<Option<InputValue<F, G>>>,
) -> Result<ConstrainedValue<F, G>, CompilerError> {
program: Program<F>,
parameters: Vec<Option<InputValue<F>>>,
) -> Result<ConstrainedValue<F>, CompilerError> {
let mut resolved_program = ConstrainedProgram::new();
let program_name = program.get_name();
let main_function_name = new_scope(program_name.clone(), "main".into());

14
compiler/src/constraints/program.rs
View File

@ -3,13 +3,13 @@
use crate::constraints::ConstrainedValue;
use snarkos_models::{
curves::{Field, Group, PrimeField},
curves::{Field, PrimeField},
gadgets::r1cs::ConstraintSystem,
};
use std::{collections::HashMap, marker::PhantomData};
pub struct ConstrainedProgram<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> {
pub identifiers: HashMap<String, ConstrainedValue<F, G>>,
pub struct ConstrainedProgram<F: Field + PrimeField, CS: ConstraintSystem<F>> {
pub identifiers: HashMap<String, ConstrainedValue<F>>,
pub _cs: PhantomData<CS>,
}
@ -17,7 +17,7 @@ pub fn new_scope(outer: String, inner: String) -> String {
format!("{}_{}", outer, inner)
}
impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgram<F, G, CS> {
impl<F: Field + PrimeField, CS: ConstraintSystem<F>> ConstrainedProgram<F, CS> {
pub fn new() -> Self {
Self {
identifiers: HashMap::new(),
@ -25,15 +25,15 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
}
}
pub(crate) fn store(&mut self, name: String, value: ConstrainedValue<F, G>) {
pub(crate) fn store(&mut self, name: String, value: ConstrainedValue<F>) {
self.identifiers.insert(name, value);
}
pub(crate) fn get(&self, name: &String) -> Option<&ConstrainedValue<F, G>> {
pub(crate) fn get(&self, name: &String) -> Option<&ConstrainedValue<F>> {
self.identifiers.get(name)
}
pub(crate) fn get_mut(&mut self, name: &String) -> Option<&mut ConstrainedValue<F, G>> {
pub(crate) fn get_mut(&mut self, name: &String) -> Option<&mut ConstrainedValue<F>> {
self.identifiers.get_mut(name)
}
}

68
compiler/src/constraints/statement.rs
View File

@ -12,12 +12,12 @@ use crate::{
};
use snarkos_models::{
curves::{Field, Group, PrimeField},
curves::{Field, PrimeField},
gadgets::{r1cs::ConstraintSystem, utilities::boolean::Boolean, utilities::uint32::UInt32},
};
impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgram<F, G, CS> {
fn resolve_assignee(&mut self, scope: String, assignee: Assignee<F, G>) -> String {
impl<F: Field + PrimeField, CS: ConstraintSystem<F>> ConstrainedProgram<F, CS> {
fn resolve_assignee(&mut self, scope: String, assignee: Assignee<F>) -> String {
match assignee {
Assignee::Identifier(name) => new_scope(scope, name.to_string()),
Assignee::Array(array, _index) => self.resolve_assignee(scope, *array),
@ -30,7 +30,7 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
fn get_mutable_assignee(
&mut self,
name: String,
) -> Result<&mut ConstrainedValue<F, G>, StatementError> {
) -> Result<&mut ConstrainedValue<F>, StatementError> {
// Check that assignee exists and is mutable
Ok(match self.get_mut(&name) {
Some(value) => match value {
@ -47,8 +47,8 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
file_scope: String,
function_scope: String,
name: String,
range_or_expression: RangeOrExpression<F, G>,
new_value: ConstrainedValue<F, G>,
range_or_expression: RangeOrExpression<F>,
new_value: ConstrainedValue<F>,
) -> Result<(), StatementError> {
// Resolve index so we know if we are assigning to a single value or a range of values
match range_or_expression {
@ -91,8 +91,8 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
fn mutute_circuit_field(
&mut self,
circuit_name: String,
object_name: Identifier<F, G>,
new_value: ConstrainedValue<F, G>,
object_name: Identifier<F>,
new_value: ConstrainedValue<F>,
) -> Result<(), StatementError> {
match self.get_mutable_assignee(circuit_name)? {
ConstrainedValue::CircuitExpression(_variable, members) => {
@ -129,8 +129,8 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
assignee: Assignee<F, G>,
expression: Expression<F, G>,
assignee: Assignee<F>,
expression: Expression<F>,
) -> Result<(), StatementError> {
// Get the name of the variable we are assigning to
let variable_name = self.resolve_assignee(function_scope.clone(), assignee.clone());
@ -170,8 +170,8 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
fn store_definition(
&mut self,
function_scope: String,
variable: Variable<F, G>,
mut value: ConstrainedValue<F, G>,
variable: Variable<F>,
mut value: ConstrainedValue<F>,
) -> Result<(), StatementError> {
// Store with given mutability
if variable.mutable {
@ -190,8 +190,8 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
variable: Variable<F, G>,
expression: Expression<F, G>,
variable: Variable<F>,
expression: Expression<F>,
) -> Result<(), StatementError> {
let mut expected_types = vec![];
if let Some(ref _type) = variable._type {
@ -213,8 +213,8 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
variables: Vec<Variable<F, G>>,
function: Expression<F, G>,
variables: Vec<Variable<F>>,
function: Expression<F>,
) -> Result<(), StatementError> {
let mut expected_types = vec![];
for variable in variables.iter() {
@ -256,9 +256,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
expressions: Vec<Expression<F, G>>,
return_types: Vec<Type<F, G>>,
) -> Result<ConstrainedValue<F, G>, StatementError> {
expressions: Vec<Expression<F>>,
return_types: Vec<Type<F>>,
) -> Result<ConstrainedValue<F>, StatementError> {
// Make sure we return the correct number of values
if return_types.len() != expressions.len() {
return Err(StatementError::InvalidNumberOfReturns(
@ -289,9 +289,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
statements: Vec<Statement<F, G>>,
return_types: Vec<Type<F, G>>,
) -> Result<Option<ConstrainedValue<F, G>>, StatementError> {
statements: Vec<Statement<F>>,
return_types: Vec<Type<F>>,
) -> Result<Option<ConstrainedValue<F>>, StatementError> {
let mut res = None;
// Evaluate statements and possibly return early
for statement in statements.iter() {
@ -315,9 +315,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
statement: ConditionalStatement<F, G>,
return_types: Vec<Type<F, G>>,
) -> Result<Option<ConstrainedValue<F, G>>, StatementError> {
statement: ConditionalStatement<F>,
return_types: Vec<Type<F>>,
) -> Result<Option<ConstrainedValue<F>>, StatementError> {
let expected_types = vec![Type::Boolean];
let condition = match self.enforce_expression(
cs,
@ -367,12 +367,12 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
index: Identifier<F, G>,
index: Identifier<F>,
start: Integer,
stop: Integer,
statements: Vec<Statement<F, G>>,
return_types: Vec<Type<F, G>>,
) -> Result<Option<ConstrainedValue<F, G>>, StatementError> {
statements: Vec<Statement<F>>,
return_types: Vec<Type<F>>,
) -> Result<Option<ConstrainedValue<F>>, StatementError> {
let mut res = None;
for i in start.to_usize()..stop.to_usize() {
@ -403,8 +403,8 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
fn enforce_assert_eq_statement(
&mut self,
cs: &mut CS,
left: ConstrainedValue<F, G>,
right: ConstrainedValue<F, G>,
left: ConstrainedValue<F>,
right: ConstrainedValue<F>,
) -> Result<(), StatementError> {
Ok(match (left, right) {
(ConstrainedValue::Boolean(bool_1), ConstrainedValue::Boolean(bool_2)) => {
@ -440,9 +440,9 @@ impl<F: Field + PrimeField, G: Group, CS: ConstraintSystem<F>> ConstrainedProgra
cs: &mut CS,
file_scope: String,
function_scope: String,
statement: Statement<F, G>,
return_types: Vec<Type<F, G>>,
) -> Result<Option<ConstrainedValue<F, G>>, StatementError> {
statement: Statement<F>,
return_types: Vec<Type<F>>,
) -> Result<Option<ConstrainedValue<F>>, StatementError> {
let mut res = None;
match statement {
Statement::Return(expressions) => {

52
compiler/src/constraints/value.rs
View File

@ -6,7 +6,7 @@ use crate::{
};
use snarkos_models::{
curves::{Field, Group, PrimeField},
curves::{Field, PrimeField},
gadgets::utilities::{
boolean::Boolean, uint128::UInt128, uint16::UInt16, uint32::UInt32, uint64::UInt64,
uint8::UInt8,
@ -15,42 +15,42 @@ use snarkos_models::{
use std::fmt;
#[derive(Clone, PartialEq, Eq)]
pub struct ConstrainedCircuitMember<F: Field + PrimeField, G: Group>(
pub Identifier<F, G>,
pub ConstrainedValue<F, G>,
pub struct ConstrainedCircuitMember<F: Field + PrimeField>(
pub Identifier<F>,
pub ConstrainedValue<F>,
);
#[derive(Clone, PartialEq, Eq)]
pub enum ConstrainedValue<F: Field + PrimeField, G: Group> {
pub enum ConstrainedValue<F: Field + PrimeField> {
Integer(Integer),
FieldElement(FieldElement<F>),
GroupElement(G),
Group(String),
Boolean(Boolean),
Array(Vec<ConstrainedValue<F, G>>),
Array(Vec<ConstrainedValue<F>>),
CircuitDefinition(Circuit<F, G>),
CircuitExpression(Identifier<F, G>, Vec<ConstrainedCircuitMember<F, G>>),
CircuitDefinition(Circuit<F>),
CircuitExpression(Identifier<F>, Vec<ConstrainedCircuitMember<F>>),
Function(Option<Identifier<F, G>>, Function<F, G>), // (optional circuit identifier, function definition)
Return(Vec<ConstrainedValue<F, G>>),
Function(Option<Identifier<F>>, Function<F>), // (optional circuit identifier, function definition)
Return(Vec<ConstrainedValue<F>>),
Mutable(Box<ConstrainedValue<F, G>>),
Static(Box<ConstrainedValue<F, G>>),
Mutable(Box<ConstrainedValue<F>>),
Static(Box<ConstrainedValue<F>>),
Unresolved(String),
}
impl<F: Field + PrimeField, G: Group> ConstrainedValue<F, G> {
impl<F: Field + PrimeField> ConstrainedValue<F> {
pub(crate) fn from_other(
value: String,
other: &ConstrainedValue<F, G>,
other: &ConstrainedValue<F>,
) -> Result<Self, ValueError> {
let other_type = other.to_type();
ConstrainedValue::from_type(value, &other_type)
}
pub(crate) fn from_type(value: String, _type: &Type<F, G>) -> Result<Self, ValueError> {
pub(crate) fn from_type(value: String, _type: &Type<F>) -> Result<Self, ValueError> {
match _type {
Type::IntegerType(integer_type) => Ok(ConstrainedValue::Integer(match integer_type {
IntegerType::U8 => Integer::U8(UInt8::constant(value.parse::<u8>()?)),
@ -62,13 +62,7 @@ impl<F: Field + PrimeField, G: Group> ConstrainedValue<F, G> {
Type::FieldElement => Ok(ConstrainedValue::FieldElement(FieldElement::Constant(
F::from_str(&value).unwrap_or_default(),
))),
Type::GroupElement => Ok(ConstrainedValue::GroupElement({
use std::str::FromStr;
let scalar = G::ScalarField::from_str(&value).unwrap_or_default();
let point = G::default().mul(&scalar);
point
})),
Type::Group => Ok(ConstrainedValue::Group(value)),
Type::Boolean => Ok(ConstrainedValue::Boolean(Boolean::Constant(
value.parse::<bool>()?,
))),
@ -77,17 +71,17 @@ impl<F: Field + PrimeField, G: Group> ConstrainedValue<F, G> {
}
}
pub(crate) fn to_type(&self) -> Type<F, G> {
pub(crate) fn to_type(&self) -> Type<F> {
match self {
ConstrainedValue::Integer(integer) => Type::IntegerType(integer.get_type()),
ConstrainedValue::FieldElement(_field) => Type::FieldElement,
ConstrainedValue::GroupElement(_group) => Type::GroupElement,
ConstrainedValue::Group(_group) => Type::Group,
ConstrainedValue::Boolean(_bool) => Type::Boolean,
_ => unimplemented!("to type only implemented for primitives"),
}
}
pub(crate) fn resolve_type(&mut self, types: &Vec<Type<F, G>>) -> Result<(), ValueError> {
pub(crate) fn resolve_type(&mut self, types: &Vec<Type<F>>) -> Result<(), ValueError> {
if let ConstrainedValue::Unresolved(ref string) = self {
if !types.is_empty() {
*self = ConstrainedValue::from_type(string.clone(), &types[0])?
@ -104,12 +98,12 @@ impl<F: Field + PrimeField, G: Group> ConstrainedValue<F, G> {
}
}
impl<F: Field + PrimeField, G: Group> fmt::Display for ConstrainedValue<F, G> {
impl<F: Field + PrimeField> fmt::Display for ConstrainedValue<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
ConstrainedValue::Integer(ref value) => write!(f, "{}", value),
ConstrainedValue::FieldElement(ref value) => write!(f, "{}", value),
ConstrainedValue::GroupElement(ref value) => write!(f, "{}", value),
ConstrainedValue::Group(ref value) => write!(f, "{}", value),
ConstrainedValue::Boolean(ref value) => write!(f, "{}", value.get_value().unwrap()),
ConstrainedValue::Array(ref array) => {
write!(f, "[")?;
@ -154,7 +148,7 @@ impl<F: Field + PrimeField, G: Group> fmt::Display for ConstrainedValue<F, G> {
}
}
impl<F: Field + PrimeField, G: Group> fmt::Debug for ConstrainedValue<F, G> {
impl<F: Field + PrimeField> fmt::Debug for ConstrainedValue<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", self)
}

12
compiler/src/errors/constraints/function.rs
View File

@ -1,6 +1,6 @@
use crate::errors::{
BooleanError, ExpressionError, FieldElementError, GroupElementError, IntegerError,
StatementError, ValueError,
BooleanError, ExpressionError, FieldElementError, GroupError, IntegerError, StatementError,
ValueError,
};
#[derive(Debug, Error)]
@ -30,7 +30,7 @@ pub enum FunctionError {
FieldElementError(FieldElementError),
#[error("{}", _0)]
GroupElementError(GroupElementError),
GroupError(GroupError),
#[error("{}", _0)]
BooleanError(BooleanError),
@ -60,9 +60,9 @@ impl From<FieldElementError> for FunctionError {
}
}
impl From<GroupElementError> for FunctionError {
fn from(error: GroupElementError) -> Self {
FunctionError::GroupElementError(error)
impl From<GroupError> for FunctionError {
fn from(error: GroupError) -> Self {
FunctionError::GroupError(error)
}
}

6
compiler/src/errors/constraints/group_element.rs → compiler/src/errors/constraints/group.rs
View File

@ -1,7 +1,7 @@
use snarkos_errors::gadgets::SynthesisError;
#[derive(Debug, Error)]
pub enum GroupElementError {
pub enum GroupError {
#[error("Expected group element parameter, got {}", _0)]
InvalidGroup(String),
@ -9,8 +9,8 @@ pub enum GroupElementError {
SynthesisError(SynthesisError),
}
impl From<SynthesisError> for GroupElementError {
impl From<SynthesisError> for GroupError {
fn from(error: SynthesisError) -> Self {
GroupElementError::SynthesisError(error)
GroupError::SynthesisError(error)
}
}

4
compiler/src/errors/constraints/mod.rs
View File

@ -18,8 +18,8 @@ pub use integer::*;
pub mod field_element;
pub use field_element::*;
pub mod group_element;
pub use group_element::*;
pub mod group;
pub use group::*;
pub mod value;
pub use value::*;

22
compiler/src/imports.rs
View File

@ -2,23 +2,23 @@
use crate::Identifier;
use snarkos_models::curves::{Field, Group, PrimeField};
use snarkos_models::curves::{Field, PrimeField};
use std::fmt;
#[derive(Clone)]
pub struct ImportSymbol<F: Field + PrimeField, G: Group> {
pub symbol: Identifier<F, G>,
pub alias: Option<Identifier<F, G>>,
pub struct ImportSymbol<F: Field + PrimeField> {
pub symbol: Identifier<F>,
pub alias: Option<Identifier<F>>,
}
#[derive(Clone)]
pub struct Import<F: Field + PrimeField, G: Group> {
pub struct Import<F: Field + PrimeField> {
pub path_string: String,
pub symbols: Vec<ImportSymbol<F, G>>,
pub symbols: Vec<ImportSymbol<F>>,
}
impl<F: Field + PrimeField, G: Group> Import<F, G> {
pub fn new(source: String, symbols: Vec<ImportSymbol<F, G>>) -> Import<F, G> {
impl<F: Field + PrimeField> Import<F> {
pub fn new(source: String, symbols: Vec<ImportSymbol<F>>) -> Import<F> {
Import {
path_string: source,
symbols,
@ -51,7 +51,7 @@ impl<F: Field + PrimeField, G: Group> Import<F, G> {
}
}
impl<F: Field + PrimeField, G: Group> fmt::Display for ImportSymbol<F, G> {
impl<F: Field + PrimeField> fmt::Display for ImportSymbol<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
if self.alias.is_some() {
write!(f, "\t{} as {}", self.symbol, self.alias.as_ref().unwrap())
@ -61,13 +61,13 @@ impl<F: Field + PrimeField, G: Group> fmt::Display for ImportSymbol<F, G> {
}
}
impl<'ast, F: Field + PrimeField, G: Group> fmt::Display for Import<F, G> {
impl<'ast, F: Field + PrimeField> fmt::Display for Import<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.format(f)
}
}
impl<'ast, F: Field + PrimeField, G: Group> fmt::Debug for Import<F, G> {
impl<'ast, F: Field + PrimeField> fmt::Debug for Import<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.format(f)
}

178
compiler/src/types.rs
View File

@ -3,7 +3,7 @@
use crate::Import;
use snarkos_models::curves::{Field, Group, PrimeField};
use snarkos_models::curves::{Field, PrimeField};
use snarkos_models::gadgets::{
r1cs::Variable as R1CSVariable,
utilities::{
@ -16,17 +16,15 @@ use std::marker::PhantomData;
/// An identifier in the constrained program.
#[derive(Clone, PartialEq, Eq, Hash)]
pub struct Identifier<F: Field + PrimeField, G: Group> {
pub struct Identifier<F: Field + PrimeField> {
pub name: String,
pub(crate) _group: PhantomData<G>,
pub(crate) _engine: PhantomData<F>,
}
impl<F: Field + PrimeField, G: Group> Identifier<F, G> {
impl<F: Field + PrimeField> Identifier<F> {
pub fn new(name: String) -> Self {
Self {
name,
_group: PhantomData::<G>,
_engine: PhantomData::<F>,
}
}
@ -38,10 +36,10 @@ impl<F: Field + PrimeField, G: Group> Identifier<F, G> {
/// A variable that is assigned to a value in the constrained program
#[derive(Clone, PartialEq, Eq)]
pub struct Variable<F: Field + PrimeField, G: Group> {
pub identifier: Identifier<F, G>,
pub struct Variable<F: Field + PrimeField> {
pub identifier: Identifier<F>,
pub mutable: bool,
pub _type: Option<Type<F, G>>,
pub _type: Option<Type<F>>,
}
/// An integer type enum wrapping the integer value. Used only in expressions.
@ -63,74 +61,70 @@ pub enum FieldElement<F: Field + PrimeField> {
/// Range or expression enum
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum RangeOrExpression<F: Field + PrimeField, G: Group> {
pub enum RangeOrExpression<F: Field + PrimeField> {
Range(Option<Integer>, Option<Integer>),
Expression(Expression<F, G>),
Expression(Expression<F>),
}
/// Spread or expression
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum SpreadOrExpression<F: Field + PrimeField, G: Group> {
Spread(Expression<F, G>),
Expression(Expression<F, G>),
pub enum SpreadOrExpression<F: Field + PrimeField> {
Spread(Expression<F>),
Expression(Expression<F>),
}
/// Expression that evaluates to a value
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum Expression<F: Field + PrimeField, G: Group> {
pub enum Expression<F: Field + PrimeField> {
// Identifier
Identifier(Identifier<F, G>),
Identifier(Identifier<F>),
// Values
Integer(Integer),
FieldElement(FieldElement<F>),
GroupElement(G),
Group(String),
Boolean(Boolean),
Implicit(String),
// Number operations
Add(Box<Expression<F, G>>, Box<Expression<F, G>>),
Sub(Box<Expression<F, G>>, Box<Expression<F, G>>),
Mul(Box<Expression<F, G>>, Box<Expression<F, G>>),
Div(Box<Expression<F, G>>, Box<Expression<F, G>>),
Pow(Box<Expression<F, G>>, Box<Expression<F, G>>),
Add(Box<Expression<F>>, Box<Expression<F>>),
Sub(Box<Expression<F>>, Box<Expression<F>>),
Mul(Box<Expression<F>>, Box<Expression<F>>),
Div(Box<Expression<F>>, Box<Expression<F>>),
Pow(Box<Expression<F>>, Box<Expression<F>>),
// Boolean operations
Not(Box<Expression<F, G>>),
Or(Box<Expression<F, G>>, Box<Expression<F, G>>),
And(Box<Expression<F, G>>, Box<Expression<F, G>>),
Eq(Box<Expression<F, G>>, Box<Expression<F, G>>),
Geq(Box<Expression<F, G>>, Box<Expression<F, G>>),
Gt(Box<Expression<F, G>>, Box<Expression<F, G>>),
Leq(Box<Expression<F, G>>, Box<Expression<F, G>>),
Lt(Box<Expression<F, G>>, Box<Expression<F, G>>),
Not(Box<Expression<F>>),
Or(Box<Expression<F>>, Box<Expression<F>>),
And(Box<Expression<F>>, Box<Expression<F>>),
Eq(Box<Expression<F>>, Box<Expression<F>>),
Geq(Box<Expression<F>>, Box<Expression<F>>),
Gt(Box<Expression<F>>, Box<Expression<F>>),
Leq(Box<Expression<F>>, Box<Expression<F>>),
Lt(Box<Expression<F>>, Box<Expression<F>>),
// Conditionals
IfElse(
Box<Expression<F, G>>,
Box<Expression<F, G>>,
Box<Expression<F, G>>,
),
IfElse(Box<Expression<F>>, Box<Expression<F>>, Box<Expression<F>>),
// Arrays
Array(Vec<Box<SpreadOrExpression<F, G>>>),
ArrayAccess(Box<Expression<F, G>>, Box<RangeOrExpression<F, G>>), // (array name, range)
Array(Vec<Box<SpreadOrExpression<F>>>),
ArrayAccess(Box<Expression<F>>, Box<RangeOrExpression<F>>), // (array name, range)
// Circuits
Circuit(Identifier<F, G>, Vec<CircuitFieldDefinition<F, G>>),
CircuitMemberAccess(Box<Expression<F, G>>, Identifier<F, G>), // (declared circuit name, circuit member name)
CircuitStaticFunctionAccess(Box<Expression<F, G>>, Identifier<F, G>), // (defined circuit name, circuit static member name)
Circuit(Identifier<F>, Vec<CircuitFieldDefinition<F>>),
CircuitMemberAccess(Box<Expression<F>>, Identifier<F>), // (declared circuit name, circuit member name)
CircuitStaticFunctionAccess(Box<Expression<F>>, Identifier<F>), // (defined circuit name, circuit static member name)
// Functions
FunctionCall(Box<Expression<F, G>>, Vec<Expression<F, G>>),
FunctionCall(Box<Expression<F>>, Vec<Expression<F>>),
}
/// Definition assignee: v, arr[0..2], Point p.x
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum Assignee<F: Field + PrimeField, G: Group> {
Identifier(Identifier<F, G>),
Array(Box<Assignee<F, G>>, RangeOrExpression<F, G>),
CircuitField(Box<Assignee<F, G>>, Identifier<F, G>), // (circuit name, circuit field name)
pub enum Assignee<F: Field + PrimeField> {
Identifier(Identifier<F>),
Array(Box<Assignee<F>>, RangeOrExpression<F>),
CircuitField(Box<Assignee<F>>, Identifier<F>), // (circuit name, circuit field name)
}
/// Explicit integer type
@ -145,17 +139,17 @@ pub enum IntegerType {
/// Explicit type used for defining a variable or expression type
#[derive(Clone, Debug, PartialEq, Eq)]
pub enum Type<F: Field + PrimeField, G: Group> {
pub enum Type<F: Field + PrimeField> {
IntegerType(IntegerType),
FieldElement,
GroupElement,
Group,
Boolean,
Array(Box<Type<F, G>>, Vec<usize>),
Circuit(Identifier<F, G>),
Array(Box<Type<F>>, Vec<usize>),
Circuit(Identifier<F>),
SelfType,
}
impl<F: Field + PrimeField, G: Group> Type<F, G> {
impl<F: Field + PrimeField> Type<F> {
pub fn outer_dimension(&self, dimensions: &Vec<usize>) -> Self {
let _type = self.clone();
@ -184,79 +178,79 @@ impl<F: Field + PrimeField, G: Group> Type<F, G> {
}
#[derive(Clone, PartialEq, Eq)]
pub enum ConditionalNestedOrEnd<F: Field + PrimeField, G: Group> {
Nested(Box<ConditionalStatement<F, G>>),
End(Vec<Statement<F, G>>),
pub enum ConditionalNestedOrEnd<F: Field + PrimeField> {
Nested(Box<ConditionalStatement<F>>),
End(Vec<Statement<F>>),
}
#[derive(Clone, PartialEq, Eq)]
pub struct ConditionalStatement<F: Field + PrimeField, G: Group> {
pub condition: Expression<F, G>,
pub statements: Vec<Statement<F, G>>,
pub next: Option<ConditionalNestedOrEnd<F, G>>,
pub struct ConditionalStatement<F: Field + PrimeField> {
pub condition: Expression<F>,
pub statements: Vec<Statement<F>>,
pub next: Option<ConditionalNestedOrEnd<F>>,
}
/// Program statement that defines some action (or expression) to be carried out.
#[derive(Clone, PartialEq, Eq)]
pub enum Statement<F: Field + PrimeField, G: Group> {
Return(Vec<Expression<F, G>>),
Definition(Variable<F, G>, Expression<F, G>),
Assign(Assignee<F, G>, Expression<F, G>),
MultipleAssign(Vec<Variable<F, G>>, Expression<F, G>),
Conditional(ConditionalStatement<F, G>),
For(Identifier<F, G>, Integer, Integer, Vec<Statement<F, G>>),
AssertEq(Expression<F, G>, Expression<F, G>),
Expression(Expression<F, G>),
pub enum Statement<F: Field + PrimeField> {
Return(Vec<Expression<F>>),
Definition(Variable<F>, Expression<F>),
Assign(Assignee<F>, Expression<F>),
MultipleAssign(Vec<Variable<F>>, Expression<F>),
Conditional(ConditionalStatement<F>),
For(Identifier<F>, Integer, Integer, Vec<Statement<F>>),
AssertEq(Expression<F>, Expression<F>),
Expression(Expression<F>),
}
/// Circuits
#[derive(Clone, Debug, PartialEq, Eq)]
pub struct CircuitFieldDefinition<F: Field + PrimeField, G: Group> {
pub identifier: Identifier<F, G>,
pub expression: Expression<F, G>,
pub struct CircuitFieldDefinition<F: Field + PrimeField> {
pub identifier: Identifier<F>,
pub expression: Expression<F>,
}
#[derive(Clone, PartialEq, Eq)]
pub enum CircuitMember<F: Field + PrimeField, G: Group> {
CircuitField(Identifier<F, G>, Type<F, G>),
CircuitFunction(bool, Function<F, G>),
pub enum CircuitMember<F: Field + PrimeField> {
CircuitField(Identifier<F>, Type<F>),
CircuitFunction(bool, Function<F>),
}
#[derive(Clone, PartialEq, Eq)]
pub struct Circuit<F: Field + PrimeField, G: Group> {
pub identifier: Identifier<F, G>,
pub members: Vec<CircuitMember<F, G>>,
pub struct Circuit<F: Field + PrimeField> {
pub identifier: Identifier<F>,
pub members: Vec<CircuitMember<F>>,
}
/// Function parameters
#[derive(Clone, PartialEq, Eq)]
pub struct InputModel<F: Field + PrimeField, G: Group> {
pub identifier: Identifier<F, G>,
pub struct InputModel<F: Field + PrimeField> {
pub identifier: Identifier<F>,
pub mutable: bool,
pub private: bool,
pub _type: Type<F, G>,
pub _type: Type<F>,
}
#[derive(Clone, PartialEq, Eq)]
pub enum InputValue<F: Field + PrimeField, G: Group> {
pub enum InputValue<F: Field + PrimeField> {
Integer(usize),
Field(F),
Group(G),
Group(String),
Boolean(bool),
Array(Vec<InputValue<F, G>>),
Array(Vec<InputValue<F>>),
}
#[derive(Clone, PartialEq, Eq)]
pub struct Function<F: Field + PrimeField, G: Group> {
pub function_name: Identifier<F, G>,
pub inputs: Vec<InputModel<F, G>>,
pub returns: Vec<Type<F, G>>,
pub statements: Vec<Statement<F, G>>,
pub struct Function<F: Field + PrimeField> {
pub function_name: Identifier<F>,
pub inputs: Vec<InputModel<F>>,
pub returns: Vec<Type<F>>,
pub statements: Vec<Statement<F>>,
}
impl<F: Field + PrimeField, G: Group> Function<F, G> {
impl<F: Field + PrimeField> Function<F> {
pub fn get_name(&self) -> String {
self.function_name.name.clone()
}
@ -264,15 +258,15 @@ impl<F: Field + PrimeField, G: Group> Function<F, G> {
/// A simple program with statement expressions, program arguments and program returns.
#[derive(Debug, Clone)]
pub struct Program<F: Field + PrimeField, G: Group> {
pub name: Identifier<F, G>,
pub struct Program<F: Field + PrimeField> {
pub name: Identifier<F>,
pub num_parameters: usize,
pub imports: Vec<Import<F, G>>,
pub circuits: HashMap<Identifier<F, G>, Circuit<F, G>>,
pub functions: HashMap<Identifier<F, G>, Function<F, G>>,
pub imports: Vec<Import<F>>,
pub circuits: HashMap<Identifier<F>, Circuit<F>>,
pub functions: HashMap<Identifier<F>, Function<F>>,
}
impl<'ast, F: Field + PrimeField, G: Group> Program<F, G> {
impl<'ast, F: Field + PrimeField> Program<F> {
pub fn new() -> Self {
Self {
name: Identifier::new("".into()),

46
compiler/src/types_display.rs
View File

@ -6,21 +6,21 @@ use crate::{
RangeOrExpression, SpreadOrExpression, Statement, Type, Variable,
};
use snarkos_models::curves::{Field, Group, PrimeField};
use snarkos_models::curves::{Field, PrimeField};
use std::fmt;
impl<F: Field + PrimeField, G: Group> fmt::Display for Identifier<F, G> {
impl<F: Field + PrimeField> fmt::Display for Identifier<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", self.name)
}
}
impl<F: Field + PrimeField, G: Group> fmt::Debug for Identifier<F, G> {
impl<F: Field + PrimeField> fmt::Debug for Identifier<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}", self.name)
}
}
impl<F: Field + PrimeField, G: Group> fmt::Display for Variable<F, G> {
impl<F: Field + PrimeField> fmt::Display for Variable<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
if self.mutable {
write!(f, "mut ")?;
@ -69,7 +69,7 @@ impl<F: Field + PrimeField> fmt::Debug for FieldElement<F> {
}
}
impl<'ast, F: Field + PrimeField, G: Group> fmt::Display for RangeOrExpression<F, G> {
impl<'ast, F: Field + PrimeField> fmt::Display for RangeOrExpression<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
RangeOrExpression::Range(ref from, ref to) => write!(
@ -87,7 +87,7 @@ impl<'ast, F: Field + PrimeField, G: Group> fmt::Display for RangeOrExpression<F
}
}
impl<F: Field + PrimeField, G: Group> fmt::Display for SpreadOrExpression<F, G> {
impl<F: Field + PrimeField> fmt::Display for SpreadOrExpression<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
SpreadOrExpression::Spread(ref spread) => write!(f, "...{}", spread),
@ -96,7 +96,7 @@ impl<F: Field + PrimeField, G: Group> fmt::Display for SpreadOrExpression<F, G>
}
}
impl<'ast, F: Field + PrimeField, G: Group> fmt::Display for Expression<F, G> {
impl<'ast, F: Field + PrimeField> fmt::Display for Expression<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
// Variables
@ -105,7 +105,7 @@ impl<'ast, F: Field + PrimeField, G: Group> fmt::Display for Expression<F, G> {
// Values
Expression::Integer(ref integer) => write!(f, "{}", integer),
Expression::FieldElement(ref field) => write!(f, "{}", field),
Expression::GroupElement(ref group) => write!(f, "{}", group),
Expression::Group(ref group) => write!(f, "{}", group),
Expression::Boolean(ref bool) => write!(f, "{}", bool.get_value().unwrap()),
Expression::Implicit(ref value) => write!(f, "{}", value),
@ -177,7 +177,7 @@ impl<'ast, F: Field + PrimeField, G: Group> fmt::Display for Expression<F, G> {
}
}
impl<F: Field + PrimeField, G: Group> fmt::Display for Assignee<F, G> {
impl<F: Field + PrimeField> fmt::Display for Assignee<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
Assignee::Identifier(ref variable) => write!(f, "{}", variable),
@ -189,7 +189,7 @@ impl<F: Field + PrimeField, G: Group> fmt::Display for Assignee<F, G> {
}
}
impl<F: Field + PrimeField, G: Group> fmt::Display for ConditionalNestedOrEnd<F, G> {
impl<F: Field + PrimeField> fmt::Display for ConditionalNestedOrEnd<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
ConditionalNestedOrEnd::Nested(ref nested) => write!(f, "else {}", nested),
@ -204,7 +204,7 @@ impl<F: Field + PrimeField, G: Group> fmt::Display for ConditionalNestedOrEnd<F,
}
}
impl<F: Field + PrimeField, G: Group> fmt::Display for ConditionalStatement<F, G> {
impl<F: Field + PrimeField> fmt::Display for ConditionalStatement<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "if ({}) {{\n", self.condition)?;
for statement in self.statements.iter() {
@ -217,7 +217,7 @@ impl<F: Field + PrimeField, G: Group> fmt::Display for ConditionalStatement<F, G
}
}
impl<F: Field + PrimeField, G: Group> fmt::Display for Statement<F, G> {
impl<F: Field + PrimeField> fmt::Display for Statement<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
Statement::Return(ref statements) => {
@ -274,12 +274,12 @@ impl fmt::Display for IntegerType {
}
}
impl<F: Field + PrimeField, G: Group> fmt::Display for Type<F, G> {
impl<F: Field + PrimeField> fmt::Display for Type<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match *self {
Type::IntegerType(ref integer_type) => write!(f, "{}", integer_type),
Type::FieldElement => write!(f, "field"),
Type::GroupElement => write!(f, "group"),
Type::Group => write!(f, "group"),
Type::Boolean => write!(f, "bool"),
Type::Circuit(ref variable) => write!(f, "{}", variable),
Type::SelfType => write!(f, "Self"),
@ -294,7 +294,7 @@ impl<F: Field + PrimeField, G: Group> fmt::Display for Type<F, G> {
}
}
impl<F: Field + PrimeField, G: Group> fmt::Display for CircuitMember<F, G> {
impl<F: Field + PrimeField> fmt::Display for CircuitMember<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
CircuitMember::CircuitField(ref identifier, ref _type) => {
@ -310,7 +310,7 @@ impl<F: Field + PrimeField, G: Group> fmt::Display for CircuitMember<F, G> {
}
}
impl<F: Field + PrimeField, G: Group> Circuit<F, G> {
impl<F: Field + PrimeField> Circuit<F> {
fn format(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "circuit {} {{ \n", self.identifier)?;
for field in self.members.iter() {
@ -320,19 +320,19 @@ impl<F: Field + PrimeField, G: Group> Circuit<F, G> {
}
}
// impl<F: Field + PrimeField, G: Group> fmt::Display for Circuit<F, G> {// uncomment when we no longer print out Program
// impl<F: Field + PrimeField> fmt::Display for Circuit<F> {// uncomment when we no longer print out Program
// fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
// self.format(f)
// }
// }
impl<F: Field + PrimeField, G: Group> fmt::Debug for Circuit<F, G> {
impl<F: Field + PrimeField> fmt::Debug for Circuit<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.format(f)
}
}
impl<F: Field + PrimeField, G: Group> fmt::Display for InputModel<F, G> {
impl<F: Field + PrimeField> fmt::Display for InputModel<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
// mut var: private bool
if self.mutable {
@ -348,7 +348,7 @@ impl<F: Field + PrimeField, G: Group> fmt::Display for InputModel<F, G> {
}
}
impl<F: Field + PrimeField, G: Group> fmt::Display for InputValue<F, G> {
impl<F: Field + PrimeField> fmt::Display for InputValue<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
match self {
InputValue::Integer(ref integer) => write!(f, "{}", integer),
@ -369,7 +369,7 @@ impl<F: Field + PrimeField, G: Group> fmt::Display for InputValue<F, G> {
}
}
impl<F: Field + PrimeField, G: Group> Function<F, G> {
impl<F: Field + PrimeField> Function<F> {
fn format(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "function {}", self.function_name)?;
let parameters = self
@ -400,13 +400,13 @@ impl<F: Field + PrimeField, G: Group> Function<F, G> {
}
}
impl<F: Field + PrimeField, G: Group> fmt::Display for Function<F, G> {
impl<F: Field + PrimeField> fmt::Display for Function<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.format(f)
}
}
impl<F: Field + PrimeField, G: Group> fmt::Debug for Function<F, G> {
impl<F: Field + PrimeField> fmt::Debug for Function<F> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
self.format(f)
}

191
compiler/src/types_from.rs
View File

@ -2,7 +2,7 @@
use crate::{ast, types, Import, ImportSymbol};
use snarkos_models::curves::{Field, Group, PrimeField};
use snarkos_models::curves::{Field, PrimeField};
use snarkos_models::gadgets::utilities::{
boolean::Boolean, uint128::UInt128, uint16::UInt16, uint32::UInt32, uint64::UInt64,
uint8::UInt8,
@ -11,17 +11,13 @@ use std::collections::HashMap;
/// pest ast -> types::Identifier
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Identifier<'ast>>
for types::Identifier<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::Identifier<'ast>> for types::Identifier<F> {
fn from(identifier: ast::Identifier<'ast>) -> Self {
types::Identifier::new(identifier.value)
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Identifier<'ast>>
for types::Expression<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::Identifier<'ast>> for types::Expression<F> {
fn from(identifier: ast::Identifier<'ast>) -> Self {
types::Expression::Identifier(types::Identifier::from(identifier))
}
@ -29,7 +25,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::Identifier<'ast>>
/// pest ast -> types::Variable
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Variable<'ast>> for types::Variable<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::Variable<'ast>> for types::Variable<F> {
fn from(variable: ast::Variable<'ast>) -> Self {
types::Variable {
identifier: types::Identifier::from(variable.identifier),
@ -72,32 +68,21 @@ impl<'ast> types::Integer {
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Integer<'ast>> for types::Expression<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::Integer<'ast>> for types::Expression<F> {
fn from(field: ast::Integer<'ast>) -> Self {
types::Expression::Integer(types::Integer::from(field.number, field._type))
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::RangeOrExpression<'ast>>
for types::RangeOrExpression<F, G>
impl<'ast, F: Field + PrimeField> From<ast::RangeOrExpression<'ast>>
for types::RangeOrExpression<F>
{
fn from(range_or_expression: ast::RangeOrExpression<'ast>) -> Self {
match range_or_expression {
ast::RangeOrExpression::Range(range) => {
let from = range
.from
.map(|from| match types::Expression::<F, G>::from(from.0) {
types::Expression::Integer(number) => number,
types::Expression::Implicit(string) => {
types::Integer::from_implicit(string)
}
expression => {
unimplemented!("Range bounds should be integers, found {}", expression)
}
});
let to = range
.to
.map(|to| match types::Expression::<F, G>::from(to.0) {
.map(|from| match types::Expression::<F>::from(from.0) {
types::Expression::Integer(number) => number,
types::Expression::Implicit(string) => {
types::Integer::from_implicit(string)
@ -106,6 +91,13 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::RangeOrExpression<'ast>>
unimplemented!("Range bounds should be integers, found {}", expression)
}
});
let to = range.to.map(|to| match types::Expression::<F>::from(to.0) {
types::Expression::Integer(number) => number,
types::Expression::Implicit(string) => types::Integer::from_implicit(string),
expression => {
unimplemented!("Range bounds should be integers, found {}", expression)
}
});
types::RangeOrExpression::Range(from, to)
}
@ -118,7 +110,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::RangeOrExpression<'ast>>
/// pest ast -> types::Field
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Field<'ast>> for types::Expression<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::Field<'ast>> for types::Expression<F> {
fn from(field: ast::Field<'ast>) -> Self {
types::Expression::FieldElement(types::FieldElement::Constant(
F::from_str(&field.number.value).unwrap_or_default(),
@ -128,20 +120,15 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::Field<'ast>> for types::Ex
/// pest ast -> types::Group
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Group<'ast>> for types::Expression<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::Group<'ast>> for types::Expression<F> {
fn from(group: ast::Group<'ast>) -> Self {
use std::str::FromStr;
let scalar = G::ScalarField::from_str(&group.number.value).unwrap_or_default();
let point = G::default().mul(&scalar);
types::Expression::GroupElement(point)
types::Expression::Group(group.number.value)
}
}
/// pest ast -> types::Boolean
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Boolean<'ast>> for types::Expression<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::Boolean<'ast>> for types::Expression<F> {
fn from(boolean: ast::Boolean<'ast>) -> Self {
types::Expression::Boolean(Boolean::Constant(
boolean
@ -154,9 +141,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::Boolean<'ast>> for types::
/// pest ast -> types::NumberImplicit
impl<'ast, F: Field + PrimeField, G: Group> From<ast::NumberImplicit<'ast>>
for types::Expression<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::NumberImplicit<'ast>> for types::Expression<F> {
fn from(number: ast::NumberImplicit<'ast>) -> Self {
types::Expression::Implicit(number.number.value)
}
@ -164,7 +149,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::NumberImplicit<'ast>>
/// pest ast -> types::Expression
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Value<'ast>> for types::Expression<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::Value<'ast>> for types::Expression<F> {
fn from(value: ast::Value<'ast>) -> Self {
match value {
ast::Value::Integer(num) => types::Expression::from(num),
@ -176,16 +161,14 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::Value<'ast>> for types::Ex
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::NotExpression<'ast>>
for types::Expression<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::NotExpression<'ast>> for types::Expression<F> {
fn from(expression: ast::NotExpression<'ast>) -> Self {
types::Expression::Not(Box::new(types::Expression::from(*expression.expression)))
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::SpreadOrExpression<'ast>>
for types::SpreadOrExpression<F, G>
impl<'ast, F: Field + PrimeField> From<ast::SpreadOrExpression<'ast>>
for types::SpreadOrExpression<F>
{
fn from(s_or_e: ast::SpreadOrExpression<'ast>) -> Self {
match s_or_e {
@ -199,9 +182,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::SpreadOrExpression<'ast>>
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::BinaryExpression<'ast>>
for types::Expression<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::BinaryExpression<'ast>> for types::Expression<F> {
fn from(expression: ast::BinaryExpression<'ast>) -> Self {
match expression.operation {
// Boolean operations
@ -261,9 +242,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::BinaryExpression<'ast>>
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::TernaryExpression<'ast>>
for types::Expression<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::TernaryExpression<'ast>> for types::Expression<F> {
fn from(expression: ast::TernaryExpression<'ast>) -> Self {
types::Expression::IfElse(
Box::new(types::Expression::from(*expression.first)),
@ -273,9 +252,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::TernaryExpression<'ast>>
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::ArrayInlineExpression<'ast>>
for types::Expression<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::ArrayInlineExpression<'ast>> for types::Expression<F> {
fn from(array: ast::ArrayInlineExpression<'ast>) -> Self {
types::Expression::Array(
array
@ -286,19 +263,19 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::ArrayInlineExpression<'ast
)
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::ArrayInitializerExpression<'ast>>
for types::Expression<F, G>
impl<'ast, F: Field + PrimeField> From<ast::ArrayInitializerExpression<'ast>>
for types::Expression<F>
{
fn from(array: ast::ArrayInitializerExpression<'ast>) -> Self {
let count = types::Expression::<F, G>::get_count(array.count);
let count = types::Expression::<F>::get_count(array.count);
let expression = Box::new(types::SpreadOrExpression::from(*array.expression));
types::Expression::Array(vec![expression; count])
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::CircuitField<'ast>>
for types::CircuitFieldDefinition<F, G>
impl<'ast, F: Field + PrimeField> From<ast::CircuitField<'ast>>
for types::CircuitFieldDefinition<F>
{
fn from(member: ast::CircuitField<'ast>) -> Self {
types::CircuitFieldDefinition {
@ -308,8 +285,8 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::CircuitField<'ast>>
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::CircuitInlineExpression<'ast>>
for types::Expression<F, G>
impl<'ast, F: Field + PrimeField> From<ast::CircuitInlineExpression<'ast>>
for types::Expression<F>
{
fn from(expression: ast::CircuitInlineExpression<'ast>) -> Self {
let variable = types::Identifier::from(expression.identifier);
@ -317,15 +294,13 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::CircuitInlineExpression<'a
.members
.into_iter()
.map(|member| types::CircuitFieldDefinition::from(member))
.collect::<Vec<types::CircuitFieldDefinition<F, G>>>();
.collect::<Vec<types::CircuitFieldDefinition<F>>>();
types::Expression::Circuit(variable, members)
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::PostfixExpression<'ast>>
for types::Expression<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::PostfixExpression<'ast>> for types::Expression<F> {
fn from(expression: ast::PostfixExpression<'ast>) -> Self {
let variable =
types::Expression::Identifier(types::Identifier::from(expression.identifier));
@ -369,9 +344,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::PostfixExpression<'ast>>
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Expression<'ast>>
for types::Expression<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::Expression<'ast>> for types::Expression<F> {
fn from(expression: ast::Expression<'ast>) -> Self {
match expression {
ast::Expression::Value(value) => types::Expression::from(value),
@ -387,7 +360,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::Expression<'ast>>
}
}
impl<'ast, F: Field + PrimeField, G: Group> types::Expression<F, G> {
impl<'ast, F: Field + PrimeField> types::Expression<F> {
fn get_count(count: ast::Value<'ast>) -> usize {
match count {
ast::Value::Integer(integer) => integer
@ -406,7 +379,7 @@ impl<'ast, F: Field + PrimeField, G: Group> types::Expression<F, G> {
}
// ast::Assignee -> types::Expression for operator assign statements
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Assignee<'ast>> for types::Expression<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::Assignee<'ast>> for types::Expression<F> {
fn from(assignee: ast::Assignee<'ast>) -> Self {
let variable = types::Expression::Identifier(types::Identifier::from(assignee.identifier));
@ -431,13 +404,13 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::Assignee<'ast>> for types:
/// pest ast -> types::Assignee
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Identifier<'ast>> for types::Assignee<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::Identifier<'ast>> for types::Assignee<F> {
fn from(variable: ast::Identifier<'ast>) -> Self {
types::Assignee::Identifier(types::Identifier::from(variable))
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Assignee<'ast>> for types::Assignee<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::Assignee<'ast>> for types::Assignee<F> {
fn from(assignee: ast::Assignee<'ast>) -> Self {
let variable = types::Assignee::from(assignee.identifier);
@ -460,9 +433,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::Assignee<'ast>> for types:
/// pest ast -> types::Statement
impl<'ast, F: Field + PrimeField, G: Group> From<ast::ReturnStatement<'ast>>
for types::Statement<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::ReturnStatement<'ast>> for types::Statement<F> {
fn from(statement: ast::ReturnStatement<'ast>) -> Self {
types::Statement::Return(
statement
@ -474,9 +445,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::ReturnStatement<'ast>>
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::DefinitionStatement<'ast>>
for types::Statement<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::DefinitionStatement<'ast>> for types::Statement<F> {
fn from(statement: ast::DefinitionStatement<'ast>) -> Self {
types::Statement::Definition(
types::Variable::from(statement.variable),
@ -485,9 +454,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::DefinitionStatement<'ast>>
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::AssignStatement<'ast>>
for types::Statement<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::AssignStatement<'ast>> for types::Statement<F> {
fn from(statement: ast::AssignStatement<'ast>) -> Self {
match statement.assign {
ast::OperationAssign::Assign(ref _assign) => types::Statement::Assign(
@ -543,8 +510,8 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::AssignStatement<'ast>>
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::MultipleAssignmentStatement<'ast>>
for types::Statement<F, G>
impl<'ast, F: Field + PrimeField> From<ast::MultipleAssignmentStatement<'ast>>
for types::Statement<F>
{
fn from(statement: ast::MultipleAssignmentStatement<'ast>) -> Self {
let variables = statement
@ -567,8 +534,8 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::MultipleAssignmentStatemen
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::ConditionalNestedOrEnd<'ast>>
for types::ConditionalNestedOrEnd<F, G>
impl<'ast, F: Field + PrimeField> From<ast::ConditionalNestedOrEnd<'ast>>
for types::ConditionalNestedOrEnd<F>
{
fn from(statement: ast::ConditionalNestedOrEnd<'ast>) -> Self {
match statement {
@ -585,8 +552,8 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::ConditionalNestedOrEnd<'as
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::ConditionalStatement<'ast>>
for types::ConditionalStatement<F, G>
impl<'ast, F: Field + PrimeField> From<ast::ConditionalStatement<'ast>>
for types::ConditionalStatement<F>
{
fn from(statement: ast::ConditionalStatement<'ast>) -> Self {
types::ConditionalStatement {
@ -604,16 +571,14 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::ConditionalStatement<'ast>
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::ForStatement<'ast>>
for types::Statement<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::ForStatement<'ast>> for types::Statement<F> {
fn from(statement: ast::ForStatement<'ast>) -> Self {
let from = match types::Expression::<F, G>::from(statement.start) {
let from = match types::Expression::<F>::from(statement.start) {
types::Expression::Integer(number) => number,
types::Expression::Implicit(string) => types::Integer::from_implicit(string),
expression => unimplemented!("Range bounds should be integers, found {}", expression),
};
let to = match types::Expression::<F, G>::from(statement.stop) {
let to = match types::Expression::<F>::from(statement.stop) {
types::Expression::Integer(number) => number,
types::Expression::Implicit(string) => types::Integer::from_implicit(string),
expression => unimplemented!("Range bounds should be integers, found {}", expression),
@ -632,9 +597,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::ForStatement<'ast>>
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::AssertStatement<'ast>>
for types::Statement<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::AssertStatement<'ast>> for types::Statement<F> {
fn from(statement: ast::AssertStatement<'ast>) -> Self {
match statement {
ast::AssertStatement::AssertEq(assert_eq) => types::Statement::AssertEq(
@ -645,15 +608,13 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::AssertStatement<'ast>>
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::ExpressionStatement<'ast>>
for types::Statement<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::ExpressionStatement<'ast>> for types::Statement<F> {
fn from(statement: ast::ExpressionStatement<'ast>) -> Self {
types::Statement::Expression(types::Expression::from(statement.expression))
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Statement<'ast>> for types::Statement<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::Statement<'ast>> for types::Statement<F> {
fn from(statement: ast::Statement<'ast>) -> Self {
match statement {
ast::Statement::Return(statement) => types::Statement::from(statement),
@ -684,39 +645,39 @@ impl From<ast::IntegerType> for types::IntegerType {
}
}
impl<F: Field + PrimeField, G: Group> From<ast::BasicType> for types::Type<F, G> {
impl<F: Field + PrimeField> From<ast::BasicType> for types::Type<F> {
fn from(basic_type: ast::BasicType) -> Self {
match basic_type {
ast::BasicType::Integer(_type) => {
types::Type::IntegerType(types::IntegerType::from(_type))
}
ast::BasicType::Field(_type) => types::Type::FieldElement,
ast::BasicType::Group(_type) => types::Type::GroupElement,
ast::BasicType::Group(_type) => types::Type::Group,
ast::BasicType::Boolean(_type) => types::Type::Boolean,
}
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::ArrayType<'ast>> for types::Type<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::ArrayType<'ast>> for types::Type<F> {
fn from(array_type: ast::ArrayType<'ast>) -> Self {
let element_type = Box::new(types::Type::from(array_type._type));
let dimensions = array_type
.dimensions
.into_iter()
.map(|row| types::Expression::<F, G>::get_count(row))
.map(|row| types::Expression::<F>::get_count(row))
.collect();
types::Type::Array(element_type, dimensions)
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::CircuitType<'ast>> for types::Type<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::CircuitType<'ast>> for types::Type<F> {
fn from(circuit_type: ast::CircuitType<'ast>) -> Self {
types::Type::Circuit(types::Identifier::from(circuit_type.identifier))
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Type<'ast>> for types::Type<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::Type<'ast>> for types::Type<F> {
fn from(_type: ast::Type<'ast>) -> Self {
match _type {
ast::Type::Basic(_type) => types::Type::from(_type),
@ -729,8 +690,8 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::Type<'ast>> for types::Typ
/// pest ast -> types::Circuit
impl<'ast, F: Field + PrimeField, G: Group> From<ast::CircuitFieldDefinition<'ast>>
for types::CircuitMember<F, G>
impl<'ast, F: Field + PrimeField> From<ast::CircuitFieldDefinition<'ast>>
for types::CircuitMember<F>
{
fn from(circuit_value: ast::CircuitFieldDefinition<'ast>) -> Self {
types::CircuitMember::CircuitField(
@ -740,9 +701,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::CircuitFieldDefinition<'as
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::CircuitFunction<'ast>>
for types::CircuitMember<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::CircuitFunction<'ast>> for types::CircuitMember<F> {
fn from(circuit_function: ast::CircuitFunction<'ast>) -> Self {
types::CircuitMember::CircuitFunction(
circuit_function._static.is_some(),
@ -751,9 +710,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::CircuitFunction<'ast>>
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::CircuitMember<'ast>>
for types::CircuitMember<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::CircuitMember<'ast>> for types::CircuitMember<F> {
fn from(object: ast::CircuitMember<'ast>) -> Self {
match object {
ast::CircuitMember::CircuitFieldDefinition(circuit_value) => {
@ -766,7 +723,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::CircuitMember<'ast>>
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Circuit<'ast>> for types::Circuit<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::Circuit<'ast>> for types::Circuit<F> {
fn from(circuit: ast::Circuit<'ast>) -> Self {
let variable = types::Identifier::from(circuit.identifier);
let members = circuit
@ -784,9 +741,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::Circuit<'ast>> for types::
/// pest ast -> function types::Parameters
impl<'ast, F: Field + PrimeField, G: Group> From<ast::InputModel<'ast>>
for types::InputModel<F, G>
{
impl<'ast, F: Field + PrimeField> From<ast::InputModel<'ast>> for types::InputModel<F> {
fn from(parameter: ast::InputModel<'ast>) -> Self {
types::InputModel {
identifier: types::Identifier::from(parameter.identifier),
@ -802,7 +757,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::InputModel<'ast>>
/// pest ast -> types::Function
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Function<'ast>> for types::Function<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::Function<'ast>> for types::Function<F> {
fn from(function_definition: ast::Function<'ast>) -> Self {
let function_name = types::Identifier::from(function_definition.function_name);
let parameters = function_definition
@ -832,7 +787,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::Function<'ast>> for types:
/// pest ast -> Import
impl<'ast, F: Field + PrimeField, G: Group> From<ast::ImportSymbol<'ast>> for ImportSymbol<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::ImportSymbol<'ast>> for ImportSymbol<F> {
fn from(symbol: ast::ImportSymbol<'ast>) -> Self {
ImportSymbol {
symbol: types::Identifier::from(symbol.value),
@ -841,7 +796,7 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::ImportSymbol<'ast>> for Im
}
}
impl<'ast, F: Field + PrimeField, G: Group> From<ast::Import<'ast>> for Import<F, G> {
impl<'ast, F: Field + PrimeField> From<ast::Import<'ast>> for Import<F> {
fn from(import: ast::Import<'ast>) -> Self {
Import {
path_string: import.source.value,
@ -856,14 +811,14 @@ impl<'ast, F: Field + PrimeField, G: Group> From<ast::Import<'ast>> for Import<F
/// pest ast -> types::Program
impl<'ast, F: Field + PrimeField, G: Group> types::Program<F, G> {
impl<'ast, F: Field + PrimeField> types::Program<F> {
pub fn from(file: ast::File<'ast>, name: String) -> Self {
// Compiled ast -> aleo program representation
let imports = file
.imports
.into_iter()
.map(|import| Import::from(import))
.collect::<Vec<Import<F, G>>>();
.collect::<Vec<Import<F>>>();
let mut circuits = HashMap::new();
let mut functions = HashMap::new();

27
compiler/tests/array/mod.rs
View File

@ -6,16 +6,16 @@ use leo_compiler::{
errors::{CompilerError, FunctionError},
ConstrainedValue, InputValue, Integer,
};
use snarkos_curves::{bls12_377::Fr, edwards_bls12::EdwardsProjective};
use snarkos_curves::bls12_377::Fr;
use snarkos_models::gadgets::utilities::uint32::UInt32;
const DIRECTORY_NAME: &str = "tests/array/";
// [1, 1, 1]
fn output_ones(program: Compiler<Fr, EdwardsProjective>) {
fn output_ones(program: Compiler<Fr>) {
let output = get_output(program);
assert_eq!(
ConstrainedValue::<Fr, EdwardsProjective>::Return(vec![ConstrainedValue::Array(
ConstrainedValue::<Fr>::Return(vec![ConstrainedValue::Array(
vec![ConstrainedValue::Integer(Integer::U32(UInt32::constant(1u32))); 3]
)]),
output
@ -24,30 +24,27 @@ fn output_ones(program: Compiler<Fr, EdwardsProjective>) {
// [[0, 0, 0],
// [0, 0, 0]]
fn output_multi(program: Compiler<Fr, EdwardsProjective>) {
fn output_multi(program: Compiler<Fr>) {
let output = get_output(program);
assert_eq!(
ConstrainedValue::<Fr, EdwardsProjective>::Return(vec![ConstrainedValue::Array(vec![
ConstrainedValue::Array(vec![
ConstrainedValue::Integer(Integer::U32(
UInt32::constant(0u32)
));
3
]);
2
])]),
ConstrainedValue::<Fr>::Return(vec![ConstrainedValue::Array(vec![
ConstrainedValue::Array(
vec![ConstrainedValue::Integer(Integer::U32(UInt32::constant(0u32))); 3]
);
2
])]),
output
)
}
fn fail_array(program: Compiler<Fr, EdwardsProjective>) {
fn fail_array(program: Compiler<Fr>) {
match get_error(program) {
CompilerError::FunctionError(FunctionError::InvalidArray(_string)) => {}
error => panic!("Expected invalid array error, got {}", error),
}
}
fn fail_synthesis(program: Compiler<Fr, EdwardsProjective>) {
fn fail_synthesis(program: Compiler<Fr>) {
match get_error(program) {
CompilerError::FunctionError(FunctionError::IntegerError(
IntegerError::SynthesisError(_string),

22
compiler/tests/boolean/mod.rs
View File

@ -6,32 +6,28 @@ use leo_compiler::{
errors::{CompilerError, FunctionError, StatementError},
ConstrainedValue, InputValue,
};
use snarkos_curves::{bls12_377::Fr, edwards_bls12::EdwardsProjective};
use snarkos_curves::bls12_377::Fr;
use snarkos_models::gadgets::utilities::boolean::Boolean;
const DIRECTORY_NAME: &str = "tests/boolean/";
fn output_true(program: Compiler<Fr, EdwardsProjective>) {
fn output_true(program: Compiler<Fr>) {
let output = get_output(program);
assert_eq!(
ConstrainedValue::<Fr, EdwardsProjective>::Return(vec![ConstrainedValue::Boolean(
Boolean::Constant(true)
)]),
ConstrainedValue::<Fr>::Return(vec![ConstrainedValue::Boolean(Boolean::Constant(true))]),
output
);
}
fn output_false(program: Compiler<Fr, EdwardsProjective>) {
fn output_false(program: Compiler<Fr>) {
let output = get_output(program);
assert_eq!(
ConstrainedValue::<Fr, EdwardsProjective>::Return(vec![ConstrainedValue::Boolean(
Boolean::Constant(false)
)]),
ConstrainedValue::<Fr>::Return(vec![ConstrainedValue::Boolean(Boolean::Constant(false))]),
output
);
}
fn fail_evaluate(program: Compiler<Fr, EdwardsProjective>) {
fn fail_evaluate(program: Compiler<Fr>) {
match get_error(program) {
CompilerError::FunctionError(FunctionError::StatementError(
StatementError::ExpressionError(ExpressionError::BooleanError(
@ -42,7 +38,7 @@ fn fail_evaluate(program: Compiler<Fr, EdwardsProjective>) {
}
}
fn fail_enforce(program: Compiler<Fr, EdwardsProjective>) {
fn fail_enforce(program: Compiler<Fr>) {
match get_error(program) {
CompilerError::FunctionError(FunctionError::StatementError(
StatementError::ExpressionError(ExpressionError::BooleanError(
@ -53,7 +49,7 @@ fn fail_enforce(program: Compiler<Fr, EdwardsProjective>) {
}
}
fn fail_boolean(program: Compiler<Fr, EdwardsProjective>) {
fn fail_boolean(program: Compiler<Fr>) {
match get_error(program) {
CompilerError::FunctionError(FunctionError::BooleanError(
BooleanError::InvalidBoolean(_string),
@ -62,7 +58,7 @@ fn fail_boolean(program: Compiler<Fr, EdwardsProjective>) {
}
}
fn fail_synthesis(program: Compiler<Fr, EdwardsProjective>) {
fn fail_synthesis(program: Compiler<Fr>) {
match get_error(program) {
CompilerError::FunctionError(FunctionError::BooleanError(
BooleanError::SynthesisError(_string),

62
compiler/tests/circuit/mod.rs
View File

@ -12,29 +12,27 @@ use leo_compiler::{
ConstrainedCircuitMember, ConstrainedValue, Expression, Function, Identifier, Integer,
Statement, Type,
};
use snarkos_curves::{bls12_377::Fr, edwards_bls12::EdwardsProjective};
use snarkos_curves::bls12_377::Fr;
use snarkos_models::gadgets::utilities::uint32::UInt32;
const DIRECTORY_NAME: &str = "tests/circuit/";
// Circ { x: 1u32 }
fn output_circuit(program: Compiler<Fr, EdwardsProjective>) {
fn output_circuit(program: Compiler<Fr>) {
let output = get_output(program);
assert_eq!(
ConstrainedValue::<Fr, EdwardsProjective>::Return(vec![
ConstrainedValue::CircuitExpression(
Identifier::new("Circ".into()),
vec![ConstrainedCircuitMember(
Identifier::new("x".into()),
ConstrainedValue::Integer(Integer::U32(UInt32::constant(1u32)))
)]
)
]),
ConstrainedValue::<Fr>::Return(vec![ConstrainedValue::CircuitExpression(
Identifier::new("Circ".into()),
vec![ConstrainedCircuitMember(
Identifier::new("x".into()),
ConstrainedValue::Integer(Integer::U32(UInt32::constant(1u32)))
)]
)]),
output
);
}
fn fail_expected_member(program: Compiler<Fr, EdwardsProjective>) {
fn fail_expected_member(program: Compiler<Fr>) {
match get_error(program) {
CompilerError::FunctionError(FunctionError::StatementError(
StatementError::ExpressionError(ExpressionError::ExpectedCircuitMember(_string)),
@ -43,7 +41,7 @@ fn fail_expected_member(program: Compiler<Fr, EdwardsProjective>) {
}
}
fn fail_undefined_member(program: Compiler<Fr, EdwardsProjective>) {
fn fail_undefined_member(program: Compiler<Fr>) {
match get_error(program) {
CompilerError::FunctionError(FunctionError::StatementError(
StatementError::ExpressionError(ExpressionError::UndefinedMemberAccess(_, _)),
@ -153,26 +151,24 @@ fn test_self() {
// }
// }
assert_eq!(
ConstrainedValue::<Fr, EdwardsProjective>::Return(vec![
ConstrainedValue::CircuitExpression(
Identifier::new("Circ".into()),
vec![ConstrainedCircuitMember(
Identifier::new("new".into()),
ConstrainedValue::Static(Box::new(ConstrainedValue::Function(
Some(Identifier::new("Circ".into())),
Function {
function_name: Identifier::new("new".into()),
inputs: vec![],
returns: vec![Type::SelfType],
statements: vec![Statement::Return(vec![Expression::Circuit(
Identifier::new("Self".into()),
vec![]
)])]
}
)))
)]
)
]),
ConstrainedValue::<Fr>::Return(vec![ConstrainedValue::CircuitExpression(
Identifier::new("Circ".into()),
vec![ConstrainedCircuitMember(
Identifier::new("new".into()),
ConstrainedValue::Static(Box::new(ConstrainedValue::Function(
Some(Identifier::new("Circ".into())),
Function {
function_name: Identifier::new("new".into()),
inputs: vec![],
returns: vec![Type::SelfType],
statements: vec![Statement::Return(vec![Expression::Circuit(
Identifier::new("Self".into()),
vec![]
)])]
}
)))
)]
)]),
output
);
}

14
compiler/tests/field_element/mod.rs
View File

@ -6,32 +6,32 @@ use leo_compiler::{
errors::{CompilerError, FunctionError},
ConstrainedValue, FieldElement, InputValue,
};
use snarkos_curves::{bls12_377::Fr, edwards_bls12::EdwardsProjective};
use snarkos_curves::bls12_377::Fr;
use snarkos_models::curves::Field;
const DIRECTORY_NAME: &str = "tests/field_element/";
fn output_zero(program: Compiler<Fr, EdwardsProjective>) {
fn output_zero(program: Compiler<Fr>) {
let output = get_output(program);
assert_eq!(
ConstrainedValue::<Fr, EdwardsProjective>::Return(vec![ConstrainedValue::FieldElement(
ConstrainedValue::<Fr>::Return(vec![ConstrainedValue::FieldElement(
FieldElement::Constant(Fr::zero())
)]),
output
);
}
fn output_one(program: Compiler<Fr, EdwardsProjective>) {
fn output_one(program: Compiler<Fr>) {
let output = get_output(program);
assert_eq!(
ConstrainedValue::<Fr, EdwardsProjective>::Return(vec![ConstrainedValue::FieldElement(
ConstrainedValue::<Fr>::Return(vec![ConstrainedValue::FieldElement(
FieldElement::Constant(Fr::one())
)]),
output
);
}
fn fail_field(program: Compiler<Fr, EdwardsProjective>) {
fn fail_field(program: Compiler<Fr>) {
match get_error(program) {
CompilerError::FunctionError(FunctionError::FieldElementError(
FieldElementError::InvalidField(_string),
@ -40,7 +40,7 @@ fn fail_field(program: Compiler<Fr, EdwardsProjective>) {
}
}
fn fail_synthesis(program: Compiler<Fr, EdwardsProjective>) {
fn fail_synthesis(program: Compiler<Fr>) {
match get_error(program) {
CompilerError::FunctionError(FunctionError::FieldElementError(
FieldElementError::SynthesisError(_string),

15
compiler/tests/function/mod.rs
View File

@ -5,24 +5,21 @@ use leo_compiler::{
errors::{CompilerError, ExpressionError, FunctionError, StatementError},
ConstrainedValue,
};
use snarkos_curves::{bls12_377::Fr, edwards_bls12::EdwardsProjective};
use snarkos_curves::bls12_377::Fr;
use snarkos_models::gadgets::utilities::boolean::Boolean;
const DIRECTORY_NAME: &str = "tests/function/";
pub(crate) fn output_empty(program: Compiler<Fr, EdwardsProjective>) {
pub(crate) fn output_empty(program: Compiler<Fr>) {
let output = get_output(program);
assert_eq!(
ConstrainedValue::<Fr, EdwardsProjective>::Return(vec![]),
output
);
assert_eq!(ConstrainedValue::<Fr>::Return(vec![]), output);
}
// (true, false)
pub(crate) fn output_multiple(program: Compiler<Fr, EdwardsProjective>) {
pub(crate) fn output_multiple(program: Compiler<Fr>) {
let output = get_output(program);
assert_eq!(
ConstrainedValue::<Fr, EdwardsProjective>::Return(vec![
ConstrainedValue::<Fr>::Return(vec![
ConstrainedValue::Boolean(Boolean::Constant(true)),
ConstrainedValue::Boolean(Boolean::Constant(false))
]),
@ -30,7 +27,7 @@ pub(crate) fn output_multiple(program: Compiler<Fr, EdwardsProjective>) {
)
}
fn fail_undefined_identifier(program: Compiler<Fr, EdwardsProjective>) {
fn fail_undefined_identifier(program: Compiler<Fr>) {
match get_error(program) {
CompilerError::FunctionError(FunctionError::StatementError(
StatementError::ExpressionError(ExpressionError::UndefinedIdentifier(_)),

1
compiler/tests/group/mod.rs Normal file
View File

@ -0,0 +1 @@

0
compiler/tests/group_element/zero.leo → compiler/tests/group/zero.leo
View File

23
compiler/tests/group_element/mod.rs
View File

@ -1,23 +0,0 @@
use crate::{compile_program, get_output};
use leo_compiler::{compiler::Compiler, ConstrainedValue};
use snarkos_curves::{bls12_377::Fr, edwards_bls12::EdwardsProjective};
use snarkos_models::curves::Group;
const DIRECTORY_NAME: &str = "tests/group_element/";
pub(crate) fn output_zero(program: Compiler<Fr, EdwardsProjective>) {
let output = get_output(program);
assert_eq!(
ConstrainedValue::<Fr, EdwardsProjective>::Return(vec![ConstrainedValue::GroupElement(
EdwardsProjective::zero()
)]),
output
);
}
#[test]
fn test_zero() {
let program = compile_program(DIRECTORY_NAME, "zero.leo").unwrap();
output_zero(program);
}

30
compiler/tests/integer/u32/mod.rs
View File

@ -3,42 +3,42 @@ use crate::{compile_program, get_error, get_output};
use leo_compiler::{compiler::Compiler, types::Integer, ConstrainedValue, InputValue};
use leo_compiler::errors::{CompilerError, FunctionError, IntegerError};
use snarkos_curves::{bls12_377::Fr, edwards_bls12::EdwardsProjective};
use snarkos_curves::bls12_377::Fr;
use snarkos_models::gadgets::utilities::uint32::UInt32;
const DIRECTORY_NAME: &str = "tests/integer/u32/";
pub(crate) fn output_zero(program: Compiler<Fr, EdwardsProjective>) {
pub(crate) fn output_zero(program: Compiler<Fr>) {
let output = get_output(program);
assert_eq!(
ConstrainedValue::<Fr, EdwardsProjective>::Return(vec![ConstrainedValue::Integer(
Integer::U32(UInt32::constant(0u32))
)]),
ConstrainedValue::<Fr>::Return(vec![ConstrainedValue::Integer(Integer::U32(
UInt32::constant(0u32)
))]),
output
)
}
pub(crate) fn output_one(program: Compiler<Fr, EdwardsProjective>) {
pub(crate) fn output_one(program: Compiler<Fr>) {
let output = get_output(program);
assert_eq!(
ConstrainedValue::<Fr, EdwardsProjective>::Return(vec![ConstrainedValue::Integer(
Integer::U32(UInt32::constant(1u32))
)]),
ConstrainedValue::<Fr>::Return(vec![ConstrainedValue::Integer(Integer::U32(
UInt32::constant(1u32)
))]),
output
)
}
fn output_two(program: Compiler<Fr, EdwardsProjective>) {
fn output_two(program: Compiler<Fr>) {
let output = get_output(program);
assert_eq!(
ConstrainedValue::<Fr, EdwardsProjective>::Return(vec![ConstrainedValue::Integer(
Integer::U32(UInt32::constant(2u32))
)]),
ConstrainedValue::<Fr>::Return(vec![ConstrainedValue::Integer(Integer::U32(
UInt32::constant(2u32)
))]),
output
)
}
fn fail_integer(program: Compiler<Fr, EdwardsProjective>) {
fn fail_integer(program: Compiler<Fr>) {
match get_error(program) {
CompilerError::FunctionError(FunctionError::IntegerError(
IntegerError::InvalidInteger(_string),
@ -47,7 +47,7 @@ fn fail_integer(program: Compiler<Fr, EdwardsProjective>) {
}
}
fn fail_synthesis(program: Compiler<Fr, EdwardsProjective>) {
fn fail_synthesis(program: Compiler<Fr>) {
match get_error(program) {
CompilerError::FunctionError(FunctionError::IntegerError(
IntegerError::SynthesisError(_string),

15
compiler/tests/mod.rs
View File

@ -3,7 +3,7 @@ pub mod boolean;
pub mod circuit;
pub mod field_element;
pub mod function;
pub mod group_element;
pub mod group;
pub mod import;
pub mod integer;
pub mod mutability;
@ -11,21 +11,18 @@ pub mod statement;
use leo_compiler::{compiler::Compiler, errors::CompilerError, ConstrainedValue};
use snarkos_curves::{bls12_377::Fr, edwards_bls12::EdwardsProjective};
use snarkos_curves::bls12_377::Fr;
use snarkos_models::gadgets::r1cs::TestConstraintSystem;
use std::env::current_dir;
pub(crate) fn get_output(
program: Compiler<Fr, EdwardsProjective>,
) -> ConstrainedValue<Fr, EdwardsProjective> {
pub(crate) fn get_output(program: Compiler<Fr>) -> ConstrainedValue<Fr> {
let mut cs = TestConstraintSystem::<Fr>::new();
let output = program.compile_constraints(&mut cs).unwrap();
assert!(cs.is_satisfied());
output
}
pub(crate) fn get_error(program: Compiler<Fr, EdwardsProjective>) -> CompilerError {
pub(crate) fn get_error(program: Compiler<Fr>) -> CompilerError {
let mut cs = TestConstraintSystem::<Fr>::new();
program.compile_constraints(&mut cs).unwrap_err()
}
@ -33,7 +30,7 @@ pub(crate) fn get_error(program: Compiler<Fr, EdwardsProjective>) -> CompilerErr
pub(crate) fn compile_program(
directory_name: &str,
file_name: &str,
) -> Result<Compiler<Fr, EdwardsProjective>, CompilerError> {
) -> Result<Compiler<Fr>, CompilerError> {
let path = current_dir().map_err(|error| CompilerError::DirectoryError(error))?;
// Sanitize the package path to the test directory
@ -50,5 +47,5 @@ pub(crate) fn compile_program(
println!("Compiling file - {:?}", main_file_path);
// Compile from the main file path
Compiler::<Fr, EdwardsProjective>::init(file_name.to_string(), main_file_path)
Compiler::<Fr>::init(file_name.to_string(), main_file_path)
}

12
compiler/tests/mutability/mod.rs
View File

@ -6,25 +6,25 @@ use leo_compiler::{
types::{InputValue, Integer},
ConstrainedValue,
};
use snarkos_curves::{bls12_377::Fr, edwards_bls12::EdwardsProjective};
use snarkos_curves::bls12_377::Fr;
use snarkos_models::gadgets::{r1cs::TestConstraintSystem, utilities::uint32::UInt32};
const DIRECTORY_NAME: &str = "tests/mutability/";
fn mut_success(program: Compiler<Fr, EdwardsProjective>) {
fn mut_success(program: Compiler<Fr>) {
let mut cs = TestConstraintSystem::<Fr>::new();
let output = program.compile_constraints(&mut cs).unwrap();
assert!(cs.is_satisfied());
assert_eq!(
ConstrainedValue::<Fr, EdwardsProjective>::Return(vec![ConstrainedValue::Integer(
Integer::U32(UInt32::constant(0))
)]),
ConstrainedValue::<Fr>::Return(vec![ConstrainedValue::Integer(Integer::U32(
UInt32::constant(0)
))]),
output
);
}
fn mut_fail(program: Compiler<Fr, EdwardsProjective>) {
fn mut_fail(program: Compiler<Fr>) {
let mut cs = TestConstraintSystem::<Fr>::new();
let err = program.compile_constraints(&mut cs).unwrap_err();

9
leo/commands/build.rs
View File

@ -5,10 +5,7 @@ use crate::{cli::*, cli_types::*};
use leo_compiler::compiler::Compiler;
use snarkos_algorithms::snark::KeypairAssembly;
use snarkos_curves::{
bls12_377::{Bls12_377, Fr},
edwards_bls12::EdwardsProjective
};
use snarkos_curves::bls12_377::{Bls12_377, Fr};
use clap::ArgMatches;
use std::convert::TryFrom;
@ -19,7 +16,7 @@ pub struct BuildCommand;
impl CLI for BuildCommand {
type Options = ();
type Output = (Compiler<Fr, EdwardsProjective>, bool);
type Output = (Compiler<Fr>, bool);
const NAME: NameType = "build";
const ABOUT: AboutType = "Compile the current package as a program";
@ -63,7 +60,7 @@ impl CLI for BuildCommand {
main_file_path.push(MAIN_FILE_NAME);
// Compute the current program checksum
let program = Compiler::<Fr, EdwardsProjective>::init(package_name.clone(), main_file_path.clone())?;
let program = Compiler::<Fr>::init(package_name.clone(), main_file_path.clone())?;
let program_checksum = program.checksum()?;
// Generate the program on the constraint system and verify correctness

2
leo/commands/deploy.rs
View File

@ -1,7 +1,7 @@
use crate::{cli::*, cli_types::*};
use crate::commands::BuildCommand;
use crate::errors::CLIError;
use crate::files::Manifest;
use crate::{cli::*, cli_types::*};
use clap::ArgMatches;
use std::convert::TryFrom;

2
leo/commands/load.rs
View File

@ -1,7 +1,7 @@
use crate::{cli::*, cli_types::*};
use crate::commands::BuildCommand;
use crate::errors::CLIError;
use crate::files::Manifest;
use crate::{cli::*, cli_types::*};
use clap::ArgMatches;
use std::convert::TryFrom;

7
leo/commands/prove.rs
View File

@ -1,7 +1,7 @@
use crate::{cli::*, cli_types::*};
use crate::commands::SetupCommand;
use crate::errors::CLIError;
use crate::files::{Manifest, ProofFile};
use crate::{cli::*, cli_types::*};
use snarkos_algorithms::snark::{create_random_proof, Proof};
use snarkos_curves::bls12_377::Bls12_377;
@ -45,7 +45,10 @@ impl CLI for ProveCommand {
let rng = &mut thread_rng();
let program_proof = create_random_proof(program, &parameters, rng).unwrap();
log::info!("Prover completed in {:?} milliseconds", start.elapsed().as_millis());
log::info!(
"Prover completed in {:?} milliseconds",
start.elapsed().as_millis()
);
// Write the proof file to the outputs directory
let mut proof = vec![];

2
leo/commands/publish.rs
View File

@ -1,7 +1,7 @@
use crate::{cli::*, cli_types::*};
use crate::commands::BuildCommand;
use crate::errors::CLIError;
use crate::files::Manifest;
use crate::{cli::*, cli_types::*};
use clap::ArgMatches;
use std::convert::TryFrom;

2
leo/commands/run.rs
View File

@ -1,4 +1,4 @@
use crate::commands::{SetupCommand, ProveCommand};
use crate::commands::{ProveCommand, SetupCommand};
use crate::errors::CLIError;
use crate::{cli::*, cli_types::*};

21
leo/commands/setup.rs
View File

@ -1,16 +1,13 @@
use crate::{cli::*, cli_types::*};
use crate::commands::BuildCommand;
use crate::errors::{CLIError, VerificationKeyFileError};
use crate::files::{Manifest, ProvingKeyFile, VerificationKeyFile};
use crate::{cli::*, cli_types::*};
use leo_compiler::compiler::Compiler;
use snarkos_algorithms::snark::{
generate_random_parameters, prepare_verifying_key, Parameters, PreparedVerifyingKey,
};
use snarkos_curves::{
bls12_377::{Bls12_377, Fr},
edwards_bls12::EdwardsProjective
};
use snarkos_curves::bls12_377::{Bls12_377, Fr};
use snarkos_utilities::bytes::ToBytes;
use clap::ArgMatches;
@ -25,7 +22,7 @@ pub struct SetupCommand;
impl CLI for SetupCommand {
type Options = ();
type Output = (
Compiler<Fr, EdwardsProjective>,
Compiler<Fr>,
Parameters<Bls12_377>,
PreparedVerifyingKey<Bls12_377>,
);
@ -66,7 +63,10 @@ impl CLI for SetupCommand {
let prepared_verifying_key = prepare_verifying_key::<Bls12_377>(&parameters.vk);
// End the timer
log::info!("Setup completed in {:?} milliseconds", start.elapsed().as_millis());
log::info!(
"Setup completed in {:?} milliseconds",
start.elapsed().as_millis()
);
// TODO (howardwu): Convert parameters to a 'proving key' struct for serialization.
// Write the proving key file to the outputs directory
@ -95,10 +95,13 @@ impl CLI for SetupCommand {
prepared_verifying_key.write(&mut verification_key)?;
// Check that the constructed prepared verification key matches the stored verification key
let compare: Vec<(u8, u8)> = verification_key.into_iter().zip(stored_vk.into_iter()).collect();
let compare: Vec<(u8, u8)> = verification_key
.into_iter()
.zip(stored_vk.into_iter())
.collect();
for (a, b) in compare {
if a != b {
return Err(VerificationKeyFileError::IncorrectVerificationKey.into())
return Err(VerificationKeyFileError::IncorrectVerificationKey.into());
}
}
}

2
leo/commands/unload.rs
View File

@ -1,7 +1,7 @@
use crate::{cli::*, cli_types::*};
use crate::commands::BuildCommand;
use crate::errors::CLIError;
use crate::files::Manifest;
use crate::{cli::*, cli_types::*};
use clap::ArgMatches;
use std::convert::TryFrom;

10
leo/files/checksum.rs
View File

@ -31,7 +31,10 @@ impl ChecksumFile {
pub fn read_from(&self, path: &PathBuf) -> Result<String, ChecksumFileError> {
let path = self.setup_file_path(path);
Ok(fs::read_to_string(&path).map_err(|_| ChecksumFileError::FileReadError(path.clone()))?)
Ok(
fs::read_to_string(&path)
.map_err(|_| ChecksumFileError::FileReadError(path.clone()))?,
)
}
/// Writes the given checksum to a file.
@ -52,7 +55,10 @@ impl ChecksumFile {
if !path.ends_with(OUTPUTS_DIRECTORY_NAME) {
path.push(PathBuf::from(OUTPUTS_DIRECTORY_NAME));
}
path.push(PathBuf::from(format!("{}{}", self.package_name, CHECKSUM_FILE_EXTENSION)));
path.push(PathBuf::from(format!(
"{}{}",
self.package_name, CHECKSUM_FILE_EXTENSION
)));
}
path
}

8
leo/files/proof.rs
View File

@ -31,7 +31,8 @@ impl ProofFile {
pub fn read_from(&self, path: &PathBuf) -> Result<String, ProofFileError> {
let path = self.setup_file_path(path);
let proof = fs::read_to_string(&path).map_err(|_| ProofFileError::FileReadError(path.clone()))?;
let proof =
fs::read_to_string(&path).map_err(|_| ProofFileError::FileReadError(path.clone()))?;
Ok(proof)
}
@ -53,7 +54,10 @@ impl ProofFile {
if !path.ends_with(OUTPUTS_DIRECTORY_NAME) {
path.push(PathBuf::from(OUTPUTS_DIRECTORY_NAME));
}
path.push(PathBuf::from(format!("{}{}", self.package_name, PROOF_FILE_EXTENSION)));
path.push(PathBuf::from(format!(
"{}{}",
self.package_name, PROOF_FILE_EXTENSION
)));
}
path
}

5
leo/files/proving_key.rs
View File

@ -52,7 +52,10 @@ impl ProvingKeyFile {
if !path.ends_with(OUTPUTS_DIRECTORY_NAME) {
path.push(PathBuf::from(OUTPUTS_DIRECTORY_NAME));
}
path.push(PathBuf::from(format!("{}{}", self.package_name, PROVING_KEY_FILE_EXTENSION)));
path.push(PathBuf::from(format!(
"{}{}",
self.package_name, PROVING_KEY_FILE_EXTENSION
)));
}
path
}

11
leo/files/verification_key.rs
View File

@ -35,7 +35,11 @@ impl VerificationKeyFile {
}
/// Writes the given verification key to a file.
pub fn write_to(&self, path: &PathBuf, verification_key: &[u8]) -> Result<(), VerificationKeyFileError> {
pub fn write_to(
&self,
path: &PathBuf,
verification_key: &[u8],
) -> Result<(), VerificationKeyFileError> {
let path = self.setup_file_path(path);
let mut file = File::create(&path)?;
@ -52,7 +56,10 @@ impl VerificationKeyFile {
if !path.ends_with(OUTPUTS_DIRECTORY_NAME) {
path.push(PathBuf::from(OUTPUTS_DIRECTORY_NAME));
}
path.push(PathBuf::from(format!("{}{}", self.package_name, VERIFICATION_KEY_FILE_EXTENSION)));
path.push(PathBuf::from(format!(
"{}{}",
self.package_name, VERIFICATION_KEY_FILE_EXTENSION
)));
}
path
}