gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-16 20:39:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into add-chain-benchmarks

Browse Source
This commit is contained in:
Paul Hauner
2019-02-05 05:49:45 +11:00
parent d83bafae10 ad486c687a
commit 0120082f6b
4 changed files with 31 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eth2/utils/bls/Cargo.toml
View File

@@ -5,7 +5,7 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
edition = "2018"
[dependencies]
bls-aggregates = { git = "https://github.com/sigp/signature-schemes" }
bls-aggregates = { git = "https://github.com/sigp/signature-schemes", tag = "v0.3.0" }
hashing = { path = "../hashing" }
hex = "0.3"
serde = "1.0"

3
eth2/utils/ssz/src/tree_hash.rs
View File

@@ -30,8 +30,9 @@ pub fn merkle_hash(list: &mut Vec<Vec<u8>>) -> Vec<u8> {
// Hash two chuncks together
new_chunkz.append(&mut hash(two_chunks));
}
chunk_size = HASHSIZE;
}
chunk_size = HASHSIZE;
chunkz = new_chunkz;
}