diff --git a/beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs b/beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs index fb07e6831..d69b42c0b 100644 --- a/beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs +++ b/beacon_node/lighthouse_network/src/rpc/codec/ssz_snappy.rs @@ -716,9 +716,10 @@ fn context_bytes_to_fork_name( .from_context_bytes(context_bytes) .cloned() .ok_or_else(|| { + let encoded = hex::encode(context_bytes); RPCError::ErrorResponse( RPCResponseErrorCode::InvalidRequest, - "Context bytes does not correspond to a valid fork".to_string(), + format!("Context bytes {} do not correspond to a valid fork", encoded), ) }) } diff --git a/common/eth2_network_config/built_in_network_configs/eip4844/boot_enr.yaml b/common/eth2_network_config/built_in_network_configs/eip4844/boot_enr.yaml index 4d52cc597..143387543 100644 --- a/common/eth2_network_config/built_in_network_configs/eip4844/boot_enr.yaml +++ b/common/eth2_network_config/built_in_network_configs/eip4844/boot_enr.yaml @@ -1,3 +1,3 @@ -- enr:-MK4QLij8YaVQ6fIi09rDuD9fufxBlCZRXwfM1q6SbNJfy5ZZdAvtlnsfqhIeI0IqeOZdaPExVCfZfR4JJTIuKXFR76GAYJGrqHnh2F0dG5ldHOIAAAAAAAAAACEZXRoMpBCynldgwAP_QMAAAAAAAAAgmlkgnY0gmlwhCJ7uEyJc2VjcDI1NmsxoQJpeftU6RbmIhcFllICznlAMJXL3EwHEGhn73_Gk0wrCYhzeW5jbmV0cwCDdGNwgjLIg3VkcIIu4A -- enr:-JG4QK27MZvV3QbwdLt055Yhei27SjAsDXMFGCdl-Q7SDiCgR_qbiW3BmcOClehFVJgMa6IfjHeJBdbC0jvrr2NycOqGAYJLWb5kgmlkgnY0gmlwhCJE_eeJc2VjcDI1NmsxoQIecO7Y9C7J2Bs7RNxXaUkU6BfmPKIhEsDScKAoxENaRYN0Y3CCdl-DdWRwgnZf -- enr:-JG4QExcHW3vzBcE0f_r-93nSA4iBy4qNLthSyTw7p0tlPwjMl1JVTAgLSNHLLZJzOGtelJO4sw37LliuHyJ55zN5J6GAYJLWTvzgmlkgnY0gmlwhCKq1cmJc2VjcDI1NmsxoQJT2d4jtKQbHNw3tZPLhoMlR73o5LNdi-bk_bYq6siwuIN0Y3CCdl-DdWRwgnZf \ No newline at end of file +- enr:-MK4QFnkGjrt5qw5Ct5XXT9QYvfqmH8Cf6xqKuczTHWixDUZQmngyLrlftv-tMRbXDAxZZQDxNciNTjx7XpW0G4yQguGAYU2Pmnxh2F0dG5ldHOIAAAAAAAAAACEZXRoMpA3FbaXIAAAk___________gmlkgnY0gmlwhCJ5ITWJc2VjcDI1NmsxoQIlwaxycUgJ_Ht4lYdDlInbIuRxu0HcHcFbu0D7As2SLYhzeW5jbmV0cwCDdGNwgjLIg3VkcIIu4A +- enr:-MK4QBqN5McD5YYgfEnfQjWUvrSaCITjBvQevlP5q0nCVbKuZRoa2XvGWOBwTDQyLNYiqgeettVwXs0PrSc1rOY2rjKGAYU2M7A8h2F0dG5ldHOIAAAAAAAAAgCEZXRoMpA3FbaXIAAAk___________gmlkgnY0gmlwhCJ6vpeJc2VjcDI1NmsxoQNJzjxNKr7-a-iEDs0KvaL_vo1UH91kefEiWzgAdwSntYhzeW5jbmV0cw-DdGNwgjLIg3VkcIIu4A +- enr:-MK4QEzb6r0hpSyiko9u-mbEX1TzdTD9RcSiU4jhey5jJbTAHLdXNFR32CfjingVa6QMyCPtZRUfzSGbJ0ur3-Pdxe-GAYU2OwM5h2F0dG5ldHOIAAAAAAAAAACEZXRoMpA3FbaXIAAAk___________gmlkgnY0gmlwhCPi7faJc2VjcDI1NmsxoQIKBTGU_riCSYrscdRCLuocbNzhF9RTNItPfD4_PmYngIhzeW5jbmV0cwCDdGNwgjLIg3VkcIIu4A diff --git a/common/eth2_network_config/built_in_network_configs/eip4844/config.yaml b/common/eth2_network_config/built_in_network_configs/eip4844/config.yaml index d6e6aef57..d5e185591 100644 --- a/common/eth2_network_config/built_in_network_configs/eip4844/config.yaml +++ b/common/eth2_network_config/built_in_network_configs/eip4844/config.yaml @@ -1,27 +1,22 @@ -# Prater config - -# Extends the mainnet preset -CONFIG_NAME: 'eip4844' -PRESET_BASE: 'mainnet' +CONFIG_NAME: testnet +PRESET_BASE: mainnet # Transition # --------------------------------------------------------------- -TERMINAL_TOTAL_DIFFICULTY: 40 +TERMINAL_TOTAL_DIFFICULTY: 2 # By default, don't use these params TERMINAL_BLOCK_HASH: 0x0000000000000000000000000000000000000000000000000000000000000000 TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: 18446744073709551615 # Genesis # --------------------------------------------------------------- -# `2**14` (= 16,384) +# The genesis fork version looks weird for legacy reasons MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 2 -# Mar-01-2021 08:53:32 AM +UTC -MIN_GENESIS_TIME: 1653318000 -# Prater area code (Vienna) +# Dec 1, 2020, 12pm UTC +MIN_GENESIS_TIME: 1606824000 GENESIS_FORK_VERSION: 0x00000ffd -# Customized for Prater: 1919188 seconds (Mar-23-2021 02:00:00 PM +UTC) -GENESIS_DELAY: 0 - +# 604800 seconds (7 days) +GENESIS_DELAY: 604800 # Forking # --------------------------------------------------------------- @@ -30,18 +25,21 @@ GENESIS_DELAY: 0 # - Temporarily set to max uint64 value: 2**64 - 1 # Altair -ALTAIR_FORK_VERSION: 0x01000ffd -ALTAIR_FORK_EPOCH: 1 +ALTAIR_FORK_EPOCH: 2 +ALTAIR_FORK_VERSION: 0x20000090 + # Merge -BELLATRIX_FORK_VERSION: 0x02000ffd -BELLATRIX_FORK_EPOCH: 2 -# Sharding -EIP4844_FORK_VERSION: 0x83000ffd -EIP4844_FORK_EPOCH: 3 +BELLATRIX_FORK_EPOCH: 3 +BELLATRIX_FORK_VERSION: 0x20000091 -# TBD, 2**32 is a placeholder. Merge transition approach is in active R&D. -TRANSITION_TOTAL_DIFFICULTY: 40 +# Capella +CAPELLA_FORK_EPOCH: 4 +CAPELLA_FORK_VERSION: 0x20000092 +MAX_WITHDRAWALS_PER_PAYLOAD: 4 +# EIP4844 +EIP4844_FORK_EPOCH: 5 +EIP4844_FORK_VERSION: 0x20000093 # Time parameters # --------------------------------------------------------------- @@ -53,9 +51,7 @@ SECONDS_PER_ETH1_BLOCK: 14 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: 15 - +ETH1_FOLLOW_DISTANCE: 1 # Validator cycle # --------------------------------------------------------------- @@ -70,7 +66,6 @@ MIN_PER_EPOCH_CHURN_LIMIT: 4 # 2**16 (= 65,536) CHURN_LIMIT_QUOTIENT: 65536 - # Fork choice # --------------------------------------------------------------- # 40% @@ -78,8 +73,7 @@ PROPOSER_SCORE_BOOST: 40 # Deposit contract # --------------------------------------------------------------- -# Ethereum Goerli testnet +DEPOSIT_CONTRACT_ADDRESS: 0x4242424242424242424242424242424242424242 DEPOSIT_CHAIN_ID: 1331 -DEPOSIT_NETWORK_ID: 69 -# Prater test deposit contract on Goerli Testnet -DEPOSIT_CONTRACT_ADDRESS: 0x8A04d14125D0FDCDc742F4A05C051De07232EDa4 +DEPOSIT_NETWORK_ID: 1331 + diff --git a/common/eth2_network_config/built_in_network_configs/eip4844/genesis.ssz.zip b/common/eth2_network_config/built_in_network_configs/eip4844/genesis.ssz.zip index 88b405071..06c1b45fd 100644 Binary files a/common/eth2_network_config/built_in_network_configs/eip4844/genesis.ssz.zip and b/common/eth2_network_config/built_in_network_configs/eip4844/genesis.ssz.zip differ