cdec3cec18
- Resolves #1550 - Resolves #824 - Resolves #825 - Resolves #1131 - Resolves #1411 - Resolves #1256 - Resolve #1177 - Includes the `ShufflingId` struct initially defined in #1492. That PR is now closed and the changes are included here, with significant bug fixes. - Implement the https://github.com/ethereum/eth2.0-APIs in a new `http_api` crate using `warp`. This replaces the `rest_api` crate. - Add a new `common/eth2` crate which provides a wrapper around `reqwest`, providing the HTTP client that is used by the validator client and for testing. This replaces the `common/remote_beacon_node` crate. - Create a `http_metrics` crate which is a dedicated server for Prometheus metrics (they are no longer served on the same port as the REST API). We now have flags for `--metrics`, `--metrics-address`, etc. - Allow the `subnet_id` to be an optional parameter for `VerifiedUnaggregatedAttestation::verify`. This means it does not need to be provided unnecessarily by the validator client. - Move `fn map_attestation_committee` in `mod beacon_chain::attestation_verification` to a new `fn with_committee_cache` on the `BeaconChain` so the same cache can be used for obtaining validator duties. - Add some other helpers to `BeaconChain` to assist with common API duties (e.g., `block_root_at_slot`, `head_beacon_block_root`). - Change the `NaiveAggregationPool` so it can index attestations by `hash_tree_root(attestation.data)`. This is a requirement of the API. - Add functions to `BeaconChainHarness` to allow it to create slashings and exits. - Allow for `eth1::Eth1NetworkId` to go to/from a `String`. - Add functions to the `OperationPool` to allow getting all objects in the pool. - Add function to `BeaconState` to check if a committee cache is initialized. - Fix bug where `seconds_per_eth1_block` was not transferring over from `YamlConfig` to `ChainSpec`. - Add the `deposit_contract_address` to `YamlConfig` and `ChainSpec`. We needed to be able to return it in an API response. - Change some uses of serde `serialize_with` and `deserialize_with` to a single use of `with` (code quality). - Impl `Display` and `FromStr` for several BLS fields. - Check for clock discrepancy when VC polls BN for sync state (with +/- 1 slot tolerance). This is not intended to be comprehensive, it was just easy to do. - See #1434 for a per-endpoint overview. - Seeking clarity here: https://github.com/ethereum/eth2.0-APIs/issues/75 - [x] Add docs for prom port to close #1256 - [x] Follow up on this #1177 - [x] ~~Follow up with #1424~~ Will fix in future PR. - [x] Follow up with #1411 - [x] ~~Follow up with #1260~~ Will fix in future PR. - [x] Add quotes to all integers. - [x] Remove `rest_types` - [x] Address missing beacon block error. (#1629) - [x] ~~Add tests for lighthouse/peers endpoints~~ Wontfix - [x] ~~Follow up with validator status proposal~~ Tracked in #1434 - [x] Unify graffiti structs - [x] ~~Start server when waiting for genesis?~~ Will fix in future PR. - [x] TODO in http_api tests - [x] Move lighthouse endpoints off /eth/v1 - [x] Update docs to link to standard - ~~Blocked on #1586~~ Co-authored-by: Michael Sproul <michael@sigmaprime.io>
204 lines
6.9 KiB
Rust
204 lines
6.9 KiB
Rust
mod ffg_updates;
|
|
mod no_votes;
|
|
mod votes;
|
|
|
|
use crate::proto_array_fork_choice::{Block, ProtoArrayForkChoice};
|
|
use serde_derive::{Deserialize, Serialize};
|
|
use types::{Epoch, Hash256, ShufflingId, Slot};
|
|
|
|
pub use ffg_updates::*;
|
|
pub use no_votes::*;
|
|
pub use votes::*;
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub enum Operation {
|
|
FindHead {
|
|
justified_epoch: Epoch,
|
|
justified_root: Hash256,
|
|
finalized_epoch: Epoch,
|
|
justified_state_balances: Vec<u64>,
|
|
expected_head: Hash256,
|
|
},
|
|
InvalidFindHead {
|
|
justified_epoch: Epoch,
|
|
justified_root: Hash256,
|
|
finalized_epoch: Epoch,
|
|
justified_state_balances: Vec<u64>,
|
|
},
|
|
ProcessBlock {
|
|
slot: Slot,
|
|
root: Hash256,
|
|
parent_root: Hash256,
|
|
justified_epoch: Epoch,
|
|
finalized_epoch: Epoch,
|
|
},
|
|
ProcessAttestation {
|
|
validator_index: usize,
|
|
block_root: Hash256,
|
|
target_epoch: Epoch,
|
|
},
|
|
Prune {
|
|
finalized_root: Hash256,
|
|
prune_threshold: usize,
|
|
expected_len: usize,
|
|
},
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct ForkChoiceTestDefinition {
|
|
pub finalized_block_slot: Slot,
|
|
pub justified_epoch: Epoch,
|
|
pub finalized_epoch: Epoch,
|
|
pub finalized_root: Hash256,
|
|
pub operations: Vec<Operation>,
|
|
}
|
|
|
|
impl ForkChoiceTestDefinition {
|
|
pub fn run(self) {
|
|
let junk_shuffling_id = ShufflingId::from_components(Epoch::new(0), Hash256::zero());
|
|
let mut fork_choice = ProtoArrayForkChoice::new(
|
|
self.finalized_block_slot,
|
|
Hash256::zero(),
|
|
self.justified_epoch,
|
|
self.finalized_epoch,
|
|
self.finalized_root,
|
|
junk_shuffling_id.clone(),
|
|
junk_shuffling_id,
|
|
)
|
|
.expect("should create fork choice struct");
|
|
|
|
for (op_index, op) in self.operations.into_iter().enumerate() {
|
|
match op.clone() {
|
|
Operation::FindHead {
|
|
justified_epoch,
|
|
justified_root,
|
|
finalized_epoch,
|
|
justified_state_balances,
|
|
expected_head,
|
|
} => {
|
|
let head = fork_choice
|
|
.find_head(
|
|
justified_epoch,
|
|
justified_root,
|
|
finalized_epoch,
|
|
&justified_state_balances,
|
|
)
|
|
.unwrap_or_else(|_| {
|
|
panic!("find_head op at index {} returned error", op_index)
|
|
});
|
|
|
|
assert_eq!(
|
|
head, expected_head,
|
|
"Operation at index {} failed checks. Operation: {:?}",
|
|
op_index, op
|
|
);
|
|
check_bytes_round_trip(&fork_choice);
|
|
}
|
|
Operation::InvalidFindHead {
|
|
justified_epoch,
|
|
justified_root,
|
|
finalized_epoch,
|
|
justified_state_balances,
|
|
} => {
|
|
let result = fork_choice.find_head(
|
|
justified_epoch,
|
|
justified_root,
|
|
finalized_epoch,
|
|
&justified_state_balances,
|
|
);
|
|
|
|
assert!(
|
|
result.is_err(),
|
|
"Operation at index {} . Operation: {:?}",
|
|
op_index,
|
|
op
|
|
);
|
|
check_bytes_round_trip(&fork_choice);
|
|
}
|
|
Operation::ProcessBlock {
|
|
slot,
|
|
root,
|
|
parent_root,
|
|
justified_epoch,
|
|
finalized_epoch,
|
|
} => {
|
|
let block = Block {
|
|
slot,
|
|
root,
|
|
parent_root: Some(parent_root),
|
|
state_root: Hash256::zero(),
|
|
target_root: Hash256::zero(),
|
|
current_epoch_shuffling_id: ShufflingId::from_components(
|
|
Epoch::new(0),
|
|
Hash256::zero(),
|
|
),
|
|
next_epoch_shuffling_id: ShufflingId::from_components(
|
|
Epoch::new(0),
|
|
Hash256::zero(),
|
|
),
|
|
justified_epoch,
|
|
finalized_epoch,
|
|
};
|
|
fork_choice.process_block(block).unwrap_or_else(|e| {
|
|
panic!(
|
|
"process_block op at index {} returned error: {:?}",
|
|
op_index, e
|
|
)
|
|
});
|
|
check_bytes_round_trip(&fork_choice);
|
|
}
|
|
Operation::ProcessAttestation {
|
|
validator_index,
|
|
block_root,
|
|
target_epoch,
|
|
} => {
|
|
fork_choice
|
|
.process_attestation(validator_index, block_root, target_epoch)
|
|
.unwrap_or_else(|_| {
|
|
panic!(
|
|
"process_attestation op at index {} returned error",
|
|
op_index
|
|
)
|
|
});
|
|
check_bytes_round_trip(&fork_choice);
|
|
}
|
|
Operation::Prune {
|
|
finalized_root,
|
|
prune_threshold,
|
|
expected_len,
|
|
} => {
|
|
fork_choice.set_prune_threshold(prune_threshold);
|
|
fork_choice
|
|
.maybe_prune(finalized_root)
|
|
.expect("update_finalized_root op at index {} returned error");
|
|
|
|
// Ensure that no pruning happened.
|
|
assert_eq!(
|
|
fork_choice.len(),
|
|
expected_len,
|
|
"Prune op at index {} failed with {} instead of {}",
|
|
op_index,
|
|
fork_choice.len(),
|
|
expected_len
|
|
);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Gives a hash that is not the zero hash (unless i is `usize::max_value)`.
|
|
fn get_hash(i: u64) -> Hash256 {
|
|
Hash256::from_low_u64_be(i)
|
|
}
|
|
|
|
fn check_bytes_round_trip(original: &ProtoArrayForkChoice) {
|
|
let bytes = original.as_bytes();
|
|
let decoded =
|
|
ProtoArrayForkChoice::from_bytes(&bytes).expect("fork choice should decode from bytes");
|
|
assert!(
|
|
*original == decoded,
|
|
"fork choice should encode and decode without change"
|
|
);
|
|
}
|