Fixing the conflicts involved patching up some of the `block_hash` verification, the rest will be done as part of https://github.com/sigp/lighthouse/issues/3870 |
||
|---|---|---|
| .. | ||
| cached_tree_hash | ||
| fork_choice | ||
| int_to_bytes | ||
| merkle_proof | ||
| proto_array | ||
| safe_arith | ||
| serde_utils | ||
| ssz | ||
| ssz_derive | ||
| ssz_types | ||
| state_processing | ||
| swap_or_not_shuffle | ||
| tree_hash | ||
| tree_hash_derive | ||
| types | ||