zecfoundation
/
zebra
mirror of https://github.com/ZcashFoundation/zebra.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Compiles

This commit is contained in:
Deirdre Connolly 2021-10-05 11:45:24 -04:00
parent a520018114
commit e99fa49258
5 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Cargo.lock generated
View File

@ -1869,16 +1869,7 @@ dependencies = [
[[package]]
name = "incrementalmerkletree"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16d75fb342984cc8cea665a9ef5607b4956569839ca098172082fa1b19bdaf02"
dependencies = [
"serde",
]
[[package]]
name = "incrementalmerkletree"
version = "0.1.0"
source = "git+https://github.com/zcash/incrementalmerkletree.git?rev=b7bd6246122a6e9ace8edb51553fbf5228906cbb#b7bd6246122a6e9ace8edb51553fbf5228906cbb"
source = "git+https://github.com/zcash/incrementalmerkletree?rev=b7bd6246122a6e9ace8edb51553fbf5228906cbb#b7bd6246122a6e9ace8edb51553fbf5228906cbb"
dependencies = [
"serde",
]
@ -2475,7 +2466,7 @@ dependencies = [
"fpe 0.5.0",
"group 0.11.0",
"halo2",
"incrementalmerkletree 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"incrementalmerkletree",
"lazy_static",
"memuse",
"nonempty",
@ -4724,7 +4715,7 @@ dependencies = [
"fpe 0.5.0",
"group 0.11.0",
"hex",
"incrementalmerkletree 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"incrementalmerkletree",
"jubjub 0.8.0",
"lazy_static",
"log",
@ -4774,10 +4765,10 @@ dependencies = [
"equihash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fpe 0.4.0",
"futures 0.3.17",
"group 0.10.0",
"group 0.11.0",
"halo2",
"hex",
"incrementalmerkletree 0.1.0 (git+https://github.com/zcash/incrementalmerkletree.git?rev=b7bd6246122a6e9ace8edb51553fbf5228906cbb)",
"incrementalmerkletree",
"itertools 0.10.1",
"jubjub 0.7.0",
"lazy_static",

2
Cargo.toml
View File

@ -33,5 +33,7 @@ tower = { git = "https://github.com/tower-rs/tower", rev = "d4d1c67c6a0e4213a52a
# TODO: remove these after a new librustzcash release.
# These are librustzcash requirements specified in its workspace Cargo.toml that we must replicate here
incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "b7bd6246122a6e9ace8edb51553fbf5228906cbb" }
orchard = { git = "https://github.com/zcash/orchard.git", rev = "2c8241f25b943aa05203eacf9905db117c69bd29" }
zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "53d0a51d33a421cb76d3e3124d1e4c1c9036068e" }
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "53d0a51d33a421cb76d3e3124d1e4c1c9036068e" }

4
zebra-chain/Cargo.toml
View File

@ -27,10 +27,10 @@ chrono = { version = "0.4", features = ["serde"] }
displaydoc = "0.2.2"
fpe = "0.4"
futures = "0.3"
group = "0.10"
group = "0.11"
halo2 = "=0.1.0-beta.1"
hex = "0.4"
incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "b7bd6246122a6e9ace8edb51553fbf5228906cbb" }
incrementalmerkletree = "0.1.0"
jubjub = "0.7.0"
lazy_static = "1.4.0"
rand_core = "0.6"

6
zebra-chain/src/orchard/tree.rs
View File

@ -294,16 +294,14 @@ impl NoteCommitmentTree {
///
/// For Orchard, the tree is capped at 2^32.
pub fn count(&self) -> u64 {
self.inner
.position()
.map_or(0, |pos| usize::from(pos) as u64 + 1)
self.inner.position().map_or(0, |pos| u64::from(pos) + 1)
}
}
impl Default for NoteCommitmentTree {
fn default() -> Self {
Self {
inner: bridgetree::Frontier::new(),
inner: bridgetree::Frontier::empty(),
cached_root: Default::default(),
}
}

6
zebra-chain/src/sapling/tree.rs
View File

@ -257,16 +257,14 @@ impl NoteCommitmentTree {
///
/// For Sapling, the tree is capped at 2^32.
pub fn count(&self) -> u64 {
self.inner
.position()
.map_or(0, |pos| usize::from(pos) as u64 + 1)
self.inner.position().map_or(0, |pos| u64::from(pos) + 1)
}
}
impl Default for NoteCommitmentTree {
fn default() -> Self {
Self {
inner: bridgetree::Frontier::new(),
inner: bridgetree::Frontier::empty(),
cached_root: Default::default(),
}
}