Validator client fixes. Hack fix for genesis start time

This commit is contained in:
Age Manning
2019-03-31 14:26:58 +11:00
parent b4c21ccca3
commit 33473892f2
5 changed files with 41 additions and 17 deletions

View File

@@ -37,14 +37,29 @@ impl AttestationService for AttestationServiceInstance {
let state = self.chain.get_state();
// Start by performing some checks
// Check that the the AttestionData is for the current slot (otherwise it will not be valid)
if slot_requested != state.slot.as_u64() {
// Check that the AttestionData is for the current slot (otherwise it will not be valid)
if slot_requested > state.slot.as_u64() {
let log_clone = self.log.clone();
let f = sink
.fail(RpcStatus::new(
RpcStatusCode::OutOfRange,
Some(format!(
"AttestationData request for a slot that is not the current slot."
"AttestationData request for a slot that is in the future."
)),
))
.map_err(move |e| {
error!(log_clone, "Failed to reply with failure {:?}: {:?}", req, e)
});
return ctx.spawn(f);
}
// currently cannot handle past slots. TODO: Handle this case
else if slot_requested < state.slot.as_u64() {
let log_clone = self.log.clone();
let f = sink
.fail(RpcStatus::new(
RpcStatusCode::InvalidArgument,
Some(format!(
"AttestationData request for a slot that is in the past."
)),
))
.map_err(move |e| {
@@ -71,6 +86,9 @@ impl AttestationService for AttestationServiceInstance {
}
};
dbg!("Produced attestation");
dbg!(attestation_data.clone());
let mut attestation_data_proto = AttestationDataProto::new();
attestation_data_proto.set_ssz(ssz_encode(&attestation_data));

View File

@@ -30,22 +30,11 @@ impl ValidatorService for ValidatorServiceInstance {
trace!(self.log, "RPC request"; "endpoint" => "GetValidatorDuties", "epoch" => req.get_epoch());
let spec = self.chain.get_spec();
// update the caches if necessary
{
let mut mut_state = self.chain.get_mut_state();
let _ = mut_state.build_epoch_cache(RelativeEpoch::NextWithoutRegistryChange, spec);
let _ = mut_state.build_epoch_cache(RelativeEpoch::NextWithRegistryChange, spec);
let _ = mut_state.update_pubkey_cache();
}
let state = self.chain.get_state();
let epoch = Epoch::from(req.get_epoch());
let mut resp = GetDutiesResponse::new();
let resp_validators = resp.mut_active_validators();
let state = self.chain.get_state();
let relative_epoch =
match RelativeEpoch::from_epoch(state.slot.epoch(spec.slots_per_epoch), epoch) {
Ok(v) => v,