Skip to content

Commit

Permalink
Merge pull request #436 from zcash/incrementalmerkletree_0.7
Browse files Browse the repository at this point in the history
Migrate to incrementalmerkletree version 0.7
  • Loading branch information
str4d authored Sep 26, 2024
2 parents ce1be62 + 55fb089 commit 85249b4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ and this project adheres to Rust's notion of

## [Unreleased]

### Changed
- Migrated to `incrementalmerkletree 0.7`.

## [0.9.1] - 2024-08-13

### Changed
Expand All @@ -21,7 +24,7 @@ and this project adheres to Rust's notion of
generation is specified (https://github.com/zcash/zips/pull/883).

### Changed
- Migrated to `incrementalmerkletree 0.6`, `bridgetree 0.5`.
- Migrated to `incrementalmerkletree 0.6`.

## [0.8.0] - 2024-03-25

Expand Down
8 changes: 4 additions & 4 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ nonempty = "0.7"
serde = { version = "1.0", features = ["derive"] }
subtle = "2.3"
zcash_note_encryption = "0.4"
incrementalmerkletree = "0.6"
incrementalmerkletree = "0.7"
zcash_spec = "0.1"
zip32 = "0.1"
visibility = "0.1.1"
Expand All @@ -55,13 +55,13 @@ image = { version = "0.24", optional = true }
plotters = { version = "0.3.0", optional = true }

[dev-dependencies]
bridgetree = "0.5"
bridgetree = "0.6"
criterion = "0.4" # 0.5 depends on clap 4 which has MSRV 1.70
halo2_gadgets = { version = "0.3", features = ["test-dependencies"] }
hex = "0.4"
proptest = "1.0.0"
zcash_note_encryption = { version = "0.4", features = ["pre-zip-212"] }
incrementalmerkletree = { version = "0.6", features = ["test-dependencies"] }
incrementalmerkletree = { version = "0.7", features = ["test-dependencies"] }

[target.'cfg(unix)'.dev-dependencies]
inferno = { version = "0.11", default-features = false, features = ["multithreaded", "nameattr"] }
Expand Down

0 comments on commit 85249b4

Please sign in to comment.