Skip to content

Commit 20cf4e6

Browse files
committed
fix proof_parser,cli compiling errors. improve field,utils
Signed-off-by: GopherJ <alex_cj96@foxmail.com> fix pedersen Signed-off-by: GopherJ <alex_cj96@foxmail.com>
1 parent 63de351 commit 20cf4e6

File tree

16 files changed

+1124
-828
lines changed

16 files changed

+1124
-828
lines changed

Cargo.lock

Lines changed: 299 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ members = [
1818
"field",
1919
"utils",
2020
"hash",
21+
"proof_parser",
22+
"cli"
2123
]
2224

2325
[workspace.dependencies]
@@ -47,7 +49,7 @@ ark-relations = { version = "0.4" }
4749
ark-crypto-primitives = { version = "0.4", default-features = false, features = ["r1cs","sponge","snark","merkle_tree","prf"] }
4850

4951
num = { version = "0.4.0", default-features = false }
50-
num-bigint = { version = "0.4.4", default-features = false }
52+
num-bigint = { version = "0.4.4", default-features = false, features = ["serde"] }
5153
num-integer = { version = "0.1", default-features = false }
5254
num-traits = { version = "0.2.19", default-features = false }
5355
ruint = { version = "1.12", default-features = false, features = ["serde", "num-bigint"] }
@@ -93,3 +95,24 @@ overflow-checks = true
9395
opt-level = 3
9496
lto = true
9597
overflow-checks = true
98+
99+
# [patch.crates-io]
100+
# ark-test-curves = { path = "../ark-algebra/test-curves" }
101+
# ark-r1cs-std = { path = "../ark-r1cs-std" }
102+
# ark-ff = { path = "../ark-algebra/ff" }
103+
# ark-ec = { path = "../ark-algebra/ec" }
104+
# ark-serialize = { path = "../ark-algebra/serialize" }
105+
# ark-std = { path = "../ark-std" }
106+
# ark-bls12-381 = { path = "../ark-algebra/curves/bls12_381" }
107+
# ark-bn254 = { path = "../ark-algebra/curves/bn254" }
108+
# ark-bls12-377 = { path = "../ark-algebra/curves/bls12_377" }
109+
# ark-mnt4-298 = { path = "../ark-algebra/curves/mnt4_298" }
110+
# ark-mnt4-753 = { path = "../ark-algebra/curves/mnt4_753" }
111+
# ark-mnt6-298 = { path = "../ark-algebra/curves/mnt6_298" }
112+
# ark-mnt6-753 = { path = "../ark-algebra/curves/mnt6_753" }
113+
# ark-pallas = { path = "../ark-algebra/curves/pallas" }
114+
# ark-groth16 = { path = "../ark-groth16" }
115+
# ark-snark = { path = "../ark-snark/snark" }
116+
# ark-poly = { path = "../ark-algebra/poly" }
117+
# ark-relations = { path = "../ark-snark/relations" }
118+
# ark-crypto-primitives = { path = "../ark-crypto-primitives/crypto-primitives" }

air/src/domains.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl<F: SimpleField> StarkDomains<F> {
2828
let eval_domain_size = F::two().powers_felt(&log_eval_domain_size);
2929
let trace_domain_size = F::two().powers_felt(&log_trace_domain_size);
3030
Self {
31-
log_eval_domain_size: log_trace_domain_size.clone() + log_n_cosets,
31+
log_eval_domain_size: log_eval_domain_size.clone(),
3232
eval_domain_size: F::two().powers_felt(&log_eval_domain_size),
3333
eval_generator: F::from_stark_felt(FIELD_GENERATOR).powers_felt(
3434
&F::from_stark_felt(STARK_PRIME_MINUS_ONE).field_div(&eval_domain_size),

cli/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ version = "0.0.8"
1111
clap = { workspace = true }
1212

1313
swiftness_air = { workspace = true }
14+
swiftness_field = { workspace = true }
15+
swiftness_hash = { workspace = true }
1416
swiftness_stark = { workspace = true }
17+
swiftness_utils = { workspace = true }
1518
swiftness_proof_parser = { workspace = true }
1619

1720
[features]

cli/src/main.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
use std::path::PathBuf;
2+
use swiftness_field::Fp;
23
pub use swiftness_proof_parser::*;
34
pub use swiftness_stark::*;
45

@@ -16,6 +17,7 @@ use swiftness_air::layout::starknet::Layout;
1617
use swiftness_air::layout::starknet_with_keccak::Layout;
1718

1819
use clap::Parser;
20+
use swiftness_utils::curve::StarkwareCurve;
1921

2022
#[derive(Parser)]
2123
#[command(author, version, about)]
@@ -28,8 +30,8 @@ struct CairoVMVerifier {
2830
fn main() -> Result<(), Box<dyn std::error::Error>> {
2931
let cli = CairoVMVerifier::parse();
3032
let stark_proof = parse(std::fs::read_to_string(cli.proof)?)?;
31-
let security_bits = stark_proof.config.security_bits();
32-
let result = stark_proof.verify::<Layout>(security_bits)?;
33+
let security_bits: Fp = stark_proof.config.security_bits();
34+
let result = stark_proof.verify::<StarkwareCurve, Layout>(security_bits)?;
3335
println!("{:?}", result);
3436
Ok(())
3537
}

0 commit comments

Comments
 (0)