From c3c181aa036786573f7cdd08fcec04c3bf492be5 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Tue, 21 Feb 2023 11:01:22 +1100 Subject: [PATCH] Remove "eip4844" network (#4008) --- common/eth2_config/src/lib.rs | 3 +- .../eip4844/boot_enr.yaml | 3 - .../eip4844/config.yaml | 85 ------------------ .../eip4844/deploy_block.txt | 1 - .../eip4844/genesis.ssz.zip | Bin 3546 -> 0 bytes 5 files changed, 1 insertion(+), 91 deletions(-) delete mode 100644 common/eth2_network_config/built_in_network_configs/eip4844/boot_enr.yaml delete mode 100644 common/eth2_network_config/built_in_network_configs/eip4844/config.yaml delete mode 100644 common/eth2_network_config/built_in_network_configs/eip4844/deploy_block.txt delete mode 100644 common/eth2_network_config/built_in_network_configs/eip4844/genesis.ssz.zip diff --git a/common/eth2_config/src/lib.rs b/common/eth2_config/src/lib.rs index 45fc709cba..7e3c025a83 100644 --- a/common/eth2_config/src/lib.rs +++ b/common/eth2_config/src/lib.rs @@ -307,6 +307,5 @@ define_hardcoded_nets!( // Set to `true` if the genesis state can be found in the `built_in_network_configs` // directory. GENESIS_STATE_IS_KNOWN - ), - (eip4844, "eip4844", GENESIS_STATE_IS_KNOWN) + ) ); 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 deleted file mode 100644 index 4d52cc5975..0000000000 --- a/common/eth2_network_config/built_in_network_configs/eip4844/boot_enr.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- enr:-MK4QLij8YaVQ6fIi09rDuD9fufxBlCZRXwfM1q6SbNJfy5ZZdAvtlnsfqhIeI0IqeOZdaPExVCfZfR4JJTIuKXFR76GAYJGrqHnh2F0dG5ldHOIAAAAAAAAAACEZXRoMpBCynldgwAP_QMAAAAAAAAAgmlkgnY0gmlwhCJ7uEyJc2VjcDI1NmsxoQJpeftU6RbmIhcFllICznlAMJXL3EwHEGhn73_Gk0wrCYhzeW5jbmV0cwCDdGNwgjLIg3VkcIIu4A -- enr:-JG4QK27MZvV3QbwdLt055Yhei27SjAsDXMFGCdl-Q7SDiCgR_qbiW3BmcOClehFVJgMa6IfjHeJBdbC0jvrr2NycOqGAYJLWb5kgmlkgnY0gmlwhCJE_eeJc2VjcDI1NmsxoQIecO7Y9C7J2Bs7RNxXaUkU6BfmPKIhEsDScKAoxENaRYN0Y3CCdl-DdWRwgnZf -- enr:-JG4QExcHW3vzBcE0f_r-93nSA4iBy4qNLthSyTw7p0tlPwjMl1JVTAgLSNHLLZJzOGtelJO4sw37LliuHyJ55zN5J6GAYJLWTvzgmlkgnY0gmlwhCKq1cmJc2VjcDI1NmsxoQJT2d4jtKQbHNw3tZPLhoMlR73o5LNdi-bk_bYq6siwuIN0Y3CCdl-DdWRwgnZf \ No newline at end of file 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 deleted file mode 100644 index d6e6aef57a..0000000000 --- a/common/eth2_network_config/built_in_network_configs/eip4844/config.yaml +++ /dev/null @@ -1,85 +0,0 @@ -# Prater config - -# Extends the mainnet preset -CONFIG_NAME: 'eip4844' -PRESET_BASE: 'mainnet' - -# Transition -# --------------------------------------------------------------- -TERMINAL_TOTAL_DIFFICULTY: 40 -# By default, don't use these params -TERMINAL_BLOCK_HASH: 0x0000000000000000000000000000000000000000000000000000000000000000 -TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH: 18446744073709551615 - -# Genesis -# --------------------------------------------------------------- -# `2**14` (= 16,384) -MIN_GENESIS_ACTIVE_VALIDATOR_COUNT: 2 -# Mar-01-2021 08:53:32 AM +UTC -MIN_GENESIS_TIME: 1653318000 -# Prater area code (Vienna) -GENESIS_FORK_VERSION: 0x00000ffd -# Customized for Prater: 1919188 seconds (Mar-23-2021 02:00:00 PM +UTC) -GENESIS_DELAY: 0 - - -# 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: 0x01000ffd -ALTAIR_FORK_EPOCH: 1 -# Merge -BELLATRIX_FORK_VERSION: 0x02000ffd -BELLATRIX_FORK_EPOCH: 2 -# Sharding -EIP4844_FORK_VERSION: 0x83000ffd -EIP4844_FORK_EPOCH: 3 - -# TBD, 2**32 is a placeholder. Merge transition approach is in active R&D. -TRANSITION_TOTAL_DIFFICULTY: 40 - - -# 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: 15 - - -# 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 -# --------------------------------------------------------------- -# Ethereum Goerli testnet -DEPOSIT_CHAIN_ID: 1331 -DEPOSIT_NETWORK_ID: 69 -# Prater test deposit contract on Goerli Testnet -DEPOSIT_CONTRACT_ADDRESS: 0x8A04d14125D0FDCDc742F4A05C051De07232EDa4 diff --git a/common/eth2_network_config/built_in_network_configs/eip4844/deploy_block.txt b/common/eth2_network_config/built_in_network_configs/eip4844/deploy_block.txt deleted file mode 100644 index 573541ac97..0000000000 --- a/common/eth2_network_config/built_in_network_configs/eip4844/deploy_block.txt +++ /dev/null @@ -1 +0,0 @@ -0 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 deleted file mode 100644 index 88b405071058d5163f5757e775c7cea3dd4b1183..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3546 zcmWIWW@Zs#-~dAQe7jHvC=g@OWZ-5{U`S8ROD)bU)+;Wq3Ju|9U_Wndo?P2!1IDEl z+zgB?FPIq^z{K0LnHgd%5(hqpFTYu{*W2;tls(gqI~Y&j)RWnMZi-TB+}Y%~8C{DE zqusJ9rW_9nG{0@5)qQH=K0jY+WBx@3;m=N}1U(CyK0A7s+0kTO>j@nTY6TVR>?f_Cfb@`kC4Vby-KgCKNu{b}Y31 z+}y$v|KA&fcZtNr2+ZDK|Mt|S>-*%keNA|KXs4*O{oCD}cIDn&X?>Ly=G{?x#D%~= z`>?C8L{_}GQTq9b{vvs;nIh&puRW{$YGuDk+uCGJUGs}vQSI*U^Jc|P5w%dH) zs>1IpzVSZ`6En{d{`xNbdD&Ipcb{(lICXaEaj(LY?;cw!n$8Cl7HVi z#y9il>sLp3&xf$xi;t+PiMX+K`TN|Txj|)@JB@>miL*|#7mNDy;Yf>YxbyR8^^>F| z<8AaRkDfiBt!^eM>~%tNkGg<)QrX^m?$G~-uUT$9_(7EU8r$}m{*L!I7nQ%;b<6#n zdg{}qXS0O=e)}%J$Ke03g&oh&O}Rh+|DRh+uVy-XF)eI+d;QDH;2R4qLhS6)o?UV6 z{Of0~bwgZQYF~!?sXc<)*)nyXZ#^vJUK|zg@%!1A&OFUZ_p~&