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>
98 lines
2.5 KiB
Rust
98 lines
2.5 KiB
Rust
//! Formats `Vec<u64>` using quotes.
|
|
//!
|
|
//! E.g., `vec![0, 1, 2]` serializes as `["0", "1", "2"]`.
|
|
//!
|
|
//! Quotes can be optional during decoding.
|
|
|
|
use serde::ser::SerializeSeq;
|
|
use serde::{Deserializer, Serializer};
|
|
use serde_derive::{Deserialize, Serialize};
|
|
|
|
#[derive(Serialize, Deserialize)]
|
|
#[serde(transparent)]
|
|
pub struct QuotedIntWrapper {
|
|
#[serde(with = "crate::quoted_u64")]
|
|
pub int: u64,
|
|
}
|
|
|
|
pub struct QuotedIntVecVisitor;
|
|
impl<'a> serde::de::Visitor<'a> for QuotedIntVecVisitor {
|
|
type Value = Vec<u64>;
|
|
|
|
fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
|
|
write!(formatter, "a list of quoted or unquoted integers")
|
|
}
|
|
|
|
fn visit_seq<A>(self, mut seq: A) -> Result<Self::Value, A::Error>
|
|
where
|
|
A: serde::de::SeqAccess<'a>,
|
|
{
|
|
let mut vec = vec![];
|
|
|
|
while let Some(val) = seq.next_element()? {
|
|
let val: QuotedIntWrapper = val;
|
|
vec.push(val.int);
|
|
}
|
|
|
|
Ok(vec)
|
|
}
|
|
}
|
|
|
|
pub fn serialize<S>(value: &[u64], serializer: S) -> Result<S::Ok, S::Error>
|
|
where
|
|
S: Serializer,
|
|
{
|
|
let mut seq = serializer.serialize_seq(Some(value.len()))?;
|
|
for &int in value {
|
|
seq.serialize_element(&QuotedIntWrapper { int })?;
|
|
}
|
|
seq.end()
|
|
}
|
|
|
|
pub fn deserialize<'de, D>(deserializer: D) -> Result<Vec<u64>, D::Error>
|
|
where
|
|
D: Deserializer<'de>,
|
|
{
|
|
deserializer.deserialize_any(QuotedIntVecVisitor)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[derive(Debug, Serialize, Deserialize)]
|
|
struct Obj {
|
|
#[serde(with = "crate::quoted_u64_vec")]
|
|
values: Vec<u64>,
|
|
}
|
|
|
|
#[test]
|
|
fn quoted_list_success() {
|
|
let obj: Obj = serde_json::from_str(r#"{ "values": ["1", "2", "3", "4"] }"#).unwrap();
|
|
assert_eq!(obj.values, vec![1, 2, 3, 4]);
|
|
}
|
|
|
|
#[test]
|
|
fn unquoted_list_success() {
|
|
let obj: Obj = serde_json::from_str(r#"{ "values": [1, 2, 3, 4] }"#).unwrap();
|
|
assert_eq!(obj.values, vec![1, 2, 3, 4]);
|
|
}
|
|
|
|
#[test]
|
|
fn mixed_list_success() {
|
|
let obj: Obj = serde_json::from_str(r#"{ "values": ["1", 2, "3", "4"] }"#).unwrap();
|
|
assert_eq!(obj.values, vec![1, 2, 3, 4]);
|
|
}
|
|
|
|
#[test]
|
|
fn empty_list_success() {
|
|
let obj: Obj = serde_json::from_str(r#"{ "values": [] }"#).unwrap();
|
|
assert!(obj.values.is_empty());
|
|
}
|
|
|
|
#[test]
|
|
fn whole_list_quoted_err() {
|
|
serde_json::from_str::<Obj>(r#"{ "values": "[1, 2, 3, 4]" }"#).unwrap_err();
|
|
}
|
|
}
|