Skip to content

Commit 7d7c714

Browse files
authored
Merge pull request #210 from WizardOfMenlo/recmo/merkle-tree-2
Merkle Tree
2 parents b8cc199 + 9e3a7f9 commit 7d7c714

58 files changed

Lines changed: 2484 additions & 2881 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

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

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ version = "0.1.0"
44
edition = "2021"
55

66
default-run = "main"
7-
rust-version = "1.83.0"
7+
rust-version = "1.87.0"
88

99
[lints.clippy]
1010
# all lints that are on by default (correctness, suspicious, style, complexity, perf)
@@ -36,9 +36,8 @@ redundant_closure_for_method_calls = "allow"
3636
ark-std = { version = "0.5", features = ["std"] }
3737
ark-ff = { version = "0.5", features = ["asm", "std"] }
3838
ark-serialize = "0.5"
39-
ark-crypto-primitives = { version = "0.5", features = ["merkle_tree"] }
4039
ark-poly = "0.5"
41-
blake3 = { version = "1.5", features = ["digest"] }
40+
blake3 = { version = "1.5", features = ["digest", "traits-preview"] }
4241
sha3 = { version = "0.10.7", features = ["asm", "oid"] }
4342
clap = { version = "4.4", features = ["derive"] }
4443
serde = { version = "1.0", features = ["derive"] }
@@ -55,6 +54,8 @@ digest = { version = "0.10.7", features = ["oid"] }
5554
sha2 = { version = "0.10.9", features = ["oid", "asm"] }
5655
zerocopy = "0.8.33"
5756
hex-literal = "0.4.1"
57+
const-oid = "0.9.6"
58+
arrayvec = "0.7.6"
5859

5960
[dev-dependencies]
6061
proptest = "1.0"
@@ -70,7 +71,6 @@ parallel = [
7071
"dep:rayon",
7172
"ark-poly/parallel",
7273
"ark-ff/parallel",
73-
"ark-crypto-primitives/parallel",
7474
]
7575
rayon = ["dep:rayon"]
7676
asm = ["ark-ff/asm"]

0 commit comments

Comments
 (0)