mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-14 18:32:42 +00:00
- 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>
82 lines
2.0 KiB
Rust
82 lines
2.0 KiB
Rust
//! Provides utilities for parsing 0x-prefixed hex strings.
|
|
|
|
use serde::de::{self, Visitor};
|
|
use std::fmt;
|
|
|
|
/// Encode `data` as a 0x-prefixed hex string.
|
|
pub fn encode<T: AsRef<[u8]>>(data: T) -> String {
|
|
let hex = hex::encode(data);
|
|
let mut s = "0x".to_string();
|
|
s.push_str(hex.as_str());
|
|
s
|
|
}
|
|
|
|
/// Decode `data` from a 0x-prefixed hex string.
|
|
pub fn decode(s: &str) -> Result<Vec<u8>, String> {
|
|
if s.starts_with("0x") {
|
|
hex::decode(&s[2..]).map_err(|e| format!("invalid hex: {:?}", e))
|
|
} else {
|
|
Err("hex must have 0x prefix".to_string())
|
|
}
|
|
}
|
|
|
|
pub struct PrefixedHexVisitor;
|
|
|
|
impl<'de> Visitor<'de> for PrefixedHexVisitor {
|
|
type Value = Vec<u8>;
|
|
|
|
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
|
|
formatter.write_str("a hex string with 0x prefix")
|
|
}
|
|
|
|
fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
|
|
where
|
|
E: de::Error,
|
|
{
|
|
if value.starts_with("0x") {
|
|
Ok(hex::decode(&value[2..])
|
|
.map_err(|e| de::Error::custom(format!("invalid hex ({:?})", e)))?)
|
|
} else {
|
|
Err(de::Error::custom("missing 0x prefix"))
|
|
}
|
|
}
|
|
}
|
|
|
|
pub struct HexVisitor;
|
|
|
|
impl<'de> Visitor<'de> for HexVisitor {
|
|
type Value = Vec<u8>;
|
|
|
|
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
|
|
formatter.write_str("a hex string (irrelevant of prefix)")
|
|
}
|
|
|
|
fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
|
|
where
|
|
E: de::Error,
|
|
{
|
|
Ok(hex::decode(value.trim_start_matches("0x"))
|
|
.map_err(|e| de::Error::custom(format!("invalid hex ({:?})", e)))?)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn encoding() {
|
|
let bytes = vec![0, 255];
|
|
let hex = encode(&bytes);
|
|
assert_eq!(hex.as_str(), "0x00ff");
|
|
|
|
let bytes = vec![];
|
|
let hex = encode(&bytes);
|
|
assert_eq!(hex.as_str(), "0x");
|
|
|
|
let bytes = vec![1, 2, 3];
|
|
let hex = encode(&bytes);
|
|
assert_eq!(hex.as_str(), "0x010203");
|
|
}
|
|
}
|