Skip to content

Commit 3c5b72b

Browse files
0x8f7010x8f701
committed
fix typo & air tests
chore: UPDATE Signed-off-by: GopherJ <alex_cj96@foxmail.com> chore: UPDATE Signed-off-by: GopherJ <alex_cj96@foxmail.com> chore: UPDATE Signed-off-by: GopherJ <alex_cj96@foxmail.com>
1 parent 019debf commit 3c5b72b

File tree

28 files changed

+153
-160
lines changed

28 files changed

+153
-160
lines changed

‎Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.PHONY: verify
2+
verify:
3+
cargo run --release --bin ark_swiftness_cli --features starknet_with_keccak,keccak --no-default-features -- --proof ./proofs/starknet_with_keccak/cairo0_example_proof.json

‎air/src/diluted.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ pub fn get_diluted_product<F: SimpleField + PoseidonHash>(n_bits: F, spacing: F,
3333

3434
let mut i = F::zero();
3535
loop {
36-
// TODO: fix this
37-
// if i == n_bits - F::one() {
38-
// break p + q * alpha;
39-
// }
36+
// TODO: remove get_value()
37+
if (i).get_value() == (n_bits.clone() - F::one()).get_value() {
38+
break p + q * alpha;
39+
}
4040

4141
x += &diff_x;
4242
diff_x *= &diff_multiplier;

‎air/src/layout/dex/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use global_values::{EcPoint, EcdsaSigConfig, GlobalValues, InteractionElements};
1515
use starknet_crypto::{Felt};
1616
use swiftness_commitment::table::{commit::table_commit, decommit::table_decommit};
1717
use swiftness_field::SimpleField;
18-
use swiftness_hash::{pedersen::PedersenHash, poseidon::PoseidonHash};
18+
use swiftness_hash::{blake2s::Blake2sHash, keccak::KeccakHash, pedersen::PedersenHash, poseidon::PoseidonHash};
1919
use swiftness_transcript::ensure;
2020

2121
use super::{CompositionPolyEvalError, LayoutTrait, PublicInputError};
@@ -247,7 +247,7 @@ impl<F: SimpleField + PoseidonHash> LayoutTrait<F> for Layout {
247247
commitment: crate::trace::Commitment<Self::InteractionElements, F>,
248248
decommitment: crate::trace::Decommitment<F>,
249249
witness: crate::trace::Witness<F>,
250-
) -> Result<(), crate::trace::decommit::Error<F>> {
250+
) -> Result<(), crate::trace::decommit::Error<F>> where F: KeccakHash + Blake2sHash {
251251
Ok(table_decommit(commitment.original, queries, decommitment.original, witness.original)
252252
.and(table_decommit(
253253
commitment.interaction,

‎air/src/layout/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use ark_ec::short_weierstrass::SWCurveConfig;
33
use ark_ff::{Field, PrimeField};
44
use ark_r1cs_std::{fields::{fp::FpVar, FieldOpsBounds, FieldVar}, prelude::Boolean};
55
use swiftness_field::SimpleField;
6-
use swiftness_hash::{pedersen::PedersenHash, poseidon::PoseidonHash};
6+
use swiftness_hash::{blake2s::Blake2sHash, keccak::KeccakHash, pedersen::PedersenHash, poseidon::PoseidonHash};
77
use swiftness_transcript::transcript::Transcript;
88

99
pub mod dex;
@@ -76,7 +76,7 @@ pub trait LayoutTrait<F: SimpleField + PoseidonHash> {
7676
commitment: crate::trace::Commitment<Self::InteractionElements, F>,
7777
decommitment: crate::trace::Decommitment<F>,
7878
witness: crate::trace::Witness<F>,
79-
) -> Result<(), crate::trace::decommit::Error<F>>;
79+
) -> Result<(), crate::trace::decommit::Error<F>> where F: KeccakHash + Blake2sHash;
8080

8181
fn verify_public_input<P: SWCurveConfig>(
8282
public_input: &PublicInput<F>,

‎air/src/layout/recursive/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use global_values::{EcPoint, GlobalValues, InteractionElements};
1515
use starknet_crypto::{Felt};
1616
use swiftness_commitment::table::{commit::table_commit, decommit::table_decommit};
1717
use swiftness_field::SimpleField;
18-
use swiftness_hash::{pedersen::PedersenHash, poseidon::PoseidonHash};
18+
use swiftness_hash::{blake2s::Blake2sHash, keccak::KeccakHash, pedersen::PedersenHash, poseidon::PoseidonHash};
1919
use swiftness_transcript::ensure;
2020

2121
use super::{CompositionPolyEvalError, LayoutTrait, PublicInputError};
@@ -247,7 +247,7 @@ impl<F: SimpleField + PoseidonHash> LayoutTrait<F> for Layout {
247247
commitment: crate::trace::Commitment<Self::InteractionElements, F>,
248248
decommitment: crate::trace::Decommitment<F>,
249249
witness: crate::trace::Witness<F>,
250-
) -> Result<(), crate::trace::decommit::Error<F>> {
250+
) -> Result<(), crate::trace::decommit::Error<F>> where F: KeccakHash + Blake2sHash {
251251
Ok(table_decommit(commitment.original, queries, decommitment.original, witness.original)
252252
.and(table_decommit(
253253
commitment.interaction,

‎air/src/layout/recursive_with_poseidon/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use global_values::{EcPoint, GlobalValues, InteractionElements};
1919
use starknet_crypto::Felt;
2020
use swiftness_commitment::table::{commit::table_commit, decommit::table_decommit};
2121
use swiftness_field::SimpleField;
22-
use swiftness_hash::{pedersen::PedersenHash, poseidon::PoseidonHash};
22+
use swiftness_hash::{blake2s::Blake2sHash, keccak::KeccakHash, pedersen::PedersenHash, poseidon::PoseidonHash};
2323
use swiftness_transcript::ensure;
2424

2525
use super::{CompositionPolyEvalError, LayoutTrait, PublicInputError};
@@ -290,7 +290,7 @@ impl<F: SimpleField + PoseidonHash> LayoutTrait<F> for Layout {
290290
commitment: crate::trace::Commitment<Self::InteractionElements, F>,
291291
decommitment: crate::trace::Decommitment<F>,
292292
witness: crate::trace::Witness<F>,
293-
) -> Result<(), crate::trace::decommit::Error<F>> {
293+
) -> Result<(), crate::trace::decommit::Error<F>> where F: KeccakHash + Blake2sHash {
294294
Ok(table_decommit(commitment.original, queries, decommitment.original, witness.original)
295295
.and(table_decommit(
296296
commitment.interaction,

‎air/src/layout/small/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use global_values::{EcPoint, EcdsaSigConfig, GlobalValues, InteractionElements};
1515
use starknet_crypto::Felt;
1616
use swiftness_commitment::table::{commit::table_commit, decommit::table_decommit};
1717
use swiftness_field::SimpleField;
18-
use swiftness_hash::{pedersen::PedersenHash, poseidon::PoseidonHash};
18+
use swiftness_hash::{blake2s::Blake2sHash, keccak::KeccakHash, pedersen::PedersenHash, poseidon::PoseidonHash};
1919
use swiftness_transcript::ensure;
2020

2121
use super::{CompositionPolyEvalError, LayoutTrait, PublicInputError};
@@ -247,7 +247,7 @@ impl<F: SimpleField + PoseidonHash> LayoutTrait<F> for Layout {
247247
commitment: crate::trace::Commitment<Self::InteractionElements, F>,
248248
decommitment: crate::trace::Decommitment<F>,
249249
witness: crate::trace::Witness<F>,
250-
) -> Result<(), crate::trace::decommit::Error<F>> {
250+
) -> Result<(), crate::trace::decommit::Error<F>> where F: KeccakHash + Blake2sHash {
251251
Ok(table_decommit(commitment.original, queries, decommitment.original, witness.original)
252252
.and(table_decommit(
253253
commitment.interaction,

‎air/src/layout/starknet/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use global_values::{CurveConfig, EcPoint, EcdsaSigConfig, GlobalValues, Interact
2121
use starknet_crypto::Felt;
2222
use swiftness_commitment::table::{commit::table_commit, decommit::table_decommit};
2323
use swiftness_field::SimpleField;
24-
use swiftness_hash::{pedersen::PedersenHash, poseidon::PoseidonHash};
24+
use swiftness_hash::{blake2s::Blake2sHash, keccak::KeccakHash, pedersen::PedersenHash, poseidon::PoseidonHash};
2525
use swiftness_transcript::ensure;
2626

2727
use super::{CompositionPolyEvalError, LayoutTrait, PublicInputError};
@@ -333,7 +333,7 @@ impl<F: SimpleField + PoseidonHash> LayoutTrait<F> for Layout {
333333
commitment: crate::trace::Commitment<Self::InteractionElements, F>,
334334
decommitment: crate::trace::Decommitment<F>,
335335
witness: crate::trace::Witness<F>,
336-
) -> Result<(), crate::trace::decommit::Error<F>> {
336+
) -> Result<(), crate::trace::decommit::Error<F>> where F: KeccakHash + Blake2sHash {
337337
Ok(table_decommit(commitment.original, queries, decommitment.original, witness.original)
338338
.and(table_decommit(
339339
commitment.interaction,

‎air/src/layout/starknet_with_keccak/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use global_values::{CurveConfig, EcPoint, EcdsaSigConfig, GlobalValues, Interact
2323
use starknet_crypto::Felt;
2424
use swiftness_commitment::table::{commit::table_commit, decommit::table_decommit};
2525
use swiftness_field::SimpleField;
26-
use swiftness_hash::{pedersen::PedersenHash, poseidon::PoseidonHash};
26+
use swiftness_hash::{blake2s::Blake2sHash, keccak::KeccakHash, pedersen::PedersenHash, poseidon::PoseidonHash};
2727
use swiftness_transcript::ensure;
2828

2929
use super::{CompositionPolyEvalError, LayoutTrait, PublicInputError};
@@ -368,7 +368,7 @@ impl<F: SimpleField + PoseidonHash> LayoutTrait<F> for Layout {
368368
commitment: crate::trace::Commitment<Self::InteractionElements, F>,
369369
decommitment: crate::trace::Decommitment<F>,
370370
witness: crate::trace::Witness<F>,
371-
) -> Result<(), crate::trace::decommit::Error<F>> {
371+
) -> Result<(), crate::trace::decommit::Error<F>> where F: KeccakHash + Blake2sHash {
372372
Ok(table_decommit(commitment.original, queries, decommitment.original, witness.original)
373373
.and(table_decommit(
374374
commitment.interaction,

‎air/src/lib.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![no_std]
2-
31
extern crate alloc;
42

53
#[cfg(feature = "std")]

0 commit comments

Comments
 (0)