Eth1 Integration (#542)
* Refactor to cache Eth1Data
* Fix merge conflicts and minor refactorings
* Rename Eth1Cache to Eth1DataCache
* Refactor events subscription
* Add deposits module to interface with BeaconChain deposits
* Remove utils
* Rename to types.rs and add trait constraints to Eth1DataFetcher
* Confirm to trait constraints. Make Web3DataFetcher cloneable
* Make fetcher object member of deposit and eth1_data cache and other fixes
* Fix update_cache function
* Move fetch_eth1_data to impl block
* Fix deposit tests
* Create Eth1 object for interfacing with Beacon chain
* Add `run` function for running update_cache and subscribe_deposit_logs tasks
* Add logging
* Run `cargo fmt` and make tests pass
* Convert sync functions to async
* Add timeouts to web3 functions
* Return futures from cache functions
* Add failed chaining of futures
* Working cache updation
* Clean up tests and `update_cache` function
* Refactor `get_eth1_data` functions to work with future returning functions
* Refactor eth1 `run` function to work with modified `update_cache` api
* Minor changes
* Add distance parameter to `update_cache`
* Fix tests and other minor fixes
* Working integration with cache and deposits
* Add merkle_tree construction, proof generation and verification code
* Add function to construct and fetch Deposits for BeaconNode
* Add error handling
* Import ssz
* Add error handling to eth1 cache and fix minor errors
* Run rustfmt
* Fix minor bug
* Rename Eth1Error and change to Result<T>
* Change deposit fetching mechanism from notification based to poll based
* Add deposits from eth1 chain in a given range every `x` blocks
* Modify `run` function to accommodate changes
* Minor fixes
* Fix formatting
* Initial commit. web3 api working.
* Tidied up lib. Add function for fetching logs.
* Refactor with `Eth1DataFetcher` trait
* Add parsing for deposit contract logs and get_eth1_data function
* Add `get_eth1_votes` function
* Refactor to cache Eth1Data
* Fix merge conflicts and minor refactorings
* Rename Eth1Cache to Eth1DataCache
* Refactor events subscription
* Add deposits module to interface with BeaconChain deposits
* Remove utils
* Rename to types.rs and add trait constraints to Eth1DataFetcher
* Confirm to trait constraints. Make Web3DataFetcher cloneable
* Make fetcher object member of deposit and eth1_data cache and other fixes
* Fix update_cache function
* Move fetch_eth1_data to impl block
* Fix deposit tests
* Create Eth1 object for interfacing with Beacon chain
* Add `run` function for running update_cache and subscribe_deposit_logs tasks
* Add logging
* Run `cargo fmt` and make tests pass
* Convert sync functions to async
* Add timeouts to web3 functions
* Return futures from cache functions
* Add failed chaining of futures
* Working cache updation
* Clean up tests and `update_cache` function
* Refactor `get_eth1_data` functions to work with future returning functions
* Refactor eth1 `run` function to work with modified `update_cache` api
* Minor changes
* Add distance parameter to `update_cache`
* Fix tests and other minor fixes
* Working integration with cache and deposits
* Add merkle_tree construction, proof generation and verification code
* Add function to construct and fetch Deposits for BeaconNode
* Add error handling
* Import ssz
* Add error handling to eth1 cache and fix minor errors
* Run rustfmt
* Fix minor bug
* Rename Eth1Error and change to Result<T>
* Change deposit fetching mechanism from notification based to poll based
* Add deposits from eth1 chain in a given range every `x` blocks
* Modify `run` function to accommodate changes
* Minor fixes
* Fix formatting
* Fix merge issue
* Refactor with `Config` struct. Remote `ContractConfig`
* Rename eth1_chain crate to eth1
* Rename files and read abi file using `fs::read`
* Move eth1 to lib
* Remove unnecessary mutability constraint
* Add `Web3Backend` for returning actual eth1 data
* Refactor `get_eth1_votes` to return a Result
* Delete `eth1_chain` crate
* Return `Result` from `get_deposits`
* Fix range of deposits to return to beacon chain
* Add `get_block_height_by_hash` trait function
* Add naive method for getting `previous_eth1_distance`
* Add eth1 config params to main config
* Add instructions for setting up eth1 testing environment
* Add build script to fetch deposit contract abi
* Contract ABI is part of compiled binary
* Fix minor bugs
* Move docs to lib
* Add timeout to config
* Remove print statements
* Change warn to error
* Fix typos
* Removed prints in test and get timeout value from config
* Fixed error types
* Added logging to web3_fetcher
* Refactor for modified web3 api
* Fix minor stuff
* Add build script
* Tidy, hide eth1 integration tests behind flag
* Add http crate
* Add first stages of eth1_test_rig
* Fix deposits on test rig
* Fix bug with deposit count method
* Add block hash getter to http eth1
* Clean eth1 http crate and tests
* Add script to start ganache
* Adds deposit tree to eth1-http
* Extend deposit tree tests
* Tidy tests in eth1-http
* Add more detail to get block request
* Add block cache to eth1-http
* Rename deposit tree to deposit cache
* Add inital updating to eth1-http
* Tidy updater
* Fix compile bugs in tests
* Adds an Eth1DataCache builder
* Reorg eth1-http files
* Add (failing) tests for eth1 updater
* Rename files, fix bug in eth1-http
* Ensure that ganache timestamps are increasing
* Fix bugs with getting eth1data ancestors
* Improve eth1 testing, fix bugs
* Add truncate method to block cache
* Add pruning to block cache update process
* Add tests for block pruning
* Allow for dropping an expired cache.
* Add more comments
* Add first compiling version of deposit updater
* Add common fn for getting range of required blocks
* Add passing deposit update test
* Improve tests
* Fix block pruning bug
* Add tests for running two updates at once
* Add updater services to eth1
* Add deposit collection to beacon chain
* Add incomplete builder experiments
* Add first working version of beacon chain builder
* Update test harness to new beacon chain type
* Rename builder file, tidy
* Add first working client builder
* Progress further on client builder
* Update becaon node binary to use client builder
* Ensure release tests compile
* Remove old eth1 crate
* Add first pass of new lighthouse binary
* Fix websocket server startup
* Remove old binary code from beacon_node crate
* Add first working beacon node tests
* Add genesis crate, new eth1 cache_2
* Add Serivce to Eth1Cache
* Refactor with general eth1 improvements
* Add passing genesis test
* Tidy, add comments
* Add more comments to eth1 service
* Add further eth1 progress
* Fix some bugs with genesis
* Fix eth1 bugs, make eth1 linking more efficient
* Shift logic in genesis service
* Add more comments to genesis service
* Add gzip, max request values, timeouts to http
* Update testnet parameters to suit goerli testnet
* Add ability to vary Fork, fix custom spec
* Be more explicit about deposit fork version
* Start adding beacon chain eth1 option
* Add more flexibility to prod client
* Further runtime refactoring
* Allow for starting from store
* Add bootstrapping to client config
* Add remote_beacon_node crate
* Update eth1 service for more configurability
* Update eth1 tests to use less runtimes
* Patch issues with tests using too many files
* Move dummy eth1 backend flag
* Ensure all tests pass
* Add ganache-cli to Dockerfile
* Use a special docker hub image for testing
* Appease clippy
* Move validator client into lighthouse binary
* Allow starting with dummy eth1 backend
* Improve logging
* Fix dummy eth1 backend from cli
* Add extra testnet command
* Ensure consistent spec in beacon node
* Update eth1 rig to work on goerli
* Tidy lcli, start adding support for yaml config
* Add incomplete YamlConfig struct
* Remove efforts at YamlConfig
* Add incomplete eth1 voting. Blocked on spec issues
* Add (untested) first pass at eth1 vote algo
* Add tests for winning vote
* Add more tests for eth1 chain
* Add more eth1 voting tests
* Added more eth1 voting testing
* Change test name
* Add more tests to eth1 chain
* Tidy eth1 generics, add more tests
* Improve comments
* Tidy beacon_node tests
* Tidy, rename JsonRpc.. to Caching..
* Tidy voting logic
* Tidy builder docs
* Add comments, tidy eth1
* Add more comments to eth1
* Fix bug with winning_vote
* Add doc comments to the `ClientBuilder`
* Remove commented-out code
* Improve `ClientBuilder` docs
* Add comments to client config
* Add decoding test for `ClientConfig`
* Remove unused `DepositSet` struct
* Tidy `block_cache`
* Remove commented out lines
* Remove unused code in `eth1` crate
* Remove old validator binary `main.rs`
* Tidy, fix tests compile error
* Add initial tests for get_deposits
* Remove dead code in eth1_test_rig
* Update TestingDepositBuilder
* Add testing for getting eth1 deposits
* Fix duplicate rand dep
* Remove dead code
* Remove accidentally-added files
* Fix comment in eth1_genesis_service
* Add .gitignore for eth1_test_rig
* Fix bug in eth1_genesis_service
* Remove dead code from eth2_config
* Fix tabs/spaces in root Cargo.toml
* Tidy eth1 crate
* Allow for re-use of eth1 service after genesis
* Update docs for new CLI
* Change README gif
* Tidy eth1 http module
* Tidy eth1 service
* Tidy environment crate
* Remove unused file
* Tidy, add comments
* Remove commented-out code
* Address majority of Michael's comments
* Address other PR comments
* Add link to issue alongside TODO
2019-11-15 03:47:51 +00:00
|
|
|
use crate::eth1_chain::CachingEth1Backend;
|
|
|
|
use crate::events::NullEventHandler;
|
|
|
|
use crate::persisted_beacon_chain::{PersistedBeaconChain, BEACON_CHAIN_DB_KEY};
|
|
|
|
use crate::{
|
|
|
|
BeaconChain, BeaconChainTypes, CheckPoint, Eth1Chain, Eth1ChainBackend, EventHandler,
|
|
|
|
ForkChoice,
|
|
|
|
};
|
|
|
|
use eth1::Config as Eth1Config;
|
|
|
|
use lmd_ghost::{LmdGhost, ThreadSafeReducedTree};
|
|
|
|
use operation_pool::OperationPool;
|
|
|
|
use parking_lot::RwLock;
|
|
|
|
use slog::{info, Logger};
|
|
|
|
use slot_clock::{SlotClock, TestingSlotClock};
|
|
|
|
use std::marker::PhantomData;
|
|
|
|
use std::sync::Arc;
|
|
|
|
use std::time::Duration;
|
|
|
|
use store::Store;
|
|
|
|
use types::{BeaconBlock, BeaconState, ChainSpec, EthSpec, Hash256, Slot};
|
|
|
|
|
|
|
|
/// An empty struct used to "witness" all the `BeaconChainTypes` traits. It has no user-facing
|
|
|
|
/// functionality and only exists to satisfy the type system.
|
|
|
|
pub struct Witness<TStore, TSlotClock, TLmdGhost, TEth1Backend, TEthSpec, TEventHandler>(
|
|
|
|
PhantomData<(
|
|
|
|
TStore,
|
|
|
|
TSlotClock,
|
|
|
|
TLmdGhost,
|
|
|
|
TEth1Backend,
|
|
|
|
TEthSpec,
|
|
|
|
TEventHandler,
|
|
|
|
)>,
|
|
|
|
);
|
|
|
|
|
|
|
|
impl<TStore, TSlotClock, TLmdGhost, TEth1Backend, TEthSpec, TEventHandler> BeaconChainTypes
|
|
|
|
for Witness<TStore, TSlotClock, TLmdGhost, TEth1Backend, TEthSpec, TEventHandler>
|
|
|
|
where
|
|
|
|
TStore: Store + 'static,
|
|
|
|
TSlotClock: SlotClock + 'static,
|
|
|
|
TLmdGhost: LmdGhost<TStore, TEthSpec> + 'static,
|
|
|
|
TEth1Backend: Eth1ChainBackend<TEthSpec> + 'static,
|
|
|
|
TEthSpec: EthSpec + 'static,
|
|
|
|
TEventHandler: EventHandler<TEthSpec> + 'static,
|
|
|
|
{
|
|
|
|
type Store = TStore;
|
|
|
|
type SlotClock = TSlotClock;
|
|
|
|
type LmdGhost = TLmdGhost;
|
|
|
|
type Eth1Chain = TEth1Backend;
|
|
|
|
type EthSpec = TEthSpec;
|
|
|
|
type EventHandler = TEventHandler;
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Builds a `BeaconChain` by either creating anew from genesis, or, resuming from an existing chain
|
|
|
|
/// persisted to `store`.
|
|
|
|
///
|
|
|
|
/// Types may be elided and the compiler will infer them if all necessary builder methods have been
|
|
|
|
/// called. If type inference errors are being raised, it is likely that not all required methods
|
|
|
|
/// have been called.
|
|
|
|
///
|
|
|
|
/// See the tests for an example of a complete working example.
|
|
|
|
pub struct BeaconChainBuilder<T: BeaconChainTypes> {
|
|
|
|
store: Option<Arc<T::Store>>,
|
|
|
|
/// The finalized checkpoint to anchor the chain. May be genesis or a higher
|
|
|
|
/// checkpoint.
|
|
|
|
pub finalized_checkpoint: Option<CheckPoint<T::EthSpec>>,
|
|
|
|
genesis_block_root: Option<Hash256>,
|
|
|
|
op_pool: Option<OperationPool<T::EthSpec>>,
|
|
|
|
fork_choice: Option<ForkChoice<T>>,
|
|
|
|
eth1_chain: Option<Eth1Chain<T::Eth1Chain, T::EthSpec>>,
|
|
|
|
event_handler: Option<T::EventHandler>,
|
|
|
|
slot_clock: Option<T::SlotClock>,
|
|
|
|
spec: ChainSpec,
|
|
|
|
log: Option<Logger>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<TStore, TSlotClock, TLmdGhost, TEth1Backend, TEthSpec, TEventHandler>
|
|
|
|
BeaconChainBuilder<
|
|
|
|
Witness<TStore, TSlotClock, TLmdGhost, TEth1Backend, TEthSpec, TEventHandler>,
|
|
|
|
>
|
|
|
|
where
|
|
|
|
TStore: Store + 'static,
|
|
|
|
TSlotClock: SlotClock + 'static,
|
|
|
|
TLmdGhost: LmdGhost<TStore, TEthSpec> + 'static,
|
|
|
|
TEth1Backend: Eth1ChainBackend<TEthSpec> + 'static,
|
|
|
|
TEthSpec: EthSpec + 'static,
|
|
|
|
TEventHandler: EventHandler<TEthSpec> + 'static,
|
|
|
|
{
|
|
|
|
/// Returns a new builder.
|
|
|
|
///
|
|
|
|
/// The `_eth_spec_instance` parameter is only supplied to make concrete the `TEthSpec` trait.
|
|
|
|
/// This should generally be either the `MinimalEthSpec` or `MainnetEthSpec` types.
|
|
|
|
pub fn new(_eth_spec_instance: TEthSpec) -> Self {
|
|
|
|
Self {
|
|
|
|
store: None,
|
|
|
|
finalized_checkpoint: None,
|
|
|
|
genesis_block_root: None,
|
|
|
|
op_pool: None,
|
|
|
|
fork_choice: None,
|
|
|
|
eth1_chain: None,
|
|
|
|
event_handler: None,
|
|
|
|
slot_clock: None,
|
|
|
|
spec: TEthSpec::default_spec(),
|
|
|
|
log: None,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Override the default spec (as defined by `TEthSpec`).
|
|
|
|
///
|
|
|
|
/// This method should generally be called immediately after `Self::new` to ensure components
|
|
|
|
/// are started with a consistent spec.
|
|
|
|
pub fn custom_spec(mut self, spec: ChainSpec) -> Self {
|
|
|
|
self.spec = spec;
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Sets the store (database).
|
|
|
|
///
|
|
|
|
/// Should generally be called early in the build chain.
|
|
|
|
pub fn store(mut self, store: Arc<TStore>) -> Self {
|
|
|
|
self.store = Some(store);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Sets the logger.
|
|
|
|
///
|
|
|
|
/// Should generally be called early in the build chain.
|
|
|
|
pub fn logger(mut self, logger: Logger) -> Self {
|
|
|
|
self.log = Some(logger);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Attempt to load an existing chain from the builder's `Store`.
|
|
|
|
///
|
|
|
|
/// May initialize several components; including the op_pool and finalized checkpoints.
|
|
|
|
pub fn resume_from_db(mut self) -> Result<Self, String> {
|
|
|
|
let log = self
|
|
|
|
.log
|
|
|
|
.as_ref()
|
|
|
|
.ok_or_else(|| "resume_from_db requires a log".to_string())?;
|
|
|
|
|
|
|
|
info!(
|
|
|
|
log,
|
|
|
|
"Starting beacon chain";
|
|
|
|
"method" => "resume"
|
|
|
|
);
|
|
|
|
|
|
|
|
let store = self
|
|
|
|
.store
|
|
|
|
.clone()
|
|
|
|
.ok_or_else(|| "load_from_store requires a store.".to_string())?;
|
|
|
|
|
|
|
|
let key = Hash256::from_slice(&BEACON_CHAIN_DB_KEY.as_bytes());
|
|
|
|
let p: PersistedBeaconChain<
|
|
|
|
Witness<TStore, TSlotClock, TLmdGhost, TEth1Backend, TEthSpec, TEventHandler>,
|
|
|
|
> = match store.get(&key) {
|
|
|
|
Err(e) => {
|
|
|
|
return Err(format!(
|
|
|
|
"DB error when reading persisted beacon chain: {:?}",
|
|
|
|
e
|
|
|
|
))
|
|
|
|
}
|
|
|
|
Ok(None) => return Err("No persisted beacon chain found in store".into()),
|
|
|
|
Ok(Some(p)) => p,
|
|
|
|
};
|
|
|
|
|
|
|
|
self.op_pool = Some(
|
|
|
|
p.op_pool
|
|
|
|
.into_operation_pool(&p.canonical_head.beacon_state, &self.spec),
|
|
|
|
);
|
|
|
|
|
|
|
|
self.finalized_checkpoint = Some(p.canonical_head);
|
|
|
|
self.genesis_block_root = Some(p.genesis_block_root);
|
|
|
|
|
|
|
|
Ok(self)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Starts a new chain from a genesis state.
|
|
|
|
pub fn genesis_state(
|
|
|
|
mut self,
|
|
|
|
mut beacon_state: BeaconState<TEthSpec>,
|
|
|
|
) -> Result<Self, String> {
|
|
|
|
let store = self
|
|
|
|
.store
|
|
|
|
.clone()
|
|
|
|
.ok_or_else(|| "genesis_state requires a store")?;
|
|
|
|
|
|
|
|
let mut beacon_block = genesis_block(&beacon_state, &self.spec);
|
|
|
|
|
|
|
|
beacon_state
|
|
|
|
.build_all_caches(&self.spec)
|
|
|
|
.map_err(|e| format!("Failed to build genesis state caches: {:?}", e))?;
|
|
|
|
|
|
|
|
let beacon_state_root = beacon_state.canonical_root();
|
|
|
|
beacon_block.state_root = beacon_state_root;
|
|
|
|
let beacon_block_root = beacon_block.canonical_root();
|
|
|
|
|
|
|
|
self.genesis_block_root = Some(beacon_block_root);
|
|
|
|
|
|
|
|
store
|
|
|
|
.put(&beacon_state_root, &beacon_state)
|
|
|
|
.map_err(|e| format!("Failed to store genesis state: {:?}", e))?;
|
|
|
|
store
|
|
|
|
.put(&beacon_block_root, &beacon_block)
|
|
|
|
.map_err(|e| format!("Failed to store genesis block: {:?}", e))?;
|
|
|
|
|
|
|
|
// Store the genesis block under the `ZERO_HASH` key.
|
|
|
|
store.put(&Hash256::zero(), &beacon_block).map_err(|e| {
|
|
|
|
format!(
|
|
|
|
"Failed to store genesis block under 0x00..00 alias: {:?}",
|
|
|
|
e
|
|
|
|
)
|
|
|
|
})?;
|
|
|
|
|
|
|
|
self.finalized_checkpoint = Some(CheckPoint {
|
|
|
|
beacon_block_root,
|
|
|
|
beacon_block,
|
|
|
|
beacon_state_root,
|
|
|
|
beacon_state,
|
|
|
|
});
|
|
|
|
|
|
|
|
Ok(self.empty_op_pool())
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Sets the `BeaconChain` fork choice backend.
|
|
|
|
///
|
|
|
|
/// Requires the store and state to have been specified earlier in the build chain.
|
|
|
|
pub fn fork_choice_backend(mut self, backend: TLmdGhost) -> Result<Self, String> {
|
|
|
|
let store = self
|
|
|
|
.store
|
|
|
|
.clone()
|
|
|
|
.ok_or_else(|| "reduced_tree_fork_choice requires a store")?;
|
|
|
|
let genesis_block_root = self
|
|
|
|
.genesis_block_root
|
|
|
|
.ok_or_else(|| "fork_choice_backend requires a genesis_block_root")?;
|
|
|
|
|
2019-11-21 00:47:30 +00:00
|
|
|
self.fork_choice = Some(ForkChoice::new(
|
|
|
|
store,
|
|
|
|
backend,
|
|
|
|
genesis_block_root,
|
|
|
|
self.spec.genesis_slot,
|
|
|
|
));
|
Eth1 Integration (#542)
* Refactor to cache Eth1Data
* Fix merge conflicts and minor refactorings
* Rename Eth1Cache to Eth1DataCache
* Refactor events subscription
* Add deposits module to interface with BeaconChain deposits
* Remove utils
* Rename to types.rs and add trait constraints to Eth1DataFetcher
* Confirm to trait constraints. Make Web3DataFetcher cloneable
* Make fetcher object member of deposit and eth1_data cache and other fixes
* Fix update_cache function
* Move fetch_eth1_data to impl block
* Fix deposit tests
* Create Eth1 object for interfacing with Beacon chain
* Add `run` function for running update_cache and subscribe_deposit_logs tasks
* Add logging
* Run `cargo fmt` and make tests pass
* Convert sync functions to async
* Add timeouts to web3 functions
* Return futures from cache functions
* Add failed chaining of futures
* Working cache updation
* Clean up tests and `update_cache` function
* Refactor `get_eth1_data` functions to work with future returning functions
* Refactor eth1 `run` function to work with modified `update_cache` api
* Minor changes
* Add distance parameter to `update_cache`
* Fix tests and other minor fixes
* Working integration with cache and deposits
* Add merkle_tree construction, proof generation and verification code
* Add function to construct and fetch Deposits for BeaconNode
* Add error handling
* Import ssz
* Add error handling to eth1 cache and fix minor errors
* Run rustfmt
* Fix minor bug
* Rename Eth1Error and change to Result<T>
* Change deposit fetching mechanism from notification based to poll based
* Add deposits from eth1 chain in a given range every `x` blocks
* Modify `run` function to accommodate changes
* Minor fixes
* Fix formatting
* Initial commit. web3 api working.
* Tidied up lib. Add function for fetching logs.
* Refactor with `Eth1DataFetcher` trait
* Add parsing for deposit contract logs and get_eth1_data function
* Add `get_eth1_votes` function
* Refactor to cache Eth1Data
* Fix merge conflicts and minor refactorings
* Rename Eth1Cache to Eth1DataCache
* Refactor events subscription
* Add deposits module to interface with BeaconChain deposits
* Remove utils
* Rename to types.rs and add trait constraints to Eth1DataFetcher
* Confirm to trait constraints. Make Web3DataFetcher cloneable
* Make fetcher object member of deposit and eth1_data cache and other fixes
* Fix update_cache function
* Move fetch_eth1_data to impl block
* Fix deposit tests
* Create Eth1 object for interfacing with Beacon chain
* Add `run` function for running update_cache and subscribe_deposit_logs tasks
* Add logging
* Run `cargo fmt` and make tests pass
* Convert sync functions to async
* Add timeouts to web3 functions
* Return futures from cache functions
* Add failed chaining of futures
* Working cache updation
* Clean up tests and `update_cache` function
* Refactor `get_eth1_data` functions to work with future returning functions
* Refactor eth1 `run` function to work with modified `update_cache` api
* Minor changes
* Add distance parameter to `update_cache`
* Fix tests and other minor fixes
* Working integration with cache and deposits
* Add merkle_tree construction, proof generation and verification code
* Add function to construct and fetch Deposits for BeaconNode
* Add error handling
* Import ssz
* Add error handling to eth1 cache and fix minor errors
* Run rustfmt
* Fix minor bug
* Rename Eth1Error and change to Result<T>
* Change deposit fetching mechanism from notification based to poll based
* Add deposits from eth1 chain in a given range every `x` blocks
* Modify `run` function to accommodate changes
* Minor fixes
* Fix formatting
* Fix merge issue
* Refactor with `Config` struct. Remote `ContractConfig`
* Rename eth1_chain crate to eth1
* Rename files and read abi file using `fs::read`
* Move eth1 to lib
* Remove unnecessary mutability constraint
* Add `Web3Backend` for returning actual eth1 data
* Refactor `get_eth1_votes` to return a Result
* Delete `eth1_chain` crate
* Return `Result` from `get_deposits`
* Fix range of deposits to return to beacon chain
* Add `get_block_height_by_hash` trait function
* Add naive method for getting `previous_eth1_distance`
* Add eth1 config params to main config
* Add instructions for setting up eth1 testing environment
* Add build script to fetch deposit contract abi
* Contract ABI is part of compiled binary
* Fix minor bugs
* Move docs to lib
* Add timeout to config
* Remove print statements
* Change warn to error
* Fix typos
* Removed prints in test and get timeout value from config
* Fixed error types
* Added logging to web3_fetcher
* Refactor for modified web3 api
* Fix minor stuff
* Add build script
* Tidy, hide eth1 integration tests behind flag
* Add http crate
* Add first stages of eth1_test_rig
* Fix deposits on test rig
* Fix bug with deposit count method
* Add block hash getter to http eth1
* Clean eth1 http crate and tests
* Add script to start ganache
* Adds deposit tree to eth1-http
* Extend deposit tree tests
* Tidy tests in eth1-http
* Add more detail to get block request
* Add block cache to eth1-http
* Rename deposit tree to deposit cache
* Add inital updating to eth1-http
* Tidy updater
* Fix compile bugs in tests
* Adds an Eth1DataCache builder
* Reorg eth1-http files
* Add (failing) tests for eth1 updater
* Rename files, fix bug in eth1-http
* Ensure that ganache timestamps are increasing
* Fix bugs with getting eth1data ancestors
* Improve eth1 testing, fix bugs
* Add truncate method to block cache
* Add pruning to block cache update process
* Add tests for block pruning
* Allow for dropping an expired cache.
* Add more comments
* Add first compiling version of deposit updater
* Add common fn for getting range of required blocks
* Add passing deposit update test
* Improve tests
* Fix block pruning bug
* Add tests for running two updates at once
* Add updater services to eth1
* Add deposit collection to beacon chain
* Add incomplete builder experiments
* Add first working version of beacon chain builder
* Update test harness to new beacon chain type
* Rename builder file, tidy
* Add first working client builder
* Progress further on client builder
* Update becaon node binary to use client builder
* Ensure release tests compile
* Remove old eth1 crate
* Add first pass of new lighthouse binary
* Fix websocket server startup
* Remove old binary code from beacon_node crate
* Add first working beacon node tests
* Add genesis crate, new eth1 cache_2
* Add Serivce to Eth1Cache
* Refactor with general eth1 improvements
* Add passing genesis test
* Tidy, add comments
* Add more comments to eth1 service
* Add further eth1 progress
* Fix some bugs with genesis
* Fix eth1 bugs, make eth1 linking more efficient
* Shift logic in genesis service
* Add more comments to genesis service
* Add gzip, max request values, timeouts to http
* Update testnet parameters to suit goerli testnet
* Add ability to vary Fork, fix custom spec
* Be more explicit about deposit fork version
* Start adding beacon chain eth1 option
* Add more flexibility to prod client
* Further runtime refactoring
* Allow for starting from store
* Add bootstrapping to client config
* Add remote_beacon_node crate
* Update eth1 service for more configurability
* Update eth1 tests to use less runtimes
* Patch issues with tests using too many files
* Move dummy eth1 backend flag
* Ensure all tests pass
* Add ganache-cli to Dockerfile
* Use a special docker hub image for testing
* Appease clippy
* Move validator client into lighthouse binary
* Allow starting with dummy eth1 backend
* Improve logging
* Fix dummy eth1 backend from cli
* Add extra testnet command
* Ensure consistent spec in beacon node
* Update eth1 rig to work on goerli
* Tidy lcli, start adding support for yaml config
* Add incomplete YamlConfig struct
* Remove efforts at YamlConfig
* Add incomplete eth1 voting. Blocked on spec issues
* Add (untested) first pass at eth1 vote algo
* Add tests for winning vote
* Add more tests for eth1 chain
* Add more eth1 voting tests
* Added more eth1 voting testing
* Change test name
* Add more tests to eth1 chain
* Tidy eth1 generics, add more tests
* Improve comments
* Tidy beacon_node tests
* Tidy, rename JsonRpc.. to Caching..
* Tidy voting logic
* Tidy builder docs
* Add comments, tidy eth1
* Add more comments to eth1
* Fix bug with winning_vote
* Add doc comments to the `ClientBuilder`
* Remove commented-out code
* Improve `ClientBuilder` docs
* Add comments to client config
* Add decoding test for `ClientConfig`
* Remove unused `DepositSet` struct
* Tidy `block_cache`
* Remove commented out lines
* Remove unused code in `eth1` crate
* Remove old validator binary `main.rs`
* Tidy, fix tests compile error
* Add initial tests for get_deposits
* Remove dead code in eth1_test_rig
* Update TestingDepositBuilder
* Add testing for getting eth1 deposits
* Fix duplicate rand dep
* Remove dead code
* Remove accidentally-added files
* Fix comment in eth1_genesis_service
* Add .gitignore for eth1_test_rig
* Fix bug in eth1_genesis_service
* Remove dead code from eth2_config
* Fix tabs/spaces in root Cargo.toml
* Tidy eth1 crate
* Allow for re-use of eth1 service after genesis
* Update docs for new CLI
* Change README gif
* Tidy eth1 http module
* Tidy eth1 service
* Tidy environment crate
* Remove unused file
* Tidy, add comments
* Remove commented-out code
* Address majority of Michael's comments
* Address other PR comments
* Add link to issue alongside TODO
2019-11-15 03:47:51 +00:00
|
|
|
|
|
|
|
Ok(self)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Sets the `BeaconChain` eth1 backend.
|
|
|
|
pub fn eth1_backend(mut self, backend: Option<TEth1Backend>) -> Self {
|
|
|
|
self.eth1_chain = backend.map(Eth1Chain::new);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Sets the `BeaconChain` event handler backend.
|
|
|
|
///
|
|
|
|
/// For example, provide `WebSocketSender` as a `handler`.
|
|
|
|
pub fn event_handler(mut self, handler: TEventHandler) -> Self {
|
|
|
|
self.event_handler = Some(handler);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Sets the `BeaconChain` slot clock.
|
|
|
|
///
|
|
|
|
/// For example, provide `SystemTimeSlotClock` as a `clock`.
|
|
|
|
pub fn slot_clock(mut self, clock: TSlotClock) -> Self {
|
|
|
|
self.slot_clock = Some(clock);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Creates a new, empty operation pool.
|
|
|
|
fn empty_op_pool(mut self) -> Self {
|
|
|
|
self.op_pool = Some(OperationPool::new());
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Consumes `self`, returning a `BeaconChain` if all required parameters have been supplied.
|
|
|
|
///
|
|
|
|
/// An error will be returned at runtime if all required parameters have not been configured.
|
|
|
|
///
|
|
|
|
/// Will also raise ambiguous type errors at compile time if some parameters have not been
|
|
|
|
/// configured.
|
|
|
|
#[allow(clippy::type_complexity)] // I think there's nothing to be gained here from a type alias.
|
|
|
|
pub fn build(
|
|
|
|
self,
|
|
|
|
) -> Result<
|
|
|
|
BeaconChain<Witness<TStore, TSlotClock, TLmdGhost, TEth1Backend, TEthSpec, TEventHandler>>,
|
|
|
|
String,
|
|
|
|
> {
|
|
|
|
let mut canonical_head = self
|
|
|
|
.finalized_checkpoint
|
|
|
|
.ok_or_else(|| "Cannot build without a state".to_string())?;
|
|
|
|
|
|
|
|
canonical_head
|
|
|
|
.beacon_state
|
|
|
|
.build_all_caches(&self.spec)
|
|
|
|
.map_err(|e| format!("Failed to build state caches: {:?}", e))?;
|
|
|
|
|
|
|
|
let log = self
|
|
|
|
.log
|
|
|
|
.ok_or_else(|| "Cannot build without a logger".to_string())?;
|
|
|
|
|
|
|
|
if canonical_head.beacon_block.state_root != canonical_head.beacon_state_root {
|
|
|
|
return Err("beacon_block.state_root != beacon_state".to_string());
|
|
|
|
}
|
|
|
|
|
|
|
|
let beacon_chain = BeaconChain {
|
|
|
|
spec: self.spec,
|
|
|
|
store: self
|
|
|
|
.store
|
|
|
|
.ok_or_else(|| "Cannot build without store".to_string())?,
|
|
|
|
slot_clock: self
|
|
|
|
.slot_clock
|
|
|
|
.ok_or_else(|| "Cannot build without slot clock".to_string())?,
|
|
|
|
op_pool: self
|
|
|
|
.op_pool
|
|
|
|
.ok_or_else(|| "Cannot build without op pool".to_string())?,
|
|
|
|
eth1_chain: self.eth1_chain,
|
|
|
|
canonical_head: RwLock::new(canonical_head),
|
|
|
|
genesis_block_root: self
|
|
|
|
.genesis_block_root
|
|
|
|
.ok_or_else(|| "Cannot build without a genesis block root".to_string())?,
|
|
|
|
fork_choice: self
|
|
|
|
.fork_choice
|
|
|
|
.ok_or_else(|| "Cannot build without a fork choice".to_string())?,
|
|
|
|
event_handler: self
|
|
|
|
.event_handler
|
|
|
|
.ok_or_else(|| "Cannot build without an event handler".to_string())?,
|
|
|
|
log: log.clone(),
|
|
|
|
};
|
|
|
|
|
|
|
|
info!(
|
|
|
|
log,
|
|
|
|
"Beacon chain initialized";
|
|
|
|
"head_state" => format!("{}", beacon_chain.head().beacon_state_root),
|
|
|
|
"head_block" => format!("{}", beacon_chain.head().beacon_block_root),
|
|
|
|
"head_slot" => format!("{}", beacon_chain.head().beacon_block.slot),
|
|
|
|
);
|
|
|
|
|
|
|
|
Ok(beacon_chain)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<TStore, TSlotClock, TEth1Backend, TEthSpec, TEventHandler>
|
|
|
|
BeaconChainBuilder<
|
|
|
|
Witness<
|
|
|
|
TStore,
|
|
|
|
TSlotClock,
|
|
|
|
ThreadSafeReducedTree<TStore, TEthSpec>,
|
|
|
|
TEth1Backend,
|
|
|
|
TEthSpec,
|
|
|
|
TEventHandler,
|
|
|
|
>,
|
|
|
|
>
|
|
|
|
where
|
|
|
|
TStore: Store + 'static,
|
|
|
|
TSlotClock: SlotClock + 'static,
|
|
|
|
TEth1Backend: Eth1ChainBackend<TEthSpec> + 'static,
|
|
|
|
TEthSpec: EthSpec + 'static,
|
|
|
|
TEventHandler: EventHandler<TEthSpec> + 'static,
|
|
|
|
{
|
|
|
|
/// Initializes a new, empty (no recorded votes or blocks) fork choice, using the
|
|
|
|
/// `ThreadSafeReducedTree` backend.
|
|
|
|
///
|
|
|
|
/// Requires the store and state to be initialized.
|
|
|
|
pub fn empty_reduced_tree_fork_choice(self) -> Result<Self, String> {
|
|
|
|
let store = self
|
|
|
|
.store
|
|
|
|
.clone()
|
|
|
|
.ok_or_else(|| "reduced_tree_fork_choice requires a store")?;
|
|
|
|
let finalized_checkpoint = &self
|
|
|
|
.finalized_checkpoint
|
|
|
|
.as_ref()
|
|
|
|
.expect("should have finalized checkpoint");
|
|
|
|
|
|
|
|
let backend = ThreadSafeReducedTree::new(
|
|
|
|
store.clone(),
|
|
|
|
&finalized_checkpoint.beacon_block,
|
|
|
|
finalized_checkpoint.beacon_block_root,
|
|
|
|
);
|
|
|
|
|
|
|
|
self.fork_choice_backend(backend)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<TStore, TSlotClock, TLmdGhost, TEthSpec, TEventHandler>
|
|
|
|
BeaconChainBuilder<
|
|
|
|
Witness<
|
|
|
|
TStore,
|
|
|
|
TSlotClock,
|
|
|
|
TLmdGhost,
|
|
|
|
CachingEth1Backend<TEthSpec, TStore>,
|
|
|
|
TEthSpec,
|
|
|
|
TEventHandler,
|
|
|
|
>,
|
|
|
|
>
|
|
|
|
where
|
|
|
|
TStore: Store + 'static,
|
|
|
|
TSlotClock: SlotClock + 'static,
|
|
|
|
TLmdGhost: LmdGhost<TStore, TEthSpec> + 'static,
|
|
|
|
TEthSpec: EthSpec + 'static,
|
|
|
|
TEventHandler: EventHandler<TEthSpec> + 'static,
|
|
|
|
{
|
|
|
|
/// Sets the `BeaconChain` eth1 back-end to `CachingEth1Backend`.
|
|
|
|
pub fn caching_eth1_backend(self, backend: CachingEth1Backend<TEthSpec, TStore>) -> Self {
|
|
|
|
self.eth1_backend(Some(backend))
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Do not use any eth1 backend. The client will not be able to produce beacon blocks.
|
|
|
|
pub fn no_eth1_backend(self) -> Self {
|
|
|
|
self.eth1_backend(None)
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Sets the `BeaconChain` eth1 back-end to produce predictably junk data when producing blocks.
|
|
|
|
pub fn dummy_eth1_backend(mut self) -> Result<Self, String> {
|
|
|
|
let log = self
|
|
|
|
.log
|
|
|
|
.as_ref()
|
|
|
|
.ok_or_else(|| "dummy_eth1_backend requires a log".to_string())?;
|
|
|
|
let store = self
|
|
|
|
.store
|
|
|
|
.clone()
|
|
|
|
.ok_or_else(|| "dummy_eth1_backend requires a store.".to_string())?;
|
|
|
|
|
|
|
|
let backend = CachingEth1Backend::new(Eth1Config::default(), log.clone(), store);
|
|
|
|
|
|
|
|
let mut eth1_chain = Eth1Chain::new(backend);
|
|
|
|
eth1_chain.use_dummy_backend = true;
|
|
|
|
|
|
|
|
self.eth1_chain = Some(eth1_chain);
|
|
|
|
|
|
|
|
Ok(self)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<TStore, TLmdGhost, TEth1Backend, TEthSpec, TEventHandler>
|
|
|
|
BeaconChainBuilder<
|
|
|
|
Witness<TStore, TestingSlotClock, TLmdGhost, TEth1Backend, TEthSpec, TEventHandler>,
|
|
|
|
>
|
|
|
|
where
|
|
|
|
TStore: Store + 'static,
|
|
|
|
TLmdGhost: LmdGhost<TStore, TEthSpec> + 'static,
|
|
|
|
TEth1Backend: Eth1ChainBackend<TEthSpec> + 'static,
|
|
|
|
TEthSpec: EthSpec + 'static,
|
|
|
|
TEventHandler: EventHandler<TEthSpec> + 'static,
|
|
|
|
{
|
|
|
|
/// Sets the `BeaconChain` slot clock to `TestingSlotClock`.
|
|
|
|
///
|
|
|
|
/// Requires the state to be initialized.
|
|
|
|
pub fn testing_slot_clock(self, slot_duration: Duration) -> Result<Self, String> {
|
|
|
|
let genesis_time = self
|
|
|
|
.finalized_checkpoint
|
|
|
|
.as_ref()
|
|
|
|
.ok_or_else(|| "testing_slot_clock requires an initialized state")?
|
|
|
|
.beacon_state
|
|
|
|
.genesis_time;
|
|
|
|
|
|
|
|
let slot_clock = TestingSlotClock::new(
|
|
|
|
Slot::new(0),
|
|
|
|
Duration::from_secs(genesis_time),
|
|
|
|
slot_duration,
|
|
|
|
);
|
|
|
|
|
|
|
|
Ok(self.slot_clock(slot_clock))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<TStore, TSlotClock, TLmdGhost, TEth1Backend, TEthSpec>
|
|
|
|
BeaconChainBuilder<
|
|
|
|
Witness<TStore, TSlotClock, TLmdGhost, TEth1Backend, TEthSpec, NullEventHandler<TEthSpec>>,
|
|
|
|
>
|
|
|
|
where
|
|
|
|
TStore: Store + 'static,
|
|
|
|
TSlotClock: SlotClock + 'static,
|
|
|
|
TLmdGhost: LmdGhost<TStore, TEthSpec> + 'static,
|
|
|
|
TEth1Backend: Eth1ChainBackend<TEthSpec> + 'static,
|
|
|
|
TEthSpec: EthSpec + 'static,
|
|
|
|
{
|
|
|
|
/// Sets the `BeaconChain` event handler to `NullEventHandler`.
|
|
|
|
pub fn null_event_handler(self) -> Self {
|
|
|
|
let handler = NullEventHandler::default();
|
|
|
|
self.event_handler(handler)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn genesis_block<T: EthSpec>(genesis_state: &BeaconState<T>, spec: &ChainSpec) -> BeaconBlock<T> {
|
|
|
|
let mut genesis_block = BeaconBlock::empty(&spec);
|
|
|
|
|
|
|
|
genesis_block.state_root = genesis_state.canonical_root();
|
|
|
|
|
|
|
|
genesis_block
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod test {
|
|
|
|
use super::*;
|
|
|
|
use eth2_hashing::hash;
|
|
|
|
use genesis::{generate_deterministic_keypairs, interop_genesis_state};
|
|
|
|
use sloggers::{null::NullLoggerBuilder, Build};
|
|
|
|
use ssz::Encode;
|
|
|
|
use std::time::Duration;
|
|
|
|
use store::MemoryStore;
|
|
|
|
use types::{EthSpec, MinimalEthSpec, Slot};
|
|
|
|
|
|
|
|
type TestEthSpec = MinimalEthSpec;
|
|
|
|
|
|
|
|
fn get_logger() -> Logger {
|
|
|
|
let builder = NullLoggerBuilder;
|
|
|
|
builder.build().expect("should build logger")
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn recent_genesis() {
|
|
|
|
let validator_count = 8;
|
|
|
|
let genesis_time = 13371337;
|
|
|
|
|
|
|
|
let log = get_logger();
|
|
|
|
let store = Arc::new(MemoryStore::open());
|
|
|
|
let spec = MinimalEthSpec::default_spec();
|
|
|
|
|
|
|
|
let genesis_state = interop_genesis_state(
|
|
|
|
&generate_deterministic_keypairs(validator_count),
|
|
|
|
genesis_time,
|
|
|
|
&spec,
|
|
|
|
)
|
|
|
|
.expect("should create interop genesis state");
|
|
|
|
|
|
|
|
let chain = BeaconChainBuilder::new(MinimalEthSpec)
|
|
|
|
.logger(log.clone())
|
|
|
|
.store(store.clone())
|
|
|
|
.genesis_state(genesis_state)
|
|
|
|
.expect("should build state using recent genesis")
|
|
|
|
.dummy_eth1_backend()
|
|
|
|
.expect("should build the dummy eth1 backend")
|
|
|
|
.null_event_handler()
|
|
|
|
.testing_slot_clock(Duration::from_secs(1))
|
|
|
|
.expect("should configure testing slot clock")
|
|
|
|
.empty_reduced_tree_fork_choice()
|
|
|
|
.expect("should add fork choice to builder")
|
|
|
|
.build()
|
|
|
|
.expect("should build");
|
|
|
|
|
|
|
|
let head = chain.head();
|
|
|
|
let state = head.beacon_state;
|
|
|
|
let block = head.beacon_block;
|
|
|
|
|
|
|
|
assert_eq!(state.slot, Slot::new(0), "should start from genesis");
|
|
|
|
assert_eq!(
|
|
|
|
state.genesis_time, 13371337,
|
|
|
|
"should have the correct genesis time"
|
|
|
|
);
|
|
|
|
assert_eq!(
|
|
|
|
block.state_root,
|
|
|
|
state.canonical_root(),
|
|
|
|
"block should have correct state root"
|
|
|
|
);
|
|
|
|
assert_eq!(
|
|
|
|
chain
|
|
|
|
.store
|
|
|
|
.get::<BeaconBlock<_>>(&Hash256::zero())
|
|
|
|
.expect("should read db")
|
|
|
|
.expect("should find genesis block"),
|
|
|
|
block,
|
|
|
|
"should store genesis block under zero hash alias"
|
|
|
|
);
|
|
|
|
assert_eq!(
|
|
|
|
state.validators.len(),
|
|
|
|
validator_count,
|
|
|
|
"should have correct validator count"
|
|
|
|
);
|
|
|
|
assert_eq!(
|
|
|
|
chain.genesis_block_root,
|
|
|
|
block.canonical_root(),
|
|
|
|
"should have correct genesis block root"
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn interop_state() {
|
|
|
|
let validator_count = 16;
|
|
|
|
let genesis_time = 42;
|
|
|
|
let spec = &TestEthSpec::default_spec();
|
|
|
|
|
|
|
|
let keypairs = generate_deterministic_keypairs(validator_count);
|
|
|
|
|
|
|
|
let state = interop_genesis_state::<TestEthSpec>(&keypairs, genesis_time, spec)
|
|
|
|
.expect("should build state");
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
state.eth1_data.block_hash,
|
|
|
|
Hash256::from_slice(&[0x42; 32]),
|
|
|
|
"eth1 block hash should be co-ordinated junk"
|
|
|
|
);
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
state.genesis_time, genesis_time,
|
|
|
|
"genesis time should be as specified"
|
|
|
|
);
|
|
|
|
|
|
|
|
for b in &state.balances {
|
|
|
|
assert_eq!(
|
|
|
|
*b, spec.max_effective_balance,
|
|
|
|
"validator balances should be max effective balance"
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
for v in &state.validators {
|
|
|
|
let creds = v.withdrawal_credentials.as_bytes();
|
|
|
|
assert_eq!(
|
|
|
|
creds[0], spec.bls_withdrawal_prefix_byte,
|
|
|
|
"first byte of withdrawal creds should be bls prefix"
|
|
|
|
);
|
|
|
|
assert_eq!(
|
|
|
|
&creds[1..],
|
|
|
|
&hash(&v.pubkey.as_ssz_bytes())[1..],
|
|
|
|
"rest of withdrawal creds should be pubkey hash"
|
|
|
|
)
|
|
|
|
}
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
state.balances.len(),
|
|
|
|
validator_count,
|
|
|
|
"validator balances len should be correct"
|
|
|
|
);
|
|
|
|
|
|
|
|
assert_eq!(
|
|
|
|
state.validators.len(),
|
|
|
|
validator_count,
|
|
|
|
"validator count should be correct"
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|