Diva M a9be1eae40 solve couple of merge conflicts

2023-03-02 15:46:14 -05:00

..

cached_tree_hash

Merge remote-tracking branch 'origin/unstable' into capella

2023-01-12 16:22:00 +11:00

fork_choice

Merge branch 'unstable' into off-4844

2023-03-02 15:38:00 -05:00

int_to_bytes

Update to Rust 1.59 and 2021 edition (#3038)

2022-02-25 00:10:17 +00:00

merkle_proof

Verify execution block hashes during finalized sync (#3794)

2023-01-09 03:11:59 +00:00

proto_array

Merge remote-tracking branch 'origin/unstable' into capella-merge

2023-02-14 12:07:27 +11:00

safe_arith

Inline safe_arith methods (#3229)

2022-05-31 06:09:12 +00:00

serde_utils

merge with upstream

2023-02-15 14:20:12 -05:00

ssz

Fix clippy

2023-02-10 15:34:59 +01:00

ssz_derive

Allow leading skipped tuple fields

2023-01-09 15:56:17 +11:00

ssz_types

Merge branch 'unstable' into off-4844

2023-03-02 15:38:00 -05:00

state_processing

solve couple of merge conflicts

2023-03-02 15:46:14 -05:00

swap_or_not_shuffle

Verify execution block hashes during finalized sync (#3794)

2023-01-09 03:11:59 +00:00

tree_hash

Disable use of system time in tests

2023-02-14 13:33:38 +01:00

tree_hash_derive

Use SmallVec for TreeHash packed encoding (#3581)

2022-09-16 08:54:06 +00:00

types

Merge branch 'unstable' into off-4844

2023-03-02 15:38:00 -05:00