2019-11-27 01:47:46 +00:00
|
|
|
#![cfg(test)]
|
2020-03-19 04:11:08 +00:00
|
|
|
use eth2_libp2p::Enr;
|
2020-05-17 11:16:48 +00:00
|
|
|
use eth2_libp2p::EnrExt;
|
2019-11-27 01:47:46 +00:00
|
|
|
use eth2_libp2p::Multiaddr;
|
|
|
|
use eth2_libp2p::Service as LibP2PService;
|
2020-05-17 11:16:48 +00:00
|
|
|
use eth2_libp2p::{Libp2pEvent, NetworkConfig};
|
2019-11-27 01:47:46 +00:00
|
|
|
use slog::{debug, error, o, Drain};
|
2020-04-16 07:24:12 +00:00
|
|
|
use std::net::{TcpListener, UdpSocket};
|
2019-11-27 01:47:46 +00:00
|
|
|
use std::time::Duration;
|
2020-03-25 11:18:06 +00:00
|
|
|
use types::{EnrForkId, MinimalEthSpec};
|
Initial work towards v0.2.0 (#924)
* Remove ping protocol
* Initial renaming of network services
* Correct rebasing relative to latest master
* Start updating types
* Adds HashMapDelay struct to utils
* Initial network restructure
* Network restructure. Adds new types for v0.2.0
* Removes build artefacts
* Shift validation to beacon chain
* Temporarily remove gossip validation
This is to be updated to match current optimisation efforts.
* Adds AggregateAndProof
* Begin rebuilding pubsub encoding/decoding
* Signature hacking
* Shift gossipsup decoding into eth2_libp2p
* Existing EF tests passing with fake_crypto
* Shifts block encoding/decoding into RPC
* Delete outdated API spec
* All release tests passing bar genesis state parsing
* Update and test YamlConfig
* Update to spec v0.10 compatible BLS
* Updates to BLS EF tests
* Add EF test for AggregateVerify
And delete unused hash2curve tests for uncompressed points
* Update EF tests to v0.10.1
* Use optional block root correctly in block proc
* Use genesis fork in deposit domain. All tests pass
* Fast aggregate verify test
* Update REST API docs
* Fix unused import
* Bump spec tags to v0.10.1
* Add `seconds_per_eth1_block` to chainspec
* Update to timestamp based eth1 voting scheme
* Return None from `get_votes_to_consider` if block cache is empty
* Handle overflows in `is_candidate_block`
* Revert to failing tests
* Fix eth1 data sets test
* Choose default vote according to spec
* Fix collect_valid_votes tests
* Fix `get_votes_to_consider` to choose all eligible blocks
* Uncomment winning_vote tests
* Add comments; remove unused code
* Reduce seconds_per_eth1_block for simulation
* Addressed review comments
* Add test for default vote case
* Fix logs
* Remove unused functions
* Meter default eth1 votes
* Fix comments
* Progress on attestation service
* Address review comments; remove unused dependency
* Initial work on removing libp2p lock
* Add LRU caches to store (rollup)
* Update attestation validation for DB changes (WIP)
* Initial version of should_forward_block
* Scaffold
* Progress on attestation validation
Also, consolidate prod+testing slot clocks so that they share much
of the same implementation and can both handle sub-slot time changes.
* Removes lock from libp2p service
* Completed network lock removal
* Finish(?) attestation processing
* Correct network termination future
* Add slot check to block check
* Correct fmt issues
* Remove Drop implementation for network service
* Add first attempt at attestation proc. re-write
* Add version 2 of attestation processing
* Minor fixes
* Add validator pubkey cache
* Make get_indexed_attestation take a committee
* Link signature processing into new attn verification
* First working version
* Ensure pubkey cache is updated
* Add more metrics, slight optimizations
* Clone committee cache during attestation processing
* Update shuffling cache during block processing
* Remove old commented-out code
* Fix shuffling cache insert bug
* Used indexed attestation in fork choice
* Restructure attn processing, add metrics
* Add more detailed metrics
* Tidy, fix failing tests
* Fix failing tests, tidy
* Address reviewers suggestions
* Disable/delete two outdated tests
* Modification of validator for subscriptions
* Add slot signing to validator client
* Further progress on validation subscription
* Adds necessary validator subscription functionality
* Add new Pubkeys struct to signature_sets
* Refactor with functional approach
* Update beacon chain
* Clean up validator <-> beacon node http types
* Add aggregator status to ValidatorDuty
* Impl Clone for manual slot clock
* Fix minor errors
* Further progress validator client subscription
* Initial subscription and aggregation handling
* Remove decompressed member from pubkey bytes
* Progress to modifying val client for attestation aggregation
* First draft of validator client upgrade for aggregate attestations
* Add hashmap for indices lookup
* Add state cache, remove store cache
* Only build the head committee cache
* Removes lock on a network channel
* Partially implement beacon node subscription http api
* Correct compilation issues
* Change `get_attesting_indices` to use Vec
* Fix failing test
* Partial implementation of timer
* Adds timer, removes exit_future, http api to op pool
* Partial multiple aggregate attestation handling
* Permits bulk messages accross gossipsub network channel
* Correct compile issues
* Improve gosispsub messaging and correct rest api helpers
* Added global gossipsub subscriptions
* Update validator subscriptions data structs
* Tidy
* Re-structure validator subscriptions
* Initial handling of subscriptions
* Re-structure network service
* Add pubkey cache persistence file
* Add more comments
* Integrate persistence file into builder
* Add pubkey cache tests
* Add HashSetDelay and introduce into attestation service
* Handles validator subscriptions
* Add data_dir to beacon chain builder
* Remove Option in pubkey cache persistence file
* Ensure consistency between datadir/data_dir
* Fix failing network test
* Peer subnet discovery gets queued for future subscriptions
* Reorganise attestation service functions
* Initial wiring of attestation service
* First draft of attestation service timing logic
* Correct minor typos
* Tidy
* Fix todos
* Improve tests
* Add PeerInfo to connected peers mapping
* Fix compile error
* Fix compile error from merge
* Split up block processing metrics
* Tidy
* Refactor get_pubkey_from_state
* Remove commented-out code
* Rename state_cache -> checkpoint_cache
* Rename Checkpoint -> Snapshot
* Tidy, add comments
* Tidy up find_head function
* Change some checkpoint -> snapshot
* Add tests
* Expose max_len
* Remove dead code
* Tidy
* Fix bug
* Add sync-speed metric
* Add first attempt at VerifiableBlock
* Start integrating into beacon chain
* Integrate VerifiableBlock
* Rename VerifableBlock -> PartialBlockVerification
* Add start of typed methods
* Add progress
* Add further progress
* Rename structs
* Add full block verification to block_processing.rs
* Further beacon chain integration
* Update checks for gossip
* Add todo
* Start adding segement verification
* Add passing chain segement test
* Initial integration with batch sync
* Minor changes
* Tidy, add more error checking
* Start adding chain_segment tests
* Finish invalid signature tests
* Include single and gossip verified blocks in tests
* Add gossip verification tests
* Start adding docs
* Finish adding comments to block_processing.rs
* Rename block_processing.rs -> block_verification
* Start removing old block processing code
* Fixes beacon_chain compilation
* Fix project-wide compile errors
* Remove old code
* Correct code to pass all tests
* Fix bug with beacon proposer index
* Fix shim for BlockProcessingError
* Only process one epoch at a time
* Fix loop in chain segment processing
* Correct tests from master merge
* Add caching for state.eth1_data_votes
* Add BeaconChain::validator_pubkey
* Revert "Add caching for state.eth1_data_votes"
This reverts commit cd73dcd6434fb8d8e6bf30c5356355598ea7b78e.
Co-authored-by: Grant Wuerker <gwuerker@gmail.com>
Co-authored-by: Michael Sproul <michael@sigmaprime.io>
Co-authored-by: Michael Sproul <micsproul@gmail.com>
Co-authored-by: pawan <pawandhananjay@gmail.com>
Co-authored-by: Paul Hauner <paul@paulhauner.com>
2020-03-17 06:24:44 +00:00
|
|
|
|
|
|
|
type E = MinimalEthSpec;
|
2020-03-02 02:35:20 +00:00
|
|
|
use tempdir::TempDir;
|
2019-11-27 01:47:46 +00:00
|
|
|
|
|
|
|
pub fn build_log(level: slog::Level, enabled: bool) -> slog::Logger {
|
|
|
|
let decorator = slog_term::TermDecorator::new().build();
|
|
|
|
let drain = slog_term::FullFormat::new(decorator).build().fuse();
|
|
|
|
let drain = slog_async::Async::new(drain).build().fuse();
|
|
|
|
|
|
|
|
if enabled {
|
|
|
|
slog::Logger::root(drain.filter_level(level).fuse(), o!())
|
|
|
|
} else {
|
|
|
|
slog::Logger::root(drain.filter(|_| false).fuse(), o!())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-04-16 07:24:12 +00:00
|
|
|
// A bit of hack to find an unused port.
|
|
|
|
///
|
|
|
|
/// Does not guarantee that the given port is unused after the function exists, just that it was
|
|
|
|
/// unused before the function started (i.e., it does not reserve a port).
|
|
|
|
pub fn unused_port(transport: &str) -> Result<u16, String> {
|
|
|
|
let local_addr = match transport {
|
|
|
|
"tcp" => {
|
|
|
|
let listener = TcpListener::bind("127.0.0.1:0").map_err(|e| {
|
|
|
|
format!("Failed to create TCP listener to find unused port: {:?}", e)
|
|
|
|
})?;
|
|
|
|
listener.local_addr().map_err(|e| {
|
|
|
|
format!(
|
|
|
|
"Failed to read TCP listener local_addr to find unused port: {:?}",
|
|
|
|
e
|
|
|
|
)
|
|
|
|
})?
|
|
|
|
}
|
|
|
|
"udp" => {
|
|
|
|
let socket = UdpSocket::bind("127.0.0.1:0")
|
|
|
|
.map_err(|e| format!("Failed to create UDP socket to find unused port: {:?}", e))?;
|
|
|
|
socket.local_addr().map_err(|e| {
|
|
|
|
format!(
|
|
|
|
"Failed to read UDP socket local_addr to find unused port: {:?}",
|
|
|
|
e
|
|
|
|
)
|
|
|
|
})?
|
|
|
|
}
|
|
|
|
_ => return Err("Invalid transport to find unused port".into()),
|
|
|
|
};
|
|
|
|
Ok(local_addr.port())
|
|
|
|
}
|
|
|
|
|
2019-11-27 01:47:46 +00:00
|
|
|
pub fn build_config(
|
|
|
|
port: u16,
|
|
|
|
mut boot_nodes: Vec<Enr>,
|
|
|
|
secret_key: Option<String>,
|
|
|
|
) -> NetworkConfig {
|
|
|
|
let mut config = NetworkConfig::default();
|
2020-03-02 02:35:20 +00:00
|
|
|
let path = TempDir::new(&format!("libp2p_test{}", port)).unwrap();
|
|
|
|
|
2019-11-27 01:47:46 +00:00
|
|
|
config.libp2p_port = port; // tcp port
|
|
|
|
config.discovery_port = port; // udp port
|
2020-03-19 04:11:08 +00:00
|
|
|
config.enr_tcp_port = Some(port);
|
|
|
|
config.enr_udp_port = Some(port);
|
|
|
|
config.enr_address = Some("127.0.0.1".parse().unwrap());
|
2019-11-27 01:47:46 +00:00
|
|
|
config.boot_nodes.append(&mut boot_nodes);
|
|
|
|
config.secret_key_hex = secret_key;
|
2020-03-02 02:35:20 +00:00
|
|
|
config.network_dir = path.into_path();
|
2019-11-27 01:47:46 +00:00
|
|
|
// Reduce gossipsub heartbeat parameters
|
|
|
|
config.gs_config.heartbeat_initial_delay = Duration::from_millis(500);
|
|
|
|
config.gs_config.heartbeat_interval = Duration::from_millis(500);
|
|
|
|
config
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn build_libp2p_instance(
|
|
|
|
boot_nodes: Vec<Enr>,
|
|
|
|
secret_key: Option<String>,
|
|
|
|
log: slog::Logger,
|
Initial work towards v0.2.0 (#924)
* Remove ping protocol
* Initial renaming of network services
* Correct rebasing relative to latest master
* Start updating types
* Adds HashMapDelay struct to utils
* Initial network restructure
* Network restructure. Adds new types for v0.2.0
* Removes build artefacts
* Shift validation to beacon chain
* Temporarily remove gossip validation
This is to be updated to match current optimisation efforts.
* Adds AggregateAndProof
* Begin rebuilding pubsub encoding/decoding
* Signature hacking
* Shift gossipsup decoding into eth2_libp2p
* Existing EF tests passing with fake_crypto
* Shifts block encoding/decoding into RPC
* Delete outdated API spec
* All release tests passing bar genesis state parsing
* Update and test YamlConfig
* Update to spec v0.10 compatible BLS
* Updates to BLS EF tests
* Add EF test for AggregateVerify
And delete unused hash2curve tests for uncompressed points
* Update EF tests to v0.10.1
* Use optional block root correctly in block proc
* Use genesis fork in deposit domain. All tests pass
* Fast aggregate verify test
* Update REST API docs
* Fix unused import
* Bump spec tags to v0.10.1
* Add `seconds_per_eth1_block` to chainspec
* Update to timestamp based eth1 voting scheme
* Return None from `get_votes_to_consider` if block cache is empty
* Handle overflows in `is_candidate_block`
* Revert to failing tests
* Fix eth1 data sets test
* Choose default vote according to spec
* Fix collect_valid_votes tests
* Fix `get_votes_to_consider` to choose all eligible blocks
* Uncomment winning_vote tests
* Add comments; remove unused code
* Reduce seconds_per_eth1_block for simulation
* Addressed review comments
* Add test for default vote case
* Fix logs
* Remove unused functions
* Meter default eth1 votes
* Fix comments
* Progress on attestation service
* Address review comments; remove unused dependency
* Initial work on removing libp2p lock
* Add LRU caches to store (rollup)
* Update attestation validation for DB changes (WIP)
* Initial version of should_forward_block
* Scaffold
* Progress on attestation validation
Also, consolidate prod+testing slot clocks so that they share much
of the same implementation and can both handle sub-slot time changes.
* Removes lock from libp2p service
* Completed network lock removal
* Finish(?) attestation processing
* Correct network termination future
* Add slot check to block check
* Correct fmt issues
* Remove Drop implementation for network service
* Add first attempt at attestation proc. re-write
* Add version 2 of attestation processing
* Minor fixes
* Add validator pubkey cache
* Make get_indexed_attestation take a committee
* Link signature processing into new attn verification
* First working version
* Ensure pubkey cache is updated
* Add more metrics, slight optimizations
* Clone committee cache during attestation processing
* Update shuffling cache during block processing
* Remove old commented-out code
* Fix shuffling cache insert bug
* Used indexed attestation in fork choice
* Restructure attn processing, add metrics
* Add more detailed metrics
* Tidy, fix failing tests
* Fix failing tests, tidy
* Address reviewers suggestions
* Disable/delete two outdated tests
* Modification of validator for subscriptions
* Add slot signing to validator client
* Further progress on validation subscription
* Adds necessary validator subscription functionality
* Add new Pubkeys struct to signature_sets
* Refactor with functional approach
* Update beacon chain
* Clean up validator <-> beacon node http types
* Add aggregator status to ValidatorDuty
* Impl Clone for manual slot clock
* Fix minor errors
* Further progress validator client subscription
* Initial subscription and aggregation handling
* Remove decompressed member from pubkey bytes
* Progress to modifying val client for attestation aggregation
* First draft of validator client upgrade for aggregate attestations
* Add hashmap for indices lookup
* Add state cache, remove store cache
* Only build the head committee cache
* Removes lock on a network channel
* Partially implement beacon node subscription http api
* Correct compilation issues
* Change `get_attesting_indices` to use Vec
* Fix failing test
* Partial implementation of timer
* Adds timer, removes exit_future, http api to op pool
* Partial multiple aggregate attestation handling
* Permits bulk messages accross gossipsub network channel
* Correct compile issues
* Improve gosispsub messaging and correct rest api helpers
* Added global gossipsub subscriptions
* Update validator subscriptions data structs
* Tidy
* Re-structure validator subscriptions
* Initial handling of subscriptions
* Re-structure network service
* Add pubkey cache persistence file
* Add more comments
* Integrate persistence file into builder
* Add pubkey cache tests
* Add HashSetDelay and introduce into attestation service
* Handles validator subscriptions
* Add data_dir to beacon chain builder
* Remove Option in pubkey cache persistence file
* Ensure consistency between datadir/data_dir
* Fix failing network test
* Peer subnet discovery gets queued for future subscriptions
* Reorganise attestation service functions
* Initial wiring of attestation service
* First draft of attestation service timing logic
* Correct minor typos
* Tidy
* Fix todos
* Improve tests
* Add PeerInfo to connected peers mapping
* Fix compile error
* Fix compile error from merge
* Split up block processing metrics
* Tidy
* Refactor get_pubkey_from_state
* Remove commented-out code
* Rename state_cache -> checkpoint_cache
* Rename Checkpoint -> Snapshot
* Tidy, add comments
* Tidy up find_head function
* Change some checkpoint -> snapshot
* Add tests
* Expose max_len
* Remove dead code
* Tidy
* Fix bug
* Add sync-speed metric
* Add first attempt at VerifiableBlock
* Start integrating into beacon chain
* Integrate VerifiableBlock
* Rename VerifableBlock -> PartialBlockVerification
* Add start of typed methods
* Add progress
* Add further progress
* Rename structs
* Add full block verification to block_processing.rs
* Further beacon chain integration
* Update checks for gossip
* Add todo
* Start adding segement verification
* Add passing chain segement test
* Initial integration with batch sync
* Minor changes
* Tidy, add more error checking
* Start adding chain_segment tests
* Finish invalid signature tests
* Include single and gossip verified blocks in tests
* Add gossip verification tests
* Start adding docs
* Finish adding comments to block_processing.rs
* Rename block_processing.rs -> block_verification
* Start removing old block processing code
* Fixes beacon_chain compilation
* Fix project-wide compile errors
* Remove old code
* Correct code to pass all tests
* Fix bug with beacon proposer index
* Fix shim for BlockProcessingError
* Only process one epoch at a time
* Fix loop in chain segment processing
* Correct tests from master merge
* Add caching for state.eth1_data_votes
* Add BeaconChain::validator_pubkey
* Revert "Add caching for state.eth1_data_votes"
This reverts commit cd73dcd6434fb8d8e6bf30c5356355598ea7b78e.
Co-authored-by: Grant Wuerker <gwuerker@gmail.com>
Co-authored-by: Michael Sproul <michael@sigmaprime.io>
Co-authored-by: Michael Sproul <micsproul@gmail.com>
Co-authored-by: pawan <pawandhananjay@gmail.com>
Co-authored-by: Paul Hauner <paul@paulhauner.com>
2020-03-17 06:24:44 +00:00
|
|
|
) -> LibP2PService<E> {
|
2020-04-20 06:54:37 +00:00
|
|
|
let port = unused_port("tcp").unwrap();
|
2019-11-27 01:47:46 +00:00
|
|
|
let config = build_config(port, boot_nodes, secret_key);
|
|
|
|
// launch libp2p service
|
2020-05-17 11:16:48 +00:00
|
|
|
LibP2PService::new(&config, EnrForkId::default(), &log)
|
2020-03-02 02:35:20 +00:00
|
|
|
.expect("should build libp2p instance")
|
|
|
|
.1
|
2019-11-27 01:47:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#[allow(dead_code)]
|
Initial work towards v0.2.0 (#924)
* Remove ping protocol
* Initial renaming of network services
* Correct rebasing relative to latest master
* Start updating types
* Adds HashMapDelay struct to utils
* Initial network restructure
* Network restructure. Adds new types for v0.2.0
* Removes build artefacts
* Shift validation to beacon chain
* Temporarily remove gossip validation
This is to be updated to match current optimisation efforts.
* Adds AggregateAndProof
* Begin rebuilding pubsub encoding/decoding
* Signature hacking
* Shift gossipsup decoding into eth2_libp2p
* Existing EF tests passing with fake_crypto
* Shifts block encoding/decoding into RPC
* Delete outdated API spec
* All release tests passing bar genesis state parsing
* Update and test YamlConfig
* Update to spec v0.10 compatible BLS
* Updates to BLS EF tests
* Add EF test for AggregateVerify
And delete unused hash2curve tests for uncompressed points
* Update EF tests to v0.10.1
* Use optional block root correctly in block proc
* Use genesis fork in deposit domain. All tests pass
* Fast aggregate verify test
* Update REST API docs
* Fix unused import
* Bump spec tags to v0.10.1
* Add `seconds_per_eth1_block` to chainspec
* Update to timestamp based eth1 voting scheme
* Return None from `get_votes_to_consider` if block cache is empty
* Handle overflows in `is_candidate_block`
* Revert to failing tests
* Fix eth1 data sets test
* Choose default vote according to spec
* Fix collect_valid_votes tests
* Fix `get_votes_to_consider` to choose all eligible blocks
* Uncomment winning_vote tests
* Add comments; remove unused code
* Reduce seconds_per_eth1_block for simulation
* Addressed review comments
* Add test for default vote case
* Fix logs
* Remove unused functions
* Meter default eth1 votes
* Fix comments
* Progress on attestation service
* Address review comments; remove unused dependency
* Initial work on removing libp2p lock
* Add LRU caches to store (rollup)
* Update attestation validation for DB changes (WIP)
* Initial version of should_forward_block
* Scaffold
* Progress on attestation validation
Also, consolidate prod+testing slot clocks so that they share much
of the same implementation and can both handle sub-slot time changes.
* Removes lock from libp2p service
* Completed network lock removal
* Finish(?) attestation processing
* Correct network termination future
* Add slot check to block check
* Correct fmt issues
* Remove Drop implementation for network service
* Add first attempt at attestation proc. re-write
* Add version 2 of attestation processing
* Minor fixes
* Add validator pubkey cache
* Make get_indexed_attestation take a committee
* Link signature processing into new attn verification
* First working version
* Ensure pubkey cache is updated
* Add more metrics, slight optimizations
* Clone committee cache during attestation processing
* Update shuffling cache during block processing
* Remove old commented-out code
* Fix shuffling cache insert bug
* Used indexed attestation in fork choice
* Restructure attn processing, add metrics
* Add more detailed metrics
* Tidy, fix failing tests
* Fix failing tests, tidy
* Address reviewers suggestions
* Disable/delete two outdated tests
* Modification of validator for subscriptions
* Add slot signing to validator client
* Further progress on validation subscription
* Adds necessary validator subscription functionality
* Add new Pubkeys struct to signature_sets
* Refactor with functional approach
* Update beacon chain
* Clean up validator <-> beacon node http types
* Add aggregator status to ValidatorDuty
* Impl Clone for manual slot clock
* Fix minor errors
* Further progress validator client subscription
* Initial subscription and aggregation handling
* Remove decompressed member from pubkey bytes
* Progress to modifying val client for attestation aggregation
* First draft of validator client upgrade for aggregate attestations
* Add hashmap for indices lookup
* Add state cache, remove store cache
* Only build the head committee cache
* Removes lock on a network channel
* Partially implement beacon node subscription http api
* Correct compilation issues
* Change `get_attesting_indices` to use Vec
* Fix failing test
* Partial implementation of timer
* Adds timer, removes exit_future, http api to op pool
* Partial multiple aggregate attestation handling
* Permits bulk messages accross gossipsub network channel
* Correct compile issues
* Improve gosispsub messaging and correct rest api helpers
* Added global gossipsub subscriptions
* Update validator subscriptions data structs
* Tidy
* Re-structure validator subscriptions
* Initial handling of subscriptions
* Re-structure network service
* Add pubkey cache persistence file
* Add more comments
* Integrate persistence file into builder
* Add pubkey cache tests
* Add HashSetDelay and introduce into attestation service
* Handles validator subscriptions
* Add data_dir to beacon chain builder
* Remove Option in pubkey cache persistence file
* Ensure consistency between datadir/data_dir
* Fix failing network test
* Peer subnet discovery gets queued for future subscriptions
* Reorganise attestation service functions
* Initial wiring of attestation service
* First draft of attestation service timing logic
* Correct minor typos
* Tidy
* Fix todos
* Improve tests
* Add PeerInfo to connected peers mapping
* Fix compile error
* Fix compile error from merge
* Split up block processing metrics
* Tidy
* Refactor get_pubkey_from_state
* Remove commented-out code
* Rename state_cache -> checkpoint_cache
* Rename Checkpoint -> Snapshot
* Tidy, add comments
* Tidy up find_head function
* Change some checkpoint -> snapshot
* Add tests
* Expose max_len
* Remove dead code
* Tidy
* Fix bug
* Add sync-speed metric
* Add first attempt at VerifiableBlock
* Start integrating into beacon chain
* Integrate VerifiableBlock
* Rename VerifableBlock -> PartialBlockVerification
* Add start of typed methods
* Add progress
* Add further progress
* Rename structs
* Add full block verification to block_processing.rs
* Further beacon chain integration
* Update checks for gossip
* Add todo
* Start adding segement verification
* Add passing chain segement test
* Initial integration with batch sync
* Minor changes
* Tidy, add more error checking
* Start adding chain_segment tests
* Finish invalid signature tests
* Include single and gossip verified blocks in tests
* Add gossip verification tests
* Start adding docs
* Finish adding comments to block_processing.rs
* Rename block_processing.rs -> block_verification
* Start removing old block processing code
* Fixes beacon_chain compilation
* Fix project-wide compile errors
* Remove old code
* Correct code to pass all tests
* Fix bug with beacon proposer index
* Fix shim for BlockProcessingError
* Only process one epoch at a time
* Fix loop in chain segment processing
* Correct tests from master merge
* Add caching for state.eth1_data_votes
* Add BeaconChain::validator_pubkey
* Revert "Add caching for state.eth1_data_votes"
This reverts commit cd73dcd6434fb8d8e6bf30c5356355598ea7b78e.
Co-authored-by: Grant Wuerker <gwuerker@gmail.com>
Co-authored-by: Michael Sproul <michael@sigmaprime.io>
Co-authored-by: Michael Sproul <micsproul@gmail.com>
Co-authored-by: pawan <pawandhananjay@gmail.com>
Co-authored-by: Paul Hauner <paul@paulhauner.com>
2020-03-17 06:24:44 +00:00
|
|
|
pub fn get_enr(node: &LibP2PService<E>) -> Enr {
|
2020-03-19 04:11:08 +00:00
|
|
|
let enr = node.swarm.discovery().local_enr().clone();
|
|
|
|
enr
|
2019-11-27 01:47:46 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Returns `n` libp2p peers in fully connected topology.
|
|
|
|
#[allow(dead_code)]
|
2020-04-18 01:45:52 +00:00
|
|
|
pub fn build_full_mesh(log: slog::Logger, n: usize) -> Vec<LibP2PService<E>> {
|
|
|
|
let mut nodes: Vec<LibP2PService<E>> = (0..n)
|
2020-04-20 06:54:37 +00:00
|
|
|
.map(|_| build_libp2p_instance(vec![], None, log.clone()))
|
2019-11-27 01:47:46 +00:00
|
|
|
.collect();
|
|
|
|
let multiaddrs: Vec<Multiaddr> = nodes
|
|
|
|
.iter()
|
|
|
|
.map(|x| get_enr(&x).multiaddr()[1].clone())
|
|
|
|
.collect();
|
|
|
|
|
2020-01-21 07:38:56 +00:00
|
|
|
for (i, node) in nodes.iter_mut().enumerate().take(n) {
|
|
|
|
for (j, multiaddr) in multiaddrs.iter().enumerate().skip(i) {
|
2019-11-27 01:47:46 +00:00
|
|
|
if i != j {
|
2020-01-21 07:38:56 +00:00
|
|
|
match libp2p::Swarm::dial_addr(&mut node.swarm, multiaddr.clone()) {
|
2019-11-27 01:47:46 +00:00
|
|
|
Ok(()) => debug!(log, "Connected"),
|
|
|
|
Err(_) => error!(log, "Failed to connect"),
|
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
nodes
|
|
|
|
}
|
|
|
|
|
2020-05-17 11:16:48 +00:00
|
|
|
// Constructs a pair of nodes with separate loggers. The sender dials the receiver.
|
2019-11-27 01:47:46 +00:00
|
|
|
// This returns a (sender, receiver) pair.
|
|
|
|
#[allow(dead_code)]
|
2020-05-17 11:16:48 +00:00
|
|
|
pub async fn build_node_pair(log: &slog::Logger) -> (LibP2PService<E>, LibP2PService<E>) {
|
2019-11-27 01:47:46 +00:00
|
|
|
let sender_log = log.new(o!("who" => "sender"));
|
|
|
|
let receiver_log = log.new(o!("who" => "receiver"));
|
|
|
|
|
2020-04-20 06:54:37 +00:00
|
|
|
let mut sender = build_libp2p_instance(vec![], None, sender_log);
|
2020-05-17 11:16:48 +00:00
|
|
|
let mut receiver = build_libp2p_instance(vec![], None, receiver_log);
|
2019-11-27 01:47:46 +00:00
|
|
|
|
|
|
|
let receiver_multiaddr = receiver.swarm.discovery().local_enr().clone().multiaddr()[1].clone();
|
2020-05-17 11:16:48 +00:00
|
|
|
|
|
|
|
// let the two nodes set up listeners
|
|
|
|
let sender_fut = async {
|
|
|
|
loop {
|
|
|
|
if let Libp2pEvent::NewListenAddr(_) = sender.next_event().await {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
let receiver_fut = async {
|
|
|
|
loop {
|
|
|
|
if let Libp2pEvent::NewListenAddr(_) = receiver.next_event().await {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let joined = futures::future::join(sender_fut, receiver_fut);
|
|
|
|
|
|
|
|
// wait for either both nodes to listen or a timeout
|
|
|
|
tokio::select! {
|
|
|
|
_ = tokio::time::delay_for(Duration::from_millis(500)) => {}
|
|
|
|
_ = joined => {}
|
|
|
|
}
|
|
|
|
|
|
|
|
match libp2p::Swarm::dial_addr(&mut sender.swarm, receiver_multiaddr.clone()) {
|
|
|
|
Ok(()) => {
|
|
|
|
debug!(log, "Sender dialed receiver"; "address" => format!("{:?}", receiver_multiaddr))
|
|
|
|
}
|
2019-11-27 01:47:46 +00:00
|
|
|
Err(_) => error!(log, "Dialing failed"),
|
|
|
|
};
|
|
|
|
(sender, receiver)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Returns `n` peers in a linear topology
|
|
|
|
#[allow(dead_code)]
|
2020-04-18 01:45:52 +00:00
|
|
|
pub fn build_linear(log: slog::Logger, n: usize) -> Vec<LibP2PService<E>> {
|
|
|
|
let mut nodes: Vec<LibP2PService<E>> = (0..n)
|
2020-04-20 06:54:37 +00:00
|
|
|
.map(|_| build_libp2p_instance(vec![], None, log.clone()))
|
2019-11-27 01:47:46 +00:00
|
|
|
.collect();
|
|
|
|
let multiaddrs: Vec<Multiaddr> = nodes
|
|
|
|
.iter()
|
|
|
|
.map(|x| get_enr(&x).multiaddr()[1].clone())
|
|
|
|
.collect();
|
|
|
|
for i in 0..n - 1 {
|
|
|
|
match libp2p::Swarm::dial_addr(&mut nodes[i].swarm, multiaddrs[i + 1].clone()) {
|
|
|
|
Ok(()) => debug!(log, "Connected"),
|
|
|
|
Err(_) => error!(log, "Failed to connect"),
|
|
|
|
};
|
|
|
|
}
|
|
|
|
nodes
|
|
|
|
}
|