diff --git a/Cargo.toml b/Cargo.toml index 5808208..bc1da15 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,11 +40,3 @@ thiserror = "1.0.61" num-bigint = { version = "0.4.4", features = ["serde"] } blake2 = "0.10.6" wasm-bindgen = "0.2" - -cairovm_verifier_air = { path = "crates/air", default-features = false } -cairovm_verifier_commitment = { path = "crates/commitment", default-features = false } -cairovm_verifier_fri = { path = "crates/fri", default-features = false } -cairovm_verifier_pow = { path = "crates/pow", default-features = false } -cairovm_verifier_stark = { path = "crates/stark", default-features = false } -cairovm_verifier_transcript = { path = "crates/transcript", default-features = false } -cairovm_verifier_proof_parser = { path = "proof-parser", default-features = false } diff --git a/cli/Cargo.toml b/cli/Cargo.toml index b1bfe23..9978d22 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -12,9 +12,9 @@ version.workspace = true clap = { version = "4.4.4", features = ["derive"] } starknet-crypto.workspace = true -cairovm_verifier_air = { workspace = true, features = ["std"] } -cairovm_verifier_stark = { workspace = true, features = ["std"] } -cairovm_verifier_proof_parser = { workspace = true, features = ["std"] } +cairovm_verifier_air = { path = "../crates/air", features = ["std"] } +cairovm_verifier_stark = { path = "../crates/stark", features = ["std"] } +cairovm_verifier_proof_parser = { path = "../proof-parser", features = ["std"] } [features] default = ["recursive", "keccak"] diff --git a/crates/air/Cargo.toml b/crates/air/Cargo.toml index 9fd1352..2c58ec6 100644 --- a/crates/air/Cargo.toml +++ b/crates/air/Cargo.toml @@ -10,7 +10,11 @@ version.workspace = true [features] default = ["std", "recursive"] -std = ["dep:thiserror"] +std = [ + "dep:thiserror", + "cairovm_verifier_commitment/std", + "cairovm_verifier_transcript/std", +] dex = [] recursive = [] recursive_with_poseidon = [] @@ -27,5 +31,5 @@ starknet-crypto.workspace = true thiserror = { optional = true, workspace = true } thiserror-no-std.workspace = true -cairovm_verifier_commitment.workspace = true -cairovm_verifier_transcript.workspace = true +cairovm_verifier_commitment = { path = "../commitment", default-features = false } +cairovm_verifier_transcript = { path = "../transcript", default-features = false } diff --git a/crates/commitment/Cargo.toml b/crates/commitment/Cargo.toml index e2f56ea..3f9821f 100644 --- a/crates/commitment/Cargo.toml +++ b/crates/commitment/Cargo.toml @@ -27,4 +27,4 @@ thiserror-no-std.workspace = true crypto-bigint.workspace = true blake2.workspace = true -cairovm_verifier_transcript.workspace = true +cairovm_verifier_transcript = { path = "../transcript", default-features = false } diff --git a/crates/fri/Cargo.toml b/crates/fri/Cargo.toml index b0d277a..0dc4707 100644 --- a/crates/fri/Cargo.toml +++ b/crates/fri/Cargo.toml @@ -23,6 +23,6 @@ starknet-crypto.workspace = true thiserror = { optional = true, workspace = true } thiserror-no-std.workspace = true -cairovm_verifier_air.workspace = true -cairovm_verifier_commitment.workspace = true -cairovm_verifier_transcript.workspace = true +cairovm_verifier_air = { path = "../air", default-features = false } +cairovm_verifier_commitment = { path = "../commitment", default-features = false } +cairovm_verifier_transcript = { path = "../transcript", default-features = false } diff --git a/crates/pow/Cargo.toml b/crates/pow/Cargo.toml index 2d625e8..38f78eb 100644 --- a/crates/pow/Cargo.toml +++ b/crates/pow/Cargo.toml @@ -25,4 +25,4 @@ thiserror = { optional = true, workspace = true } thiserror-no-std.workspace = true blake2.workspace = true -cairovm_verifier_transcript.workspace = true +cairovm_verifier_transcript = { path = "../transcript", default-features = false } diff --git a/crates/stark/Cargo.toml b/crates/stark/Cargo.toml index f1965e9..8a3148d 100644 --- a/crates/stark/Cargo.toml +++ b/crates/stark/Cargo.toml @@ -10,7 +10,13 @@ version.workspace = true [features] default = ["std", "recursive"] -std = ["dep:thiserror"] +std = [ + "dep:thiserror", + "cairovm_verifier_air/std", + "cairovm_verifier_commitment/std", + "cairovm_verifier_fri/std", + "cairovm_verifier_pow/std", +] dex = [] recursive = [] recursive_with_poseidon = [] @@ -28,8 +34,8 @@ thiserror = { optional = true, workspace = true } thiserror-no-std.workspace = true wasm-bindgen.workspace = true -cairovm_verifier_air.workspace = true -cairovm_verifier_commitment.workspace = true -cairovm_verifier_fri.workspace = true -cairovm_verifier_pow.workspace = true -cairovm_verifier_transcript.workspace = true +cairovm_verifier_air = { path = "../air", default-features = false } +cairovm_verifier_commitment = { path = "../commitment", default-features = false } +cairovm_verifier_fri = { path = "../fri", default-features = false } +cairovm_verifier_pow = { path = "../pow", default-features = false } +cairovm_verifier_transcript = { path = "../transcript", default-features = false } diff --git a/proof-parser/Cargo.toml b/proof-parser/Cargo.toml index 3775674..02fdab3 100644 --- a/proof-parser/Cargo.toml +++ b/proof-parser/Cargo.toml @@ -11,6 +11,8 @@ version.workspace = true [features] default = ["std"] std = ["dep:thiserror"] +keccak = [] +blake2s = [] [dependencies] serde.workspace = true @@ -23,8 +25,8 @@ clap = { version = "4.5.1", features = ["derive"] } regex = "1.10.3" serde_json = "1.0.114" -cairovm_verifier_stark.workspace = true -cairovm_verifier_commitment.workspace = true -cairovm_verifier_fri.workspace = true -cairovm_verifier_air.workspace = true -cairovm_verifier_pow.workspace = true +cairovm_verifier_stark = { path = "../crates/stark", default-features = false } +cairovm_verifier_commitment = { path = "../crates/commitment", default-features = false } +cairovm_verifier_fri = { path = "../crates/fri", default-features = false } +cairovm_verifier_air = { path = "../crates/air", default-features = false } +cairovm_verifier_pow = { path = "../crates/pow", default-features = false } diff --git a/proof-parser/src/lib.rs b/proof-parser/src/lib.rs index aaab667..88cb6b7 100644 --- a/proof-parser/src/lib.rs +++ b/proof-parser/src/lib.rs @@ -14,11 +14,6 @@ mod stark_proof; mod utils; use crate::{json_parser::ProofJSON, stark_proof::StarkProof}; -use std::convert::TryFrom; -extern crate clap; -extern crate num_bigint; -extern crate regex; -extern crate serde; use alloc::string::String; use cairovm_verifier_stark::types::StarkProof as StarkProofFromVerifier; diff --git a/wasm-binding/Cargo.toml b/wasm-binding/Cargo.toml index ebe53aa..be1c8c9 100644 --- a/wasm-binding/Cargo.toml +++ b/wasm-binding/Cargo.toml @@ -12,9 +12,9 @@ version.workspace = true serde_json.workspace = true wasm-bindgen.workspace = true -cairovm_verifier_air = { workspace = true, default-features = false } -cairovm_verifier_stark = { workspace = true, default-features = false } -cairovm_verifier_proof_parser = { workspace = true, default-features = false } +cairovm_verifier_air = { path = "../crates/air", default-features = false } +cairovm_verifier_stark = { path = "../crates/stark", default-features = false } +cairovm_verifier_proof_parser = { path = "../proof-parser", default-features = false } [lib] crate-type = ["cdylib", "rlib"] @@ -31,4 +31,4 @@ small = [] starknet = [] starknet_with_keccak = [] keccak = [] -blake2s = [] \ No newline at end of file +blake2s = []