mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-04 01:01:41 +00:00
* Port eth1 lib to use stable futures * Port eth1_test_rig to stable futures * Port eth1 tests to stable futures * Port genesis service to stable futures * Port genesis tests to stable futures * Port beacon_chain to stable futures * Port lcli to stable futures * Fix eth1_test_rig (#1014) * Fix lcli * Port timer to stable futures * Fix timer * Port websocket_server to stable futures * Port notifier to stable futures * Add TODOS * Update hashmap hashset to stable futures * Adds panic test to hashset delay * Port remote_beacon_node to stable futures * Fix lcli merge conflicts * Non rpc stuff compiles * protocol.rs compiles * Port websockets, timer and notifier to stable futures (#1035) * Fix lcli * Port timer to stable futures * Fix timer * Port websocket_server to stable futures * Port notifier to stable futures * Add TODOS * Port remote_beacon_node to stable futures * Partial eth2-libp2p stable future upgrade * Finished first round of fighting RPC types * Further progress towards porting eth2-libp2p adds caching to discovery * Update behaviour * RPC handler to stable futures * Update RPC to master libp2p * Network service additions * Fix the fallback transport construction (#1102) * Correct warning * Remove hashmap delay * Compiling version of eth2-libp2p * Update all crates versions * Fix conversion function and add tests (#1113) * Port validator_client to stable futures (#1114) * Add PH & MS slot clock changes * Account for genesis time * Add progress on duties refactor * Add simple is_aggregator bool to val subscription * Start work on attestation_verification.rs * Add progress on ObservedAttestations * Progress with ObservedAttestations * Fix tests * Add observed attestations to the beacon chain * Add attestation observation to processing code * Add progress on attestation verification * Add first draft of ObservedAttesters * Add more tests * Add observed attesters to beacon chain * Add observers to attestation processing * Add more attestation verification * Create ObservedAggregators map * Remove commented-out code * Add observed aggregators into chain * Add progress * Finish adding features to attestation verification * Ensure beacon chain compiles * Link attn verification into chain * Integrate new attn verification in chain * Remove old attestation processing code * Start trying to fix beacon_chain tests * Split adding into pools into two functions * Add aggregation to harness * Get test harness working again * Adjust the number of aggregators for test harness * Fix edge-case in harness * Integrate new attn processing in network * Fix compile bug in validator_client * Update validator API endpoints * Fix aggreagation in test harness * Fix enum thing * Fix attestation observation bug: * Patch failing API tests * Start adding comments to attestation verification * Remove unused attestation field * Unify "is block known" logic * Update comments * Supress fork choice errors for network processing * Add todos * Tidy * Add gossip attn tests * Disallow test harness to produce old attns * Comment out in-progress tests * Partially address pruning tests * Fix failing store test * Add aggregate tests * Add comments about which spec conditions we check * Dont re-aggregate * Split apart test harness attn production * Fix compile error in network * Make progress on commented-out test * Fix skipping attestation test * Add fork choice verification tests * Tidy attn tests, remove dead code * Remove some accidentally added code * Fix clippy lint * Rename test file * Add block tests, add cheap block proposer check * Rename block testing file * Add observed_block_producers * Tidy * Switch around block signature verification * Finish block testing * Remove gossip from signature tests * First pass of self review * Fix deviation in spec * Update test spec tags * Start moving over to hashset * Finish moving observed attesters to hashmap * Move aggregation pool over to hashmap * Make fc attn borrow again * Fix rest_api compile error * Fix missing comments * Fix monster test * Uncomment increasing slots test * Address remaining comments * Remove unsafe, use cfg test * Remove cfg test flag * Fix dodgy comment * Revert "Update hashmap hashset to stable futures" This reverts commitd432378a3c. * Revert "Adds panic test to hashset delay" This reverts commit281502396f. * Ported attestation_service * Ported duties_service * Ported fork_service * More ports * Port block_service * Minor fixes * VC compiles * Update TODOS * Borrow self where possible * Ignore aggregates that are already known. * Unify aggregator modulo logic * Fix typo in logs * Refactor validator subscription logic * Avoid reproducing selection proof * Skip HTTP call if no subscriptions * Rename DutyAndState -> DutyAndProof * Tidy logs * Print root as dbg * Fix compile errors in tests * Fix compile error in test * Re-Fix attestation and duties service * Minor fixes Co-authored-by: Paul Hauner <paul@paulhauner.com> * Network crate update to stable futures * Port account_manager to stable futures (#1121) * Port account_manager to stable futures * Run async fns in tokio environment * Port rest_api crate to stable futures (#1118) * Port rest_api lib to stable futures * Reduce tokio features * Update notifier to stable futures * Builder update * Further updates * Convert self referential async functions * stable futures fixes (#1124) * Fix eth1 update functions * Fix genesis and client * Fix beacon node lib * Return appropriate runtimes from environment * Fix test rig * Refactor eth1 service update * Upgrade simulator to stable futures * Lighthouse compiles on stable futures * Remove println debugging statement * Update libp2p service, start rpc test upgrade * Update network crate for new libp2p * Update tokio::codec to futures_codec (#1128) * Further work towards RPC corrections * Correct http timeout and network service select * Use tokio runtime for libp2p * Revert "Update tokio::codec to futures_codec (#1128)" This reverts commite57aea924a. * Upgrade RPC libp2p tests * Upgrade secio fallback test * Upgrade gossipsub examples * Clean up RPC protocol * Test fixes (#1133) * Correct websocket timeout and run on os thread * Fix network test * Clean up PR * Correct tokio tcp move attestation service tests * Upgrade attestation service tests * Correct network test * Correct genesis test * Test corrections * Log info when block is received * Modify logs and update attester service events * Stable futures: fixes to vc, eth1 and account manager (#1142) * Add local testnet scripts * Remove whiteblock script * Rename local testnet script * Move spawns onto handle * Fix VC panic * Initial fix to block production issue * Tidy block producer fix * Tidy further * Add local testnet clean script * Run cargo fmt * Tidy duties service * Tidy fork service * Tidy ForkService * Tidy AttestationService * Tidy notifier * Ensure await is not suppressed in eth1 * Ensure await is not suppressed in account_manager * Use .ok() instead of .unwrap_or(()) * RPC decoding test for proto * Update discv5 and eth2-libp2p deps * Fix lcli double runtime issue (#1144) * Handle stream termination and dialing peer errors * Correct peer_info variant types * Remove unnecessary warnings * Handle subnet unsubscription removal and improve logigng * Add logs around ping * Upgrade discv5 and improve logging * Handle peer connection status for multiple connections * Improve network service logging * Improve logging around peer manager * Upgrade swarm poll centralise peer management * Identify clients on error * Fix `remove_peer` in sync (#1150) * remove_peer removes from all chains * Remove logs * Fix early return from loop * Improved logging, fix panic * Partially correct tests * Stable futures: Vc sync (#1149) * Improve syncing heuristic * Add comments * Use safer method for tolerance * Fix tests * Stable futures: Fix VC bug, update agg pool, add more metrics (#1151) * Expose epoch processing summary * Expose participation metrics to prometheus * Switch to f64 * Reduce precision * Change precision * Expose observed attesters metrics * Add metrics for agg/unagg attn counts * Add metrics for gossip rx * Add metrics for gossip tx * Adds ignored attns to prom * Add attestation timing * Add timer for aggregation pool sig agg * Add write lock timer for agg pool * Add more metrics to agg pool * Change map lock code * Add extra metric to agg pool * Change lock handling in agg pool * Change .write() to .read() * Add another agg pool timer * Fix for is_aggregator * Fix pruning bug Co-authored-by: pawan <pawandhananjay@gmail.com> Co-authored-by: Paul Hauner <paul@paulhauner.com>
218 lines
7.1 KiB
Rust
218 lines
7.1 KiB
Rust
//! This handles the various supported encoding mechanism for the Eth 2.0 RPC.
|
|
|
|
use crate::rpc::{ErrorMessage, RPCCodedResponse, RPCRequest, RPCResponse};
|
|
use libp2p::bytes::BufMut;
|
|
use libp2p::bytes::BytesMut;
|
|
use std::marker::PhantomData;
|
|
use tokio_util::codec::{Decoder, Encoder};
|
|
use types::EthSpec;
|
|
|
|
pub trait OutboundCodec<TItem>: Encoder<TItem> + Decoder {
|
|
type ErrorType;
|
|
|
|
fn decode_error(
|
|
&mut self,
|
|
src: &mut BytesMut,
|
|
) -> Result<Option<Self::ErrorType>, <Self as Decoder>::Error>;
|
|
}
|
|
|
|
/* Global Inbound Codec */
|
|
// This deals with Decoding RPC Requests from other peers and encoding our responses
|
|
|
|
pub struct BaseInboundCodec<TCodec, TSpec>
|
|
where
|
|
TCodec: Encoder<RPCCodedResponse<TSpec>> + Decoder,
|
|
TSpec: EthSpec,
|
|
{
|
|
/// Inner codec for handling various encodings
|
|
inner: TCodec,
|
|
phantom: PhantomData<TSpec>,
|
|
}
|
|
|
|
impl<TCodec, TSpec> BaseInboundCodec<TCodec, TSpec>
|
|
where
|
|
TCodec: Encoder<RPCCodedResponse<TSpec>> + Decoder,
|
|
TSpec: EthSpec,
|
|
{
|
|
pub fn new(codec: TCodec) -> Self {
|
|
BaseInboundCodec {
|
|
inner: codec,
|
|
phantom: PhantomData,
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Global Outbound Codec */
|
|
// This deals with Decoding RPC Responses from other peers and encoding our requests
|
|
pub struct BaseOutboundCodec<TOutboundCodec, TSpec>
|
|
where
|
|
TOutboundCodec: OutboundCodec<RPCRequest<TSpec>>,
|
|
TSpec: EthSpec,
|
|
{
|
|
/// Inner codec for handling various encodings.
|
|
inner: TOutboundCodec,
|
|
/// Keeps track of the current response code for a chunk.
|
|
current_response_code: Option<u8>,
|
|
phantom: PhantomData<TSpec>,
|
|
}
|
|
|
|
impl<TOutboundCodec, TSpec> BaseOutboundCodec<TOutboundCodec, TSpec>
|
|
where
|
|
TSpec: EthSpec,
|
|
TOutboundCodec: OutboundCodec<RPCRequest<TSpec>>,
|
|
{
|
|
pub fn new(codec: TOutboundCodec) -> Self {
|
|
BaseOutboundCodec {
|
|
inner: codec,
|
|
current_response_code: None,
|
|
phantom: PhantomData,
|
|
}
|
|
}
|
|
}
|
|
|
|
/* Implementation of the Encoding/Decoding for the global codecs */
|
|
|
|
/* Base Inbound Codec */
|
|
|
|
// This Encodes RPC Responses sent to external peers
|
|
impl<TCodec, TSpec> Encoder<RPCCodedResponse<TSpec>> for BaseInboundCodec<TCodec, TSpec>
|
|
where
|
|
TSpec: EthSpec,
|
|
TCodec: Decoder + Encoder<RPCCodedResponse<TSpec>>,
|
|
{
|
|
type Error = <TCodec as Encoder<RPCCodedResponse<TSpec>>>::Error;
|
|
|
|
fn encode(
|
|
&mut self,
|
|
item: RPCCodedResponse<TSpec>,
|
|
dst: &mut BytesMut,
|
|
) -> Result<(), Self::Error> {
|
|
dst.clear();
|
|
dst.reserve(1);
|
|
dst.put_u8(
|
|
item.as_u8()
|
|
.expect("Should never encode a stream termination"),
|
|
);
|
|
self.inner.encode(item, dst)
|
|
}
|
|
}
|
|
|
|
// This Decodes RPC Requests from external peers
|
|
impl<TCodec, TSpec> Decoder for BaseInboundCodec<TCodec, TSpec>
|
|
where
|
|
TSpec: EthSpec,
|
|
TCodec: Encoder<RPCCodedResponse<TSpec>> + Decoder<Item = RPCRequest<TSpec>>,
|
|
{
|
|
type Item = RPCRequest<TSpec>;
|
|
type Error = <TCodec as Decoder>::Error;
|
|
|
|
fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
|
|
self.inner.decode(src)
|
|
}
|
|
}
|
|
|
|
/* Base Outbound Codec */
|
|
|
|
// This Encodes RPC Requests sent to external peers
|
|
impl<TCodec, TSpec> Encoder<RPCRequest<TSpec>> for BaseOutboundCodec<TCodec, TSpec>
|
|
where
|
|
TSpec: EthSpec,
|
|
TCodec: OutboundCodec<RPCRequest<TSpec>> + Encoder<RPCRequest<TSpec>>,
|
|
{
|
|
type Error = <TCodec as Encoder<RPCRequest<TSpec>>>::Error;
|
|
|
|
fn encode(&mut self, item: RPCRequest<TSpec>, dst: &mut BytesMut) -> Result<(), Self::Error> {
|
|
self.inner.encode(item, dst)
|
|
}
|
|
}
|
|
|
|
// This decodes RPC Responses received from external peers
|
|
impl<TCodec, TSpec> Decoder for BaseOutboundCodec<TCodec, TSpec>
|
|
where
|
|
TSpec: EthSpec,
|
|
TCodec: OutboundCodec<RPCRequest<TSpec>, ErrorType = ErrorMessage>
|
|
+ Decoder<Item = RPCResponse<TSpec>>,
|
|
{
|
|
type Item = RPCCodedResponse<TSpec>;
|
|
type Error = <TCodec as Decoder>::Error;
|
|
|
|
fn decode(&mut self, src: &mut BytesMut) -> Result<Option<Self::Item>, Self::Error> {
|
|
// if we have only received the response code, wait for more bytes
|
|
if src.len() <= 1 {
|
|
return Ok(None);
|
|
}
|
|
// using the response code determine which kind of payload needs to be decoded.
|
|
let response_code = self.current_response_code.unwrap_or_else(|| {
|
|
let resp_code = src.split_to(1)[0];
|
|
self.current_response_code = Some(resp_code);
|
|
resp_code
|
|
});
|
|
|
|
let inner_result = {
|
|
if RPCCodedResponse::<TSpec>::is_response(response_code) {
|
|
// decode an actual response and mutates the buffer if enough bytes have been read
|
|
// returning the result.
|
|
self.inner
|
|
.decode(src)
|
|
.map(|r| r.map(RPCCodedResponse::Success))
|
|
} else {
|
|
// decode an error
|
|
self.inner
|
|
.decode_error(src)
|
|
.map(|r| r.map(|resp| RPCCodedResponse::from_error(response_code, resp)))
|
|
}
|
|
};
|
|
// if the inner decoder was capable of decoding a chunk, we need to reset the current
|
|
// response code for the next chunk
|
|
if let Ok(Some(_)) = inner_result {
|
|
self.current_response_code = None;
|
|
}
|
|
// return the result
|
|
inner_result
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::super::ssz::*;
|
|
use super::super::ssz_snappy::*;
|
|
use super::*;
|
|
use crate::rpc::protocol::*;
|
|
|
|
#[test]
|
|
fn test_decode_status_message() {
|
|
let message = hex::decode("ff060000734e615070590032000006e71e7b54989925efd6c9cbcb8ceb9b5f71216f5137282bf6a1e3b50f64e42d6c7fb347abe07eb0db8200000005029e2800").unwrap();
|
|
let mut buf = BytesMut::new();
|
|
buf.extend_from_slice(&message);
|
|
|
|
type Spec = types::MainnetEthSpec;
|
|
|
|
let snappy_protocol_id =
|
|
ProtocolId::new(Protocol::Status, Version::V1, Encoding::SSZSnappy);
|
|
let ssz_protocol_id = ProtocolId::new(Protocol::Status, Version::V1, Encoding::SSZ);
|
|
|
|
let mut snappy_outbound_codec =
|
|
SSZSnappyOutboundCodec::<Spec>::new(snappy_protocol_id, 1_048_576);
|
|
let mut ssz_outbound_codec = SSZOutboundCodec::<Spec>::new(ssz_protocol_id, 1_048_576);
|
|
|
|
// decode message just as snappy message
|
|
let snappy_decoded_message = snappy_outbound_codec.decode(&mut buf.clone());
|
|
// decode message just a ssz message
|
|
let ssz_decoded_message = ssz_outbound_codec.decode(&mut buf.clone());
|
|
|
|
// build codecs for entire chunk
|
|
let mut snappy_base_outbound_codec = BaseOutboundCodec::new(snappy_outbound_codec);
|
|
let mut ssz_base_outbound_codec = BaseOutboundCodec::new(ssz_outbound_codec);
|
|
|
|
// decode message as ssz snappy chunk
|
|
let snappy_decoded_chunk = snappy_base_outbound_codec.decode(&mut buf.clone());
|
|
// decode message just a ssz chunk
|
|
let ssz_decoded_chunk = ssz_base_outbound_codec.decode(&mut buf.clone());
|
|
|
|
let _ = dbg!(snappy_decoded_message);
|
|
let _ = dbg!(ssz_decoded_message);
|
|
let _ = dbg!(snappy_decoded_chunk);
|
|
let _ = dbg!(ssz_decoded_chunk);
|
|
}
|
|
}
|