github-mig/ZoKrates
github-mig/ZoKrates
1
0
Fork 0
mirror of synced 2025-09-24 04:40:05 +00:00
Code Issues Projects Releases Wiki Activity

improve cli flag for abi

Browse source
This commit is contained in:
schaeff 2019-07-05 12:07:22 +02:00
parent 7fd7b1766a
commit b7376173b3
5 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
zokrates_cli/src/bin.rs
View file

@ -33,6 +33,7 @@ fn cli() -> Result<(), String> {
const WITNESS_DEFAULT_PATH: &str = "witness";
const JSON_PROOF_PATH: &str = "proof.json";
let default_scheme = env::var("ZOKRATES_PROVING_SCHEME").unwrap_or(String::from("g16"));
let default_solidity_abi = "v1";
// cli specification using clap library
let matches = App::new("ZoKrates")
@ -133,11 +134,13 @@ fn cli() -> Result<(), String> {
.takes_value(true)
.required(false)
.default_value(&default_scheme)
).arg(Arg::with_name("abiv2")
.short("abiv2")
.long("abiv2")
.help("Flag for setting version of ABI Encoder used in the contract. Default is ABIv1")
.takes_value(false)
).arg(Arg::with_name("abi")
.short("abi")
.long("abi")
.help("Flag for setting the version of the ABI Encoder used in the contract. Default is v1.")
.takes_value(true)
.possible_values(&["v1", "v2"])
.default_value(&default_solidity_abi)
.required(false)
)
)
@ -410,7 +413,7 @@ fn cli() -> Result<(), String> {
("export-verifier", Some(sub_matches)) => {
{
let scheme = get_scheme(sub_matches.value_of("proving-scheme").unwrap())?;
let abiv2 = sub_matches.occurrences_of("abiv2") > 0;
let is_abiv2 = sub_matches.value_of("abi").unwrap() == "v2";
println!("Exporting verifier...");
// read vk file
@ -419,7 +422,7 @@ fn cli() -> Result<(), String> {
.map_err(|why| format!("couldn't open {}: {}", input_path.display(), why))?;
let reader = BufReader::new(input_file);
let verifier = scheme.export_solidity_verifier(reader, abiv2);
let verifier = scheme.export_solidity_verifier(reader, is_abiv2);
//write output file
let output_path = Path::new(sub_matches.value_of("output").unwrap());

4
zokrates_core/src/proof_system/bn128/g16.rs
View file

@ -57,10 +57,10 @@ impl ProofSystem for G16 {
true
}
fn export_solidity_verifier(&self, reader: BufReader<File>, abiv2: bool) -> String {
fn export_solidity_verifier(&self, reader: BufReader<File>, is_abiv2: bool) -> String {
let mut lines = reader.lines();
let (mut template_text, solidity_pairing_lib) = if abiv2 {
let (mut template_text, solidity_pairing_lib) = if is_abiv2 {
(
String::from(CONTRACT_TEMPLATE_V2),
String::from(SOLIDITY_PAIRING_LIB_V2),

4
zokrates_core/src/proof_system/bn128/gm17.rs
View file

@ -107,10 +107,10 @@ impl ProofSystem for GM17 {
}
}
fn export_solidity_verifier(&self, reader: BufReader<File>, abiv2: bool) -> String {
fn export_solidity_verifier(&self, reader: BufReader<File>, is_abiv2: bool) -> String {
let mut lines = reader.lines();
let (mut template_text, solidity_pairing_lib) = if abiv2 {
let (mut template_text, solidity_pairing_lib) = if is_abiv2 {
(
String::from(CONTRACT_TEMPLATE_V2),
String::from(SOLIDITY_PAIRING_LIB_V2),

4
zokrates_core/src/proof_system/bn128/pghr13.rs
View file

@ -113,10 +113,10 @@ impl ProofSystem for PGHR13 {
}
}
fn export_solidity_verifier(&self, reader: BufReader<File>, abiv2: bool) -> String {
fn export_solidity_verifier(&self, reader: BufReader<File>, is_abiv2: bool) -> String {
let mut lines = reader.lines();
let (mut template_text, solidity_pairing_lib) = if abiv2 {
let (mut template_text, solidity_pairing_lib) = if is_abiv2 {
(
String::from(CONTRACT_TEMPLATE_V2),
String::from(SOLIDITY_PAIRING_LIB_V2),

2
zokrates_core/src/proof_system/mod.rs
View file

@ -23,5 +23,5 @@ pub trait ProofSystem {
proof_path: &str,
) -> bool;
fn export_solidity_verifier(&self, reader: BufReader<File>, abiv2: bool) -> String;
fn export_solidity_verifier(&self, reader: BufReader<File>, is_abiv2: bool) -> String;
}