Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
163 changes: 146 additions & 17 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace]
members = ["mopro-ffi", "cli", "tests"]
members = ["mopro-ffi", "cli", "tests", "garaga-calldata-tests"]
resolver = "2"

[workspace.dependencies]
Expand Down
5 changes: 4 additions & 1 deletion cli/src/init/circom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,17 @@ impl ProvingSystem for Circom {
circom-prover = "0.1"
rust-witness = "0.1"
num-bigint = "0.4.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
garaga_rs = { git = "https://github.com/keep-starknet-strange/garaga", tag = "v1.1.0", package = "garaga_rs", optional = true }
"#;
const BUILD_DEPENDENCIES: &'static str = r#"
witnesscalc-adapter = "0.1"
rust-witness = "0.1"
"#;
const DEV_DEPENDENCIES: &'static str = r#"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0.94"
serde_json = "1.0"
"#;

const BUILD_TEMPLATE: &'static str = r#"
Expand Down
1 change: 1 addition & 0 deletions cli/src/init/write_toml.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ default = ["uniffi"]
uniffi = ["mopro-ffi/uniffi"]
flutter = ["mopro-ffi/flutter"]
wasm = ["mopro-ffi/wasm"]
garaga = ["garaga_rs"]

[dependencies]
mopro-ffi = { version = "=0.3.7" }
Expand Down
1 change: 0 additions & 1 deletion cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ enum Commands {
architectures: Option<Vec<String>>,
#[arg(
long,
num_args = 1..,
help = "Automatically run mopro update after build",
conflicts_with = "no_auto_update"
)]
Expand Down
2 changes: 2 additions & 0 deletions cli/src/template/circom/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ mod circom;
pub use circom::{
generate_circom_proof, verify_circom_proof, CircomProof, CircomProofResult, ProofLib, G1, G2,
};
#[cfg(feature = "garaga")]
pub use circom::generate_circom_groth16_garaga_calldata;

mod witness {
rust_witness::witness!(multiplier2);
Expand Down
10 changes: 10 additions & 0 deletions cli/src/template/init/src/circom.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
#[cfg(feature = "garaga")]
mod circom_garaga;
#[cfg(feature = "garaga")]
mod garaga_convert;
#[cfg(feature = "garaga")]
mod snarkjs_types;

#[cfg(feature = "garaga")]
pub use circom_garaga::generate_circom_groth16_garaga_calldata;

use crate::MoproError;
use circom_prover::{
prover::{
Expand Down
Loading
Loading