Remove Goerli support (#5770)

* Delete Goerli

* Generate validator manager test vectors

* Fix newlines in CLI docs

* Fix deposit-cli tests

* Run web3signer tests for Holesky from Bellatrix

* Fix mainnet bellatrix web3signer test

* Merge remote-tracking branch 'origin/unstable' into rm-goerli

* Fix snafu
This commit is contained in:
Michael Sproul
2024-05-27 17:59:10 +10:00
committed by GitHub
parent 6f05863007
commit 7f8b600f2a
46 changed files with 64 additions and 255 deletions

View File

@@ -23,7 +23,7 @@ use tokio::time::{interval_at, Duration, Instant};
use types::{ChainSpec, DepositTreeSnapshot, Eth1Data, EthSpec, Unsigned};
/// Indicates the default eth1 chain id we use for the deposit contract.
pub const DEFAULT_CHAIN_ID: Eth1Id = Eth1Id::Goerli;
pub const DEFAULT_CHAIN_ID: Eth1Id = Eth1Id::Mainnet;
/// Indicates the default eth1 endpoint.
pub const DEFAULT_ETH1_ENDPOINT: &str = "http://localhost:8545";
@@ -266,7 +266,7 @@ pub struct Config {
pub endpoint: Eth1Endpoint,
/// The address the `BlockCache` and `DepositCache` should assume is the canonical deposit contract.
pub deposit_contract_address: String,
/// The eth1 chain id where the deposit contract is deployed (Goerli/Mainnet).
/// The eth1 chain id where the deposit contract is deployed (Holesky/Mainnet).
pub chain_id: Eth1Id,
/// Defines the first block that the `DepositCache` will start searching for deposit logs.
///
@@ -450,11 +450,6 @@ impl Service {
/// Returns the follow distance that has been shortened to accommodate for differences in the
/// spacing between blocks.
///
/// ## Notes
///
/// This is useful since the spec declares `SECONDS_PER_ETH1_BLOCK` to be `14`, whilst it is
/// actually `15` on Goerli.
pub fn cache_follow_distance(&self) -> u64 {
self.config().cache_follow_distance()
}