b22ac95d7f
## Issue Addressed Resolves: https://github.com/sigp/lighthouse/issues/2741 Includes: https://github.com/sigp/lighthouse/pull/2853 so that we can get ssz static tests passing here on v1.1.6. If we want to merge that first, we can make this diff slightly smaller ## Proposed Changes - Changes the `justified_epoch` and `finalized_epoch` in the `ProtoArrayNode` each to an `Option<Checkpoint>`. The `Option` is necessary only for the migration, so not ideal. But does allow us to add a default logic to `None` on these fields during the database migration. - Adds a database migration from a legacy fork choice struct to the new one, search for all necessary block roots in fork choice by iterating through blocks in the db. - updates related to https://github.com/ethereum/consensus-specs/pull/2727 - We will have to update the persisted forkchoice to make sure the justified checkpoint stored is correct according to the updated fork choice logic. This boils down to setting the forkchoice store's justified checkpoint to the justified checkpoint of the block that advanced the finalized checkpoint to the current one. - AFAICT there's no migration steps necessary for the update to allow applying attestations from prior blocks, but would appreciate confirmation on that - I updated the consensus spec tests to v1.1.6 here, but they will fail until we also implement the proposer score boost updates. I confirmed that the previously failing scenario `new_finalized_slot_is_justified_checkpoint_ancestor` will now pass after the boost updates, but haven't confirmed _all_ tests will pass because I just quickly stubbed out the proposer boost test scenario formatting. - This PR now also includes proposer boosting https://github.com/ethereum/consensus-specs/pull/2730 ## Additional Info I realized checking justified and finalized roots in fork choice makes it more likely that we trigger this bug: https://github.com/ethereum/consensus-specs/pull/2727 It's possible the combination of justified checkpoint and finalized checkpoint in the forkchoice store is different from in any block in fork choice. So when trying to startup our store's justified checkpoint seems invalid to the rest of fork choice (but it should be valid). When this happens we get an `InvalidBestNode` error and fail to start up. So I'm including that bugfix in this branch. Todo: - [x] Fix fork choice tests - [x] Self review - [x] Add fix for https://github.com/ethereum/consensus-specs/pull/2727 - [x] Rebase onto Kintusgi - [x] Fix `num_active_validators` calculation as @michaelsproul pointed out - [x] Clean up db migrations Co-authored-by: realbigsean <seananderson33@gmail.com>
66 lines
2.2 KiB
TOML
66 lines
2.2 KiB
TOML
[package]
|
|
name = "beacon_chain"
|
|
version = "0.2.0"
|
|
authors = ["Paul Hauner <paul@paulhauner.com>", "Age Manning <Age@AgeManning.com>"]
|
|
edition = "2018"
|
|
autotests = false # using a single test binary compiles faster
|
|
|
|
[features]
|
|
default = ["participation_metrics"]
|
|
write_ssz_files = [] # Writes debugging .ssz files to /tmp during block processing.
|
|
participation_metrics = [] # Exposes validator participation metrics to Prometheus.
|
|
fork_from_env = [] # Initialise the harness chain spec from the FORK_NAME env variable
|
|
|
|
[dev-dependencies]
|
|
maplit = "1.0.2"
|
|
environment = { path = "../../lighthouse/environment" }
|
|
|
|
[dependencies]
|
|
merkle_proof = { path = "../../consensus/merkle_proof" }
|
|
store = { path = "../store" }
|
|
parking_lot = "0.11.0"
|
|
lazy_static = "1.4.0"
|
|
smallvec = "1.6.1"
|
|
lighthouse_metrics = { path = "../../common/lighthouse_metrics" }
|
|
operation_pool = { path = "../operation_pool" }
|
|
rayon = "1.4.1"
|
|
serde = "1.0.116"
|
|
serde_derive = "1.0.116"
|
|
slog = { version = "2.5.2", features = ["max_level_trace"] }
|
|
sloggers = { version = "2.1.1", features = ["json"] }
|
|
slot_clock = { path = "../../common/slot_clock" }
|
|
eth2_hashing = "0.2.0"
|
|
eth2_ssz = "0.4.1"
|
|
eth2_ssz_types = "0.2.2"
|
|
eth2_ssz_derive = "0.3.0"
|
|
state_processing = { path = "../../consensus/state_processing" }
|
|
tree_hash = "0.4.1"
|
|
types = { path = "../../consensus/types" }
|
|
tokio = "1.14.0"
|
|
eth1 = { path = "../eth1" }
|
|
futures = "0.3.7"
|
|
genesis = { path = "../genesis" }
|
|
int_to_bytes = { path = "../../consensus/int_to_bytes" }
|
|
rand = "0.7.3"
|
|
proto_array = { path = "../../consensus/proto_array" }
|
|
lru = "0.6.0"
|
|
tempfile = "3.1.0"
|
|
bitvec = "0.19.3"
|
|
bls = { path = "../../crypto/bls" }
|
|
safe_arith = { path = "../../consensus/safe_arith" }
|
|
fork_choice = { path = "../../consensus/fork_choice" }
|
|
task_executor = { path = "../../common/task_executor" }
|
|
derivative = "2.1.1"
|
|
itertools = "0.10.0"
|
|
slasher = { path = "../../slasher" }
|
|
eth2 = { path = "../../common/eth2" }
|
|
strum = { version = "0.21.0", features = ["derive"] }
|
|
logging = { path = "../../common/logging" }
|
|
execution_layer = { path = "../execution_layer" }
|
|
sensitive_url = { path = "../../common/sensitive_url" }
|
|
superstruct = "0.3.0"
|
|
|
|
[[test]]
|
|
name = "beacon_chain_tests"
|
|
path = "tests/main.rs"
|