diff --git a/book/src/database-migrations.md b/book/src/database-migrations.md index 7219a0f6b..ef7e95cc7 100644 --- a/book/src/database-migrations.md +++ b/book/src/database-migrations.md @@ -116,7 +116,7 @@ Several conditions need to be met in order to run `lighthouse db`: 2. The command must run as the user that owns the beacon node database. If you are using systemd then your beacon node might run as a user called `lighthousebeacon`. 3. The `--datadir` flag must be set to the location of the Lighthouse data directory. -4. The `--network` flag must be set to the correct network, e.g. `mainnet`, `prater` or `ropsten`. +4. The `--network` flag must be set to the correct network, e.g. `mainnet`, `prater` or `sepolia`. The general form for a `lighthouse db` command is: diff --git a/common/eth2_config/src/lib.rs b/common/eth2_config/src/lib.rs index 7e3c025a8..7e5506667 100644 --- a/common/eth2_config/src/lib.rs +++ b/common/eth2_config/src/lib.rs @@ -278,26 +278,6 @@ define_hardcoded_nets!( // directory. GENESIS_STATE_IS_KNOWN ), - ( - // Network name (must be unique among all networks). - kiln, - // The name of the directory in the `eth2_network_config/built_in_network_configs` - // directory where the configuration files are located for this network. - "kiln", - // Set to `true` if the genesis state can be found in the `built_in_network_configs` - // directory. - GENESIS_STATE_IS_KNOWN - ), - ( - // Network name (must be unique among all networks). - ropsten, - // The name of the directory in the `eth2_network_config/built_in_network_configs` - // directory where the configuration files are located for this network. - "ropsten", - // Set to `true` if the genesis state can be found in the `built_in_network_configs` - // directory. - GENESIS_STATE_IS_KNOWN - ), ( // Network name (must be unique among all networks). sepolia, diff --git a/common/eth2_network_config/built_in_network_configs/kiln/boot_enr.yaml b/common/eth2_network_config/built_in_network_configs/kiln/boot_enr.yaml deleted file mode 100644 index 4c03b0f19..000000000 --- a/common/eth2_network_config/built_in_network_configs/kiln/boot_enr.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- enr:-Iq4QMCTfIMXnow27baRUb35Q8iiFHSIDBJh6hQM5Axohhf4b6Kr_cOCu0htQ5WvVqKvFgY28893DHAg8gnBAXsAVqmGAX53x8JggmlkgnY0gmlwhLKAlv6Jc2VjcDI1NmsxoQK6S-Cii_KmfFdUJL2TANL3ksaKUnNXvTCv1tLwXs0QgIN1ZHCCIyk -- enr:-KG4QFkPJUFWuONp5grM94OJvNht9wX6N36sA4wqucm6Z02ECWBQRmh6AzndaLVGYBHWre67mjK-E0uKt2CIbWrsZ_8DhGV0aDKQc6pfXHAAAHAyAAAAAAAAAIJpZIJ2NIJpcISl6LTmiXNlY3AyNTZrMaEDHlSNOgYrNWP8_l_WXqDMRvjv6gUAvHKizfqDDVc8feaDdGNwgiMog3VkcIIjKA -- enr:-MK4QI-wkVW1PxL4ksUM4H_hMgTTwxKMzvvDMfoiwPBuRxcsGkrGPLo4Kho3Ri1DEtJG4B6pjXddbzA9iF2gVctxv42GAX9v5WG5h2F0dG5ldHOIAAAAAAAAAACEZXRoMpBzql9ccAAAcDIAAAAAAAAAgmlkgnY0gmlwhKRcjMiJc2VjcDI1NmsxoQK1fc46pmVHKq8HNYLkSVaUv4uK2UBsGgjjGWU6AAhAY4hzeW5jbmV0cwCDdGNwgiMog3VkcIIjKA diff --git a/common/eth2_network_config/built_in_network_configs/kiln/config.yaml b/common/eth2_network_config/built_in_network_configs/kiln/config.yaml deleted file mode 100644 index 5631c8a0b..000000000 --- a/common/eth2_network_config/built_in_network_configs/kiln/config.yaml +++ /dev/null @@ -1,69 +0,0 @@ -# Extends the mainnet preset -CONFIG_NAME: 'kiln' -PRESET_BASE: 'mainnet' -# Genesis -# --------------------------------------------------------------- -MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 95000 -# Mar 11th, 2022, 14:00 UTC -MIN_GENESIS_TIME: 1647007200 -# Genesis fork -GENESIS_FORK_VERSION: 0x70000069 -# 300 seconds (5 min) -GENESIS_DELAY: 300 - - -# Forking -# --------------------------------------------------------------- -# Some forks are disabled for now: -# - These may be re-assigned to another fork-version later -# - Temporarily set to max uint64 value: 2**64 - 1 - -# Altair -ALTAIR_FORK_VERSION: 0x70000070 -ALTAIR_FORK_EPOCH: 50 -# Bellatrix -BELLATRIX_FORK_VERSION: 0x70000071 -BELLATRIX_FORK_EPOCH: 150 -TERMINAL_TOTAL_DIFFICULTY: 20000000000000 -TERMINAL_BLOCK_HASH: 0x0000000000000000000000000000000000000000000000000000000000000000 -TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: 18446744073709551615 - -# Sharding -SHARDING_FORK_VERSION: 0x03000000 -SHARDING_FORK_EPOCH: 18446744073709551615 - - -# Time parameters -# --------------------------------------------------------------- -# 12 seconds -SECONDS_PER_SLOT: 12 -# 14 (estimate from Eth1 mainnet) -SECONDS_PER_ETH1_BLOCK: 14 -# 2**8 (= 256) epochs ~27 hours -MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256 -# 2**8 (= 256) epochs ~27 hours -SHARD_COMMITTEE_PERIOD: 256 -# 16 blocks is ~190s -ETH1_FOLLOW_DISTANCE: 16 - - -# Validator cycle -# --------------------------------------------------------------- -# 2**2 (= 4) -INACTIVITY_SCORE_BIAS: 4 -# 2**4 (= 16) -INACTIVITY_SCORE_RECOVERY_RATE: 16 -# 2**4 * 10**9 (= 16,000,000,000) Gwei -EJECTION_BALANCE: 16000000000 -# 2**2 (= 4) -MIN_PER_EPOCH_CHURN_LIMIT: 4 -# 2**16 (= 65,536) -CHURN_LIMIT_QUOTIENT: 65536 - - -# Deposit contract -# --------------------------------------------------------------- -# Custom Ethereum testnet -DEPOSIT_CHAIN_ID: 1337802 -DEPOSIT_NETWORK_ID: 1337802 -DEPOSIT_CONTRACT_ADDRESS: 0x4242424242424242424242424242424242424242 diff --git a/common/eth2_network_config/built_in_network_configs/kiln/deploy_block.txt b/common/eth2_network_config/built_in_network_configs/kiln/deploy_block.txt deleted file mode 100644 index c22708346..000000000 --- a/common/eth2_network_config/built_in_network_configs/kiln/deploy_block.txt +++ /dev/null @@ -1 +0,0 @@ -0 \ No newline at end of file diff --git a/common/eth2_network_config/built_in_network_configs/kiln/genesis.ssz.zip b/common/eth2_network_config/built_in_network_configs/kiln/genesis.ssz.zip deleted file mode 100644 index 309b323a5..000000000 Binary files a/common/eth2_network_config/built_in_network_configs/kiln/genesis.ssz.zip and /dev/null differ diff --git a/common/eth2_network_config/built_in_network_configs/ropsten/boot_enr.yaml b/common/eth2_network_config/built_in_network_configs/ropsten/boot_enr.yaml deleted file mode 100644 index 27e6e53fc..000000000 --- a/common/eth2_network_config/built_in_network_configs/ropsten/boot_enr.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# Pari -- enr:-Iq4QMCTfIMXnow27baRUb35Q8iiFHSIDBJh6hQM5Axohhf4b6Kr_cOCu0htQ5WvVqKvFgY28893DHAg8gnBAXsAVqmGAX53x8JggmlkgnY0gmlwhLKAlv6Jc2VjcDI1NmsxoQK6S-Cii_KmfFdUJL2TANL3ksaKUnNXvTCv1tLwXs0QgIN1ZHCCIyk -# Teku -- enr:-KG4QMJSJ7DHk6v2p-W8zQ3Xv7FfssZ_1E3p2eY6kN13staMObUonAurqyWhODoeY6edXtV8e9eL9RnhgZ9va2SMDRQMhGV0aDKQS-iVMYAAAHD0AQAAAAAAAIJpZIJ2NIJpcIQDhAAhiXNlY3AyNTZrMaEDXBVUZhhmdy1MYor1eGdRJ4vHYghFKDgjyHgt6sJ-IlCDdGNwgiMog3VkcIIjKA diff --git a/common/eth2_network_config/built_in_network_configs/ropsten/config.yaml b/common/eth2_network_config/built_in_network_configs/ropsten/config.yaml deleted file mode 100644 index 5dad3ff75..000000000 --- a/common/eth2_network_config/built_in_network_configs/ropsten/config.yaml +++ /dev/null @@ -1,71 +0,0 @@ -# Extends the mainnet preset -PRESET_BASE: 'mainnet' -CONFIG_NAME: 'ropsten' - -# Genesis -# --------------------------------------------------------------- -MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 100000 -# Monday, May 30th, 2022 3:00:00 PM +UTC -MIN_GENESIS_TIME: 1653318000 -GENESIS_FORK_VERSION: 0x80000069 -GENESIS_DELAY: 604800 - - -# Forking -# --------------------------------------------------------------- -# Some forks are disabled for now: -# - These may be re-assigned to another fork-version later -# - Temporarily set to max uint64 value: 2**64 - 1 - -# Altair -ALTAIR_FORK_VERSION: 0x80000070 -ALTAIR_FORK_EPOCH: 500 -# Merge -BELLATRIX_FORK_VERSION: 0x80000071 -BELLATRIX_FORK_EPOCH: 750 -TERMINAL_TOTAL_DIFFICULTY: 50000000000000000 -TERMINAL_BLOCK_HASH: 0x0000000000000000000000000000000000000000000000000000000000000000 -TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: 18446744073709551615 - -# Sharding -SHARDING_FORK_VERSION: 0x03001020 -SHARDING_FORK_EPOCH: 18446744073709551615 - -# Time parameters -# --------------------------------------------------------------- -# 12 seconds -SECONDS_PER_SLOT: 12 -# 14 (estimate from Eth1 mainnet) -SECONDS_PER_ETH1_BLOCK: 14 -# 2**8 (= 256) epochs ~27 hours -MIN_VALIDATOR_WITHDRAWABILITY_DELAY: 256 -# 2**8 (= 256) epochs ~27 hours -SHARD_COMMITTEE_PERIOD: 256 -# 2**11 (= 2,048) Eth1 blocks ~8 hours -ETH1_FOLLOW_DISTANCE: 2048 - - -# Validator cycle -# --------------------------------------------------------------- -# 2**2 (= 4) -INACTIVITY_SCORE_BIAS: 4 -# 2**4 (= 16) -INACTIVITY_SCORE_RECOVERY_RATE: 16 -# 2**4 * 10**9 (= 16,000,000,000) Gwei -EJECTION_BALANCE: 16000000000 -# 2**2 (= 4) -MIN_PER_EPOCH_CHURN_LIMIT: 4 -# 2**16 (= 65,536) -CHURN_LIMIT_QUOTIENT: 65536 - - -# Fork choice -# --------------------------------------------------------------- -# 40% -PROPOSER_SCORE_BOOST: 40 - -# Deposit contract -# --------------------------------------------------------------- -DEPOSIT_CHAIN_ID: 3 -DEPOSIT_NETWORK_ID: 3 -DEPOSIT_CONTRACT_ADDRESS: 0x6f22fFbC56eFF051aECF839396DD1eD9aD6BBA9D diff --git a/common/eth2_network_config/built_in_network_configs/ropsten/deploy_block.txt b/common/eth2_network_config/built_in_network_configs/ropsten/deploy_block.txt deleted file mode 100644 index dd46f23b6..000000000 --- a/common/eth2_network_config/built_in_network_configs/ropsten/deploy_block.txt +++ /dev/null @@ -1 +0,0 @@ -12269949 \ No newline at end of file diff --git a/common/eth2_network_config/built_in_network_configs/ropsten/genesis.ssz.zip b/common/eth2_network_config/built_in_network_configs/ropsten/genesis.ssz.zip deleted file mode 100644 index 5f83ed3b6..000000000 Binary files a/common/eth2_network_config/built_in_network_configs/ropsten/genesis.ssz.zip and /dev/null differ diff --git a/testing/web3signer_tests/src/lib.rs b/testing/web3signer_tests/src/lib.rs index 4f9a574f8..16bffd04f 100644 --- a/testing/web3signer_tests/src/lib.rs +++ b/testing/web3signer_tests/src/lib.rs @@ -660,17 +660,17 @@ mod tests { } #[tokio::test] - async fn ropsten_base_types() { - test_base_types("ropsten", 4250).await + async fn sepolia_base_types() { + test_base_types("sepolia", 4250).await } #[tokio::test] - async fn ropsten_altair_types() { - test_altair_types("ropsten", 4251).await + async fn sepolia_altair_types() { + test_altair_types("sepolia", 4251).await } #[tokio::test] - async fn ropsten_merge_types() { - test_merge_types("ropsten", 4252).await + async fn sepolia_merge_types() { + test_merge_types("sepolia", 4252).await } }