Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Merkle tree config #251

Merged
merged 1 commit into from
Feb 16, 2024
Merged

fix: Merkle tree config #251

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions core/src/utils/prove.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ pub(super) mod baby_bear_keccak {
use p3_keccak::Keccak256Hash;
use p3_merkle_tree::FieldMerkleTreeMmcs;
use p3_poseidon2::{DiffusionMatrixBabybear, Poseidon2};
use p3_symmetric::{SerializingHasher32, TruncatedPermutation};
use p3_symmetric::{CompressionFunctionFromHasher, SerializingHasher32};
use serde::{Deserialize, Serialize};

use crate::stark::StarkGenericConfig;
Expand All @@ -322,7 +322,7 @@ pub(super) mod baby_bear_keccak {
pub type Perm = Poseidon2<Val, DiffusionMatrixBabybear, 16, 7>;
type MyHash = SerializingHasher32<Keccak256Hash>;

pub type MyCompress = TruncatedPermutation<Perm, 2, 8, 16>;
type MyCompress = CompressionFunctionFromHasher<Val, MyHash, 2, 8>;

pub type ValMmcs = FieldMerkleTreeMmcs<Val, MyHash, MyCompress, 8>;
pub type ChallengeMmcs = ExtensionMmcs<Val, Challenge, ValMmcs>;
Expand Down Expand Up @@ -363,7 +363,7 @@ pub(super) mod baby_bear_keccak {

let hash = MyHash::new(Keccak256Hash {});

let compress = MyCompress::new(perm.clone());
let compress = MyCompress::new(hash);

let val_mmcs = ValMmcs::new(hash, compress);

Expand Down Expand Up @@ -440,7 +440,7 @@ pub(super) mod baby_bear_blake3 {
use p3_fri::{FriConfig, TwoAdicFriPcs, TwoAdicFriPcsConfig};
use p3_merkle_tree::FieldMerkleTreeMmcs;
use p3_poseidon2::{DiffusionMatrixBabybear, Poseidon2};
use p3_symmetric::{SerializingHasher32, TruncatedPermutation};
use p3_symmetric::{CompressionFunctionFromHasher, SerializingHasher32};
use serde::{Deserialize, Serialize};

use crate::stark::StarkGenericConfig;
Expand All @@ -455,7 +455,7 @@ pub(super) mod baby_bear_blake3 {
pub type Perm = Poseidon2<Val, DiffusionMatrixBabybear, 16, 7>;
type MyHash = SerializingHasher32<Blake3>;

pub type MyCompress = TruncatedPermutation<Perm, 2, 8, 16>;
type MyCompress = CompressionFunctionFromHasher<Val, MyHash, 2, 8>;

pub type ValMmcs = FieldMerkleTreeMmcs<Val, MyHash, MyCompress, 8>;
pub type ChallengeMmcs = ExtensionMmcs<Val, Challenge, ValMmcs>;
Expand Down Expand Up @@ -499,7 +499,7 @@ pub(super) mod baby_bear_blake3 {
fn from_perm(perm: Perm) -> Self {
let hash = MyHash::new(Blake3 {});

let compress = MyCompress::new(perm.clone());
let compress = MyCompress::new(hash);

let val_mmcs = ValMmcs::new(hash, compress);

Expand Down
Loading