Merge branch 'master' into a

Author: clararod9

Cargo.lock

@@ -9,6 +9,7 @@ pub struct ExecutionConfig {
     pub r1cs: String,
     pub sym: String,
     pub json_constraints: String,
+    pub json_substitutions: String,
     pub no_rounds: usize,
     pub flag_s: bool,
     pub flag_f: bool,
@@ -32,6 +33,7 @@ pub fn execute_project(
     let build_config = BuildConfig {
         no_rounds: config.no_rounds,
         flag_json_sub: config.json_substitution_flag,
+        json_substitutions: config.json_substitutions,
         flag_s: config.flag_s,
         flag_f: config.flag_f,
         flag_p: config.flag_p,

circom/src/execution_user.rs

@@ -4,6 +4,7 @@ pub struct Input {
     pub input_program: PathBuf,
     pub out_r1cs: PathBuf,
     pub out_json_constraints: PathBuf,
+    pub out_json_substitutions: PathBuf,
     pub out_wat_code: PathBuf,
     pub out_wasm_code: PathBuf,
     pub out_wasm_name: String,
@@ -82,6 +83,11 @@ impl Input {
                 &format!("{}_constraints", file_name),
                 JSON,
             ),
+            out_json_substitutions: Input::build_output(
+                &output_path,
+                &format!("{}_substitutions", file_name),
+                JSON,
+            ),
             wat_flag:input_processing::get_wat(&matches),
             wasm_flag: input_processing::get_wasm(&matches),
             c_flag: c_flag,
@@ -158,6 +164,9 @@ impl Input {
     pub fn json_constraints_file(&self) -> &str {
         self.out_json_constraints.to_str().unwrap()
     }
+    pub fn json_substitutions_file(&self) -> &str {
+        self.out_json_substitutions.to_str().unwrap()
+    }
     pub fn wasm_flag(&self) -> bool {
         self.wasm_flag
     }
@@ -410,10 +419,9 @@ mod input_processing {
             )
             .arg(
                 Arg::with_name("print_json_sub")
-                    .long("jsons")
+                    .long("simplification_substitution")
                     .takes_value(false)
-                    .hidden(true)
-                    .display_order(100)
+                    .display_order(980)
                     .help("Outputs the substitution in json format"),
             )
             .arg(

circom/src/input_user.rs

@@ -42,6 +42,7 @@ fn start() -> Result<(), ()> {
         sym: user_input.sym_file().to_string(),
         r1cs: user_input.r1cs_file().to_string(),
         json_constraints: user_input.json_constraints_file().to_string(),
+        json_substitutions: user_input.json_substitutions_file().to_string(),
         prime: user_input.prime(),        
     };
     let circuit = execution_user::execute_project(program_archive, config)?;

circom/src/main.rs

@@ -235,7 +235,7 @@ impl WASMProducer {
         let mut n = 0;
         for (_c, v) in &self.io_map {
             for s in v {
-                // since we take offset and all lenghts but last one
+                // since we take offset and all lengths but last one
                 if s.lengths.len() == 0 {
                     n += 1;
                 } else {

code_producers/src/wasm_elements/mod.rs

@@ -226,7 +226,7 @@ impl WriteC for CreateCmpBucket {
         // if the array is complete traverse all its positions
         if complete_array {
             instructions.push(format!("for (uint i = 0; i < {}; i++) {{", self.number_of_cmp));
-            // update the value of the the paralel status if it is not uniform parallel using the array aux_parallel
+            // update the value of the the parallel status if it is not uniform parallel using the array aux_parallel
             if self.uniform_parallel.is_none(){
                 instructions.push(format!("bool status_parallel = aux_parallel[i];"));
             }
@@ -237,7 +237,7 @@ impl WriteC for CreateCmpBucket {
             instructions.push(format!("uint aux_positions [{}]= {};", self.defined_positions.len(), set_list(self.defined_positions.iter().map(|(x, _y)| *x).collect())));
             instructions.push(format!("for (uint i_aux = 0; i_aux < {}; i_aux++) {{",  self.defined_positions.len()));
             instructions.push(format!("uint i = aux_positions[i_aux];"));
-            // update the value of the the paralel status if it is not uniform parallel using the array aux_parallel
+            // update the value of the the parallel status if it is not uniform parallel using the array aux_parallel
             if self.uniform_parallel.is_none(){
                 instructions.push(format!("bool status_parallel = aux_parallel[i_aux];"));
             }

compiler/src/intermediate_representation/create_component_bucket.rs

@@ -12,17 +12,17 @@ pub fn visit_list(
     inside_loop: bool
 )-> bool {
     let len_instructions = instructions.len();
-    let mut found_unkown_aux = found_unknown_address;
+    let mut found_unknown_aux = found_unknown_address;
     for i in 0..instructions.len(){
-        found_unkown_aux = visit_instruction(
+        found_unknown_aux = visit_instruction(
             &mut instructions[len_instructions - 1 - i],
             known_last_component,
             unknown_last_component, 
-            found_unkown_aux,
+            found_unknown_aux,
             inside_loop
         );
     }
-    found_unkown_aux
+    found_unknown_aux
 }
 
 pub fn visit_instruction(

compiler/src/ir_processing/build_inputs_info.rs

@@ -251,6 +251,10 @@ impl ComponentRepresentation {
 
         // We copy tags in any case, complete or incomplete assignment
         // The values of the tags must be the same than the ones stored before
+        if !component.is_preinitialized() {
+            return Result::Err(MemoryError::AssignmentError(TypeAssignmentError::NoInitializedComponent));
+        }
+        
         if !component.inputs_tags.contains_key(signal_name){
             return Result::Err(MemoryError::AssignmentError(TypeAssignmentError::AssignmentOutput));
         }
@@ -286,6 +290,10 @@ impl ComponentRepresentation {
         slice_route: &[SliceCapacity],
         tags: TagInfo,
     ) -> Result<(), MemoryError> {
+
+        if !component.is_preinitialized() {
+            return Result::Err(MemoryError::AssignmentError(TypeAssignmentError::NoInitializedComponent));
+        }
 
         if !component.inputs.contains_key(signal_name){
             return Result::Err(MemoryError::AssignmentError(TypeAssignmentError::AssignmentOutput));

constraint_generation/src/environment_utils/component_representation.rs

@@ -2214,6 +2214,10 @@ fn treat_result_with_memory_error_void(
                             Report::error("Exception caused by invalid assignment: trying to assign a value to an output signal of a component".to_string(),
                                 RuntimeError)
                         },
+                        TypeAssignmentError::NoInitializedComponent =>{
+                            Report::error("Exception caused by invalid assignment: trying to assign a value to a signal of a component that has not been initialized".to_string(),
+                                RuntimeError)
+                        }
                     }
                 },
                 MemoryError::OutOfBoundsError => {
@@ -2313,6 +2317,10 @@ fn treat_result_with_memory_error<C>(
                             Report::error("Exception caused by invalid assignment: trying to assign a value to an output signal of a component".to_string(),
                                 RuntimeError)
                         },
+                        TypeAssignmentError::NoInitializedComponent =>{
+                            Report::error("Exception caused by invalid assignment: trying to assign a value to a signal of a component that has not been initialized".to_string(),
+                                RuntimeError)
+                        }
                     }
                 },
                 MemoryError::AssignmentMissingTags(signal, tag) => Report::error(

constraint_generation/src/execute.rs

@@ -24,6 +24,7 @@ use std::rc::Rc;
 pub struct BuildConfig {
     pub no_rounds: usize,
     pub flag_json_sub: bool,
+    pub json_substitutions: String,
     pub flag_s: bool,
     pub flag_f: bool,
     pub flag_p: bool,
@@ -97,6 +98,7 @@ fn simplification_process(vcp: &mut VCP, dag: DAG, config: &BuildConfig) -> Cons
         flag_s: config.flag_s,
         parallel_flag: config.flag_p,
         port_substitution: config.flag_json_sub,
+        json_substitutions: config.json_substitutions.clone(),
         no_rounds: config.no_rounds,
         flag_old_heuristics: config.flag_old_heuristics,
         prime : config.prime.clone(),