gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-04-18 21:38:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/unstable' into tree-states

Browse Source
This commit is contained in:
Michael Sproul
2023-10-19 12:07:35 +11:00
parent bb6675e42d 98cac2bc6b
commit 72d8c3852c
189 changed files with 1475 additions and 951 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
consensus/proto_array/Cargo.toml
View File

@@ -13,7 +13,6 @@ types = { workspace = true }
ethereum_ssz = { workspace = true }
ethereum_ssz_derive = { workspace = true }
serde = { workspace = true }
serde_derive = "1.0.116"
serde_yaml = { workspace = true }
safe_arith = { workspace = true }
superstruct = { workspace = true }
superstruct = { workspace = true }

2
consensus/proto_array/src/fork_choice_test_definition.rs
View File

@@ -5,7 +5,7 @@ mod votes;
use crate::proto_array_fork_choice::{Block, ExecutionStatus, ProtoArrayForkChoice};
use crate::{InvalidationOperation, JustifiedBalances};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use std::collections::BTreeSet;
use types::{
AttestationShufflingId, Checkpoint, Epoch, EthSpec, ExecutionBlockHash, Hash256,

2
consensus/proto_array/src/proto_array.rs
View File

@@ -1,6 +1,6 @@
use crate::error::InvalidBestNodeInfo;
use crate::{error::Error, Block, ExecutionStatus, JustifiedBalances};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::four_byte_option_impl;
use ssz::Encode;
use ssz_derive::{Decode, Encode};

2
consensus/proto_array/src/proto_array_fork_choice.rs
View File

@@ -7,7 +7,7 @@ use crate::{
ssz_container::SszContainer,
JustifiedBalances,
};
use serde_derive::{Deserialize, Serialize};
use serde::{Deserialize, Serialize};
use ssz::{Decode, Encode};
use ssz_derive::{Decode, Encode};
use std::{