Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add prime secq256k1 #221

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Add prime secq256k1 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c01343c
first try
NikZak Nov 29, 2023
5484b94
field_size correction
NikZak Nov 30, 2023
cc9deef
Revert "field_size correction"
NikZak Nov 30, 2023
68eb9de
added secq to c code generator
NikZak Nov 30, 2023
3f6bb08
fr-code.wat
NikZak Dec 27, 2023
ed73605
used friasm to create c files (can't check them though)
NikZak Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion circom/src/input_user.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ mod input_processing {
|| prime_value == "grumpkin"
|| prime_value == "pallas"
|| prime_value == "vesta"
|| prime_value == "secq256k1"
{
Ok(String::from(matches.value_of("prime").unwrap()))
}
Expand Down Expand Up @@ -498,7 +499,7 @@ mod input_processing {
.takes_value(true)
.default_value("bn128")
.display_order(300)
.help("To choose the prime number to use to generate the circuit. Receives the name of the curve (bn128, bls12381, goldilocks, grumpkin, pallas, vesta)"),
.help("To choose the prime number to use to generate the circuit. Receives the name of the curve (bn128, bls12381, goldilocks, grumpkin, pallas, secq256k1, vesta)"),
)
.get_matches()
}
Expand Down
106 changes: 55 additions & 51 deletions code_producers/src/c_elements/c_code_generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,16 +165,12 @@ pub fn declare_my_template_name() -> CInstruction {
)
}
pub fn declare_my_template_name_function(name: &String) -> CInstruction {
format!(
"std::string {} = \"{}\"",
MY_TEMPLATE_NAME, name.to_string()
)
format!("std::string {} = \"{}\"", MY_TEMPLATE_NAME, name.to_string())
}
pub fn my_template_name() -> CInstruction {
format!("{}", MY_TEMPLATE_NAME)
}


pub const MY_COMPONENT_NAME: &str = "myComponentName";
pub fn declare_my_component_name() -> CInstruction {
format!(
Expand All @@ -188,21 +184,15 @@ pub fn my_component_name() -> CInstruction {

pub const MY_FATHER: &str = "myFather";
pub fn declare_my_father() -> CInstruction {
format!(
"u64 {} = {}->componentMemory[{}].idFather",
MY_FATHER, CIRCOM_CALC_WIT, CTX_INDEX
)
format!("u64 {} = {}->componentMemory[{}].idFather", MY_FATHER, CIRCOM_CALC_WIT, CTX_INDEX)
}
pub fn my_father() -> CInstruction {
format!("{}", MY_FATHER)
}

pub const MY_ID: &str = "myId";
pub fn declare_my_id() -> CInstruction {
format!(
"u64 {} = {}",
MY_ID, CTX_INDEX
)
format!("u64 {} = {}", MY_ID, CTX_INDEX)
}
pub fn my_id() -> CInstruction {
format!("{}", MY_ID)
Expand Down Expand Up @@ -367,7 +357,7 @@ pub fn set_list(elems: Vec<usize>) -> String {
set_string = format!("{}{},", set_string, elem);
}
set_string.pop();
set_string .push('}');
set_string.push('}');
set_string
}

Expand All @@ -385,24 +375,29 @@ pub fn add_return() -> String {
"return;".to_string()
}

pub fn generate_my_array_position(aux_dimensions: String, len_dimensions: String, param: String) -> String {
format!("{}->generate_position_array({}, {}, {})", CIRCOM_CALC_WIT, aux_dimensions, len_dimensions, param)
pub fn generate_my_array_position(
aux_dimensions: String,
len_dimensions: String,
param: String,
) -> String {
format!(
"{}->generate_position_array({}, {}, {})",
CIRCOM_CALC_WIT, aux_dimensions, len_dimensions, param
)
}

pub fn generate_my_trace() -> String {
format!("{}->getTrace({})", CIRCOM_CALC_WIT, MY_ID)
}

pub fn build_failed_assert_message(line: usize) -> String{

pub fn build_failed_assert_message(line: usize) -> String {
format!("std::cout << \"Failed assert in template/function \" << {} << \" line {}. \" << \"Followed trace of components: \" << {} << std::endl" ,
MY_TEMPLATE_NAME,
line,
generate_my_trace()
)
}


pub fn build_conditional(
cond: Vec<String>,
if_body: Vec<String>,
Expand All @@ -427,20 +422,21 @@ pub fn collect_template_headers(instances: &TemplateListParallel) -> Vec<String>
let params_run = vec![declare_ctx_index(), declare_circom_calc_wit()];
let params_run = argument_list(params_run);
let params_create = vec![
declare_signal_offset(),
declare_component_offset(),
declare_signal_offset(),
declare_component_offset(),
declare_circom_calc_wit(),
declare_component_name(),
declare_component_father(),
];
let params_create = argument_list(params_create);
if instance.is_parallel{
if instance.is_parallel {
let run_header = format!("void {}_run_parallel({});", instance.name, params_run);
let create_header = format!("void {}_create_parallel({});", instance.name, params_create);
let create_header =
format!("void {}_create_parallel({});", instance.name, params_create);
template_headers.push(create_header);
template_headers.push(run_header);
}
if instance.is_not_parallel{
if instance.is_not_parallel {
let run_header = format!("void {}_run({});", instance.name, params_run);
let create_header = format!("void {}_create({});", instance.name, params_create);
template_headers.push(create_header);
Expand Down Expand Up @@ -686,32 +682,35 @@ pub fn generate_dat_file(dat_file: &mut dyn Write, producer: &CProducer) -> std:
dat_file.flush()?;
Ok(())
}
pub fn generate_function_list(_producer: &CProducer, list: &TemplateListParallel) -> (String, String) {
let mut func_list= "".to_string();
let mut func_list_parallel= "".to_string();
pub fn generate_function_list(
_producer: &CProducer,
list: &TemplateListParallel,
) -> (String, String) {
let mut func_list = "".to_string();
let mut func_list_parallel = "".to_string();
if list.len() > 0 {
if list[0].is_parallel{
func_list_parallel.push_str(&format!("\n{}_run_parallel",list[0].name));
}else{
if list[0].is_parallel {
func_list_parallel.push_str(&format!("\n{}_run_parallel", list[0].name));
} else {
func_list_parallel.push_str(&format!("\nNULL"));
}
if list[0].is_not_parallel{
func_list.push_str(&format!("\n{}_run",list[0].name));
}else{
if list[0].is_not_parallel {
func_list.push_str(&format!("\n{}_run", list[0].name));
} else {
func_list.push_str(&format!("\nNULL"));
}
for i in 1..list.len() {
if list[i].is_parallel{
func_list_parallel.push_str(&format!(",\n{}_run_parallel",list[i].name));
}else{
for i in 1..list.len() {
if list[i].is_parallel {
func_list_parallel.push_str(&format!(",\n{}_run_parallel", list[i].name));
} else {
func_list_parallel.push_str(&format!(",\nNULL"));
}
if list[i].is_not_parallel{
func_list.push_str(&format!(",\n{}_run",list[i].name));
}else{
if list[i].is_not_parallel {
func_list.push_str(&format!(",\n{}_run", list[i].name));
} else {
func_list.push_str(&format!(",\nNULL"));
}
}
}
}
(func_list, func_list_parallel)
}
Expand All @@ -734,9 +733,10 @@ pub fn generate_message_list_def(_producer: &CProducer, message_list: &MessageLi
instructions
}

pub fn generate_function_release_memory_component() -> Vec<String>{
pub fn generate_function_release_memory_component() -> Vec<String> {
let mut instructions = vec![];
instructions.push("void release_memory_component(Circom_CalcWit* ctx, uint pos) {{\n".to_string());
instructions
.push("void release_memory_component(Circom_CalcWit* ctx, uint pos) {{\n".to_string());
instructions.push("if (pos != 0){{\n".to_string());
instructions.push("if(ctx->componentMemory[pos].subcomponents)".to_string());
instructions.push("delete []ctx->componentMemory[pos].subcomponents;\n".to_string());
Expand All @@ -755,7 +755,7 @@ pub fn generate_function_release_memory_component() -> Vec<String>{
instructions
}

pub fn generate_function_release_memory_circuit() -> Vec<String>{
pub fn generate_function_release_memory_circuit() -> Vec<String> {
// deleting each one of the components
let mut instructions = vec![];
instructions.push("void release_memory(Circom_CalcWit* ctx) {{\n".to_string());
Expand All @@ -764,7 +764,7 @@ pub fn generate_function_release_memory_circuit() -> Vec<String>{
instructions.push("}}\n".to_string());
instructions.push("}}\n".to_string());
instructions
}
}

pub fn generate_main_cpp_file(c_folder: &PathBuf) -> std::io::Result<()> {
use std::io::BufWriter;
Expand Down Expand Up @@ -808,12 +808,13 @@ pub fn generate_fr_hpp_file(c_folder: &PathBuf, prime: &String) -> std::io::Resu
let file_name = file_path.to_str().unwrap();
let mut c_file = BufWriter::new(File::create(file_name).unwrap());
let mut code = "".to_string();
let file = match prime.as_ref(){
let file = match prime.as_ref() {
"bn128" => include_str!("bn128/fr.hpp"),
"bls12381" => include_str!("bls12381/fr.hpp"),
"goldilocks" => include_str!("goldilocks/fr.hpp"),
"grumpkin" => include_str!("grumpkin/fr.hpp"),
"pallas" => include_str!("pallas/fr.hpp"),
"secq256k1" => include_str!("secq256k1/fr.hpp"),
"vesta" => include_str!("vesta/fr.hpp"),
_ => unreachable!(),
};
Expand Down Expand Up @@ -850,14 +851,15 @@ pub fn generate_fr_cpp_file(c_folder: &PathBuf, prime: &String) -> std::io::Resu
let file_name = file_path.to_str().unwrap();
let mut c_file = BufWriter::new(File::create(file_name).unwrap());
let mut code = "".to_string();
let file = match prime.as_ref(){
let file = match prime.as_ref() {
"bn128" => include_str!("bn128/fr.cpp"),
"bls12381" => include_str!("bls12381/fr.cpp"),
"goldilocks" => include_str!("goldilocks/fr.cpp"),
"grumpkin" => include_str!("grumpkin/fr.cpp"),
"pallas" => include_str!("pallas/fr.cpp"),
"secq256k1" => include_str!("secq256k1/fr.cpp"),
"vesta" => include_str!("vesta/fr.cpp"),

_ => unreachable!(),
};
for line in file.lines() {
Expand Down Expand Up @@ -893,15 +895,16 @@ pub fn generate_fr_asm_file(c_folder: &PathBuf, prime: &String) -> std::io::Resu
let file_name = file_path.to_str().unwrap();
let mut c_file = BufWriter::new(File::create(file_name).unwrap());
let mut code = "".to_string();
let file = match prime.as_ref(){
let file = match prime.as_ref() {
"bn128" => include_str!("bn128/fr.asm"),
"bls12381" => include_str!("bls12381/fr.asm"),
"goldilocks" => include_str!("goldilocks/fr.asm"),
"grumpkin" => include_str!("grumpkin/fr.asm"),
"pallas" => include_str!("pallas/fr.asm"),
"secq256k1" => include_str!("secq256k1/fr.asm"),
"vesta" => include_str!("vesta/fr.asm"),
_ => unreachable!(),
};
};
for line in file.lines() {
code = format!("{}{}\n", code, line);
}
Expand Down Expand Up @@ -953,7 +956,8 @@ pub fn generate_c_file(name: String, producer: &CProducer) -> std::io::Result<()
let mut run_defs = collect_template_headers(producer.get_template_instance_list());
code.append(&mut run_defs);

let (func_list_no_parallel, func_list_parallel) = generate_function_list(producer, producer.get_template_instance_list());
let (func_list_no_parallel, func_list_parallel) =
generate_function_list(producer, producer.get_template_instance_list());

code.push(format!(
"Circom_TemplateFunction _functionTable[{}] = {{ {} }};",
Expand Down
Loading