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

feat: update to new Merkle tree API #301

Merged
merged 7 commits into from
Feb 26, 2024
Merged

feat: update to new Merkle tree API #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
51061e0
hashing update
tamirhemo Feb 23, 2024
eabe55b
change plonky3 branch
tamirhemo Feb 23, 2024
cd34036
Merge remote-tracking branch 'origin/main' into tamir/hashing
tamirhemo Feb 23, 2024
af346ad
Merge remote-tracking branch 'origin/main' into tamir/hashing
tamirhemo Feb 23, 2024
1aacaf7
clippy
tamirhemo Feb 23, 2024
2b0f433
Merge remote-tracking branch 'origin/main' into tamir/hashing
tamirhemo Feb 26, 2024
d5a1fb2
update branch
tamirhemo Feb 26, 2024
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
44 changes: 23 additions & 21 deletions Cargo.lock
View file
Open in desktop

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

38 changes: 19 additions & 19 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ debug = true
debug-assertions = true

[workspace.dependencies]
p3-air = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-field = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-commit = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-matrix = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-baby-bear = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-util = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-challenger = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-dft = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-fri = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-goldilocks = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-keccak = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-keccak-air = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-blake3 = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-mds = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-merkle-tree = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-poseidon2 = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-symmetric = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-uni-stark = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-maybe-rayon = { git = "https://github.com/succinctlabs/plonky3.git" }
p3-air = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-field = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-commit = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-matrix = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-baby-bear = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-util = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-challenger = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-dft = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-fri = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-goldilocks = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-keccak = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-keccak-air = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-blake3 = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-mds = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-merkle-tree = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-poseidon2 = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-symmetric = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-uni-stark = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
p3-maybe-rayon = { git = "https://github.com/succinctlabs/plonky3.git", branch = "tamir/new-hashing" }
2 changes: 1 addition & 1 deletion core/src/stark/quotient.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use p3_air::TwoRowMatrixView;
use p3_commit::UnivariatePcsWithLde;
use p3_field::AbstractExtensionField;
use p3_field::AbstractField;
use p3_field::PackedField;
use p3_field::PackedValue;
use p3_field::{cyclic_subgroup_coset_known_order, Field, TwoAdicField};
use p3_matrix::MatrixGet;
use p3_maybe_rayon::prelude::*;
Expand Down
Loading
Loading