Electra: full beacon config (#13918)

* Electra: full beacon config

Fix TestGetSpec

* Fix beacon config spec compliance test so that it properly loads the config from spec tests. Tests failing for now.

* fix tests and comply with spec presets

beacon-chain/rpc/eth/config/handlers_test.go

@@ -133,6 +133,21 @@ func TestGetSpec(t *testing.T) {
  config.MaxWithdrawalsPerPayload = 74
  config.MaxBlsToExecutionChanges = 75
  config.MaxValidatorsPerWithdrawalsSweep = 76
+ config.MinSlashingPenaltyQuotientElectra = 77
+ config.MaxEffectiveBalanceElectra = 78
+ config.CompoundingWithdrawalPrefixByte = byte('d')
+ config.WhistleBlowerRewardQuotientElectra = 79
+ config.PendingPartialWithdrawalsLimit = 80
+ config.MinActivationBalance = 81
+ config.PendingBalanceDepositLimit = 82
+ config.MaxPendingPartialsPerWithdrawalSweep = 83
+ config.PendingConsolidationsLimit = 84
+ config.MaxPartialWithdrawalsPerPayload = 85
+ config.FullExitRequestAmount = 86
+ config.MaxConsolidations = 87
+ config.MaxAttesterSlashingsElectra = 88
+ config.MaxAttestationsElectra = 89
+ config.MaxWithdrawalRequestsPerPayload = 90
 
  var dbp [4]byte
  copy(dbp[:], []byte{'0', '0', '0', '1'})
@@ -158,6 +173,9 @@ func TestGetSpec(t *testing.T) {
  var dam [4]byte
  copy(dam[:], []byte{'1', '0', '0', '0'})
  config.DomainApplicationMask = dam
+ var dc [4]byte
+ copy(dc[:], []byte{'1', '1', '0', '0'})
+ config.DomainConsolidation = dc
 
  params.OverrideBeaconConfig(config)
 
@@ -172,7 +190,7 @@ func TestGetSpec(t *testing.T) {
  data, ok := resp.Data.(map[string]interface{})
  require.Equal(t, true, ok)
 
- assert.Equal(t, 136, len(data))
+ assert.Equal(t, 152, len(data))
  for k, v := range data {
  t.Run(k, func(t *testing.T) {
  switch k {
@@ -471,6 +489,38 @@ func TestGetSpec(t *testing.T) {
  assert.Equal(t, "32", v)
  case "MAX_REQUEST_DATA_COLUMN_SIDECARS":
  assert.Equal(t, "16384", v)
+ case "MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA":
+ assert.Equal(t, "77", v)
+ case "MAX_EFFECTIVE_BALANCE_ELECTRA":
+ assert.Equal(t, "78", v)
+ case "COMPOUNDING_WITHDRAWAL_PREFIX":
+ assert.Equal(t, "0x64", v)
+ case "WHISTLEBLOWER_REWARD_QUOTIENT_ELECTRA":
+ assert.Equal(t, "79", v)
+ case "PENDING_PARTIAL_WITHDRAWALS_LIMIT":
+ assert.Equal(t, "80", v)
+ case "MIN_ACTIVATION_BALANCE":
+ assert.Equal(t, "81", v)
+ case "PENDING_BALANCE_DEPOSITS_LIMIT":
+ assert.Equal(t, "82", v)
+ case "MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP":
+ assert.Equal(t, "83", v)
+ case "PENDING_CONSOLIDATIONS_LIMIT":
+ assert.Equal(t, "84", v)
+ case "MAX_PARTIAL_WITHDRAWALS_PER_PAYLOAD":
+ assert.Equal(t, "85", v)
+ case "FULL_EXIT_REQUEST_AMOUNT":
+ assert.Equal(t, "86", v)
+ case "MAX_CONSOLIDATIONS":
+ assert.Equal(t, "87", v)
+ case "DOMAIN_CONSOLIDATION":
+ assert.Equal(t, "0x31313030", v)
+ case "MAX_ATTESTER_SLASHINGS_ELECTRA":
+ assert.Equal(t, "88", v)
+ case "MAX_ATTESTATIONS_ELECTRA":
+ assert.Equal(t, "89", v)
+ case "MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD":
+ assert.Equal(t, "90", v)
  default:
  t.Errorf("Incorrect key: %s", k)
  }

config/fieldparams/mainnet.go

@@ -33,4 +33,9 @@ const (
  BlobSize = 131072 // defined to match blob.size in bazel ssz codegen
  KzgCommitmentInclusionProofDepth = 17 // Merkle proof depth for blob_kzg_commitments list item
  NextSyncCommitteeBranchDepth = 5 // NextSyncCommitteeBranchDepth defines the depth of the next sync committee branch.
+ PendingBalanceDepositsLimit = 134217728 // Maximum number of pending balance deposits in the beacon state.
+ PendingPartialWithdrawalsLimit = 134217728 // Maximum number of pending partial withdrawals in the beacon state.
+ PendingConsolidationsLimit = 262144 // Maximum number of pending consolidations in the beacon state.
+ MaxDepositReceiptsPerPayload = 8192 // Maximum number of deposit receipts in an execution payload.
+ MaxWithdrawalRequestsPerPayload = 16 // Maximum number of execution layer withdrawal requests in an execution payload.
 )

config/fieldparams/minimal.go

@@ -33,4 +33,9 @@ const (
  BlobSize = 131072 // defined to match blob.size in bazel ssz codegen
  KzgCommitmentInclusionProofDepth = 17 // Merkle proof depth for blob_kzg_commitments list item
  NextSyncCommitteeBranchDepth = 5 // NextSyncCommitteeBranchDepth defines the depth of the next sync committee branch.
+ PendingBalanceDepositsLimit = 134217728 // Maximum number of pending balance deposits in the beacon state.
+ PendingPartialWithdrawalsLimit = 64 // Maximum number of pending partial withdrawals in the beacon state.
+ PendingConsolidationsLimit = 64 // Maximum number of pending consolidations in the beacon state.
+ MaxDepositReceiptsPerPayload = 4 // Maximum number of deposit receipts in an execution payload.
+ MaxWithdrawalRequestsPerPayload = 2 // Maximum number of execution layer withdrawal requests in an execution payload.
 )

config/params/config.go

@@ -41,13 +41,15 @@ type BeaconChainConfig struct {
 
  // Gwei value constants.
  MinDepositAmount uint64 `yaml:"MIN_DEPOSIT_AMOUNT" spec:"true"` // MinDepositAmount is the minimum amount of Gwei a validator can send to the deposit contract at once (lower amounts will be reverted).
+ MinActivationBalance uint64 `yaml:"MIN_ACTIVATION_BALANCE" spec:"true"` // MinActivationBalance is the minimum amount of Gwei a validator must have to be activated in the beacon state.
  MaxEffectiveBalance uint64 `yaml:"MAX_EFFECTIVE_BALANCE" spec:"true"` // MaxEffectiveBalance is the maximal amount of Gwei that is effective for staking.
  EjectionBalance uint64 `yaml:"EJECTION_BALANCE" spec:"true"` // EjectionBalance is the minimal GWei a validator needs to have before ejected.
  EffectiveBalanceIncrement uint64 `yaml:"EFFECTIVE_BALANCE_INCREMENT" spec:"true"` // EffectiveBalanceIncrement is used for converting the high balance into the low balance for validators.
 
  // Initial value constants.
  BLSWithdrawalPrefixByte byte `yaml:"BLS_WITHDRAWAL_PREFIX" spec:"true"` // BLSWithdrawalPrefixByte is used for BLS withdrawal and it's the first byte.
  ETH1AddressWithdrawalPrefixByte byte `yaml:"ETH1_ADDRESS_WITHDRAWAL_PREFIX" spec:"true"` // ETH1AddressWithdrawalPrefixByte is used for withdrawals and it's the first byte.
+ CompoundingWithdrawalPrefixByte byte `yaml:"COMPOUNDING_WITHDRAWAL_PREFIX" spec:"true"` // CompoundingWithdrawalPrefixByteByte is used for compounding withdrawals and it's the first byte.
  ZeroHash [32]byte // ZeroHash is used to represent a zeroed out 32 byte array.
 
  // Time parameters constants.
@@ -97,12 +99,15 @@ type BeaconChainConfig struct {
  ProportionalSlashingMultiplier uint64 `yaml:"PROPORTIONAL_SLASHING_MULTIPLIER" spec:"true"` // ProportionalSlashingMultiplier is used as a multiplier on slashed penalties.
 
  // Max operations per block constants.
- MaxProposerSlashings uint64 `yaml:"MAX_PROPOSER_SLASHINGS" spec:"true"` // MaxProposerSlashings defines the maximum number of slashings of proposers possible in a block.
- MaxAttesterSlashings uint64 `yaml:"MAX_ATTESTER_SLASHINGS" spec:"true"` // MaxAttesterSlashings defines the maximum number of casper FFG slashings possible in a block.
- MaxAttestations uint64 `yaml:"MAX_ATTESTATIONS" spec:"true"` // MaxAttestations defines the maximum allowed attestations in a beacon block.
- MaxDeposits uint64 `yaml:"MAX_DEPOSITS" spec:"true"` // MaxDeposits defines the maximum number of validator deposits in a block.
- MaxVoluntaryExits uint64 `yaml:"MAX_VOLUNTARY_EXITS" spec:"true"` // MaxVoluntaryExits defines the maximum number of validator exits in a block.
- MaxWithdrawalsPerPayload uint64 `yaml:"MAX_WITHDRAWALS_PER_PAYLOAD" spec:"true"` // MaxWithdrawalsPerPayload defines the maximum number of withdrawals in a block.
+ MaxProposerSlashings uint64 `yaml:"MAX_PROPOSER_SLASHINGS" spec:"true"` // MaxProposerSlashings defines the maximum number of slashings of proposers possible in a block.
+ MaxAttesterSlashings uint64 `yaml:"MAX_ATTESTER_SLASHINGS" spec:"true"` // MaxAttesterSlashings defines the maximum number of casper FFG slashings possible in a block.
+ MaxAttesterSlashingsElectra uint64 `yaml:"MAX_ATTESTER_SLASHINGS_ELECTRA" spec:"true"` // MaxAttesterSlashingsElectra defines the maximum number of casper FFG slashings possible in a block post Electra hard fork.
+ MaxAttestations uint64 `yaml:"MAX_ATTESTATIONS" spec:"true"` // MaxAttestations defines the maximum allowed attestations in a beacon block.
+ MaxAttestationsElectra uint64 `yaml:"MAX_ATTESTATIONS_ELECTRA" spec:"true"` // MaxAttestationsElectra defines the maximum allowed attestations in a beacon block post Electra hard fork.
+ MaxDeposits uint64 `yaml:"MAX_DEPOSITS" spec:"true"` // MaxDeposits defines the maximum number of validator deposits in a block.
+ MaxVoluntaryExits uint64 `yaml:"MAX_VOLUNTARY_EXITS" spec:"true"` // MaxVoluntaryExits defines the maximum number of validator exits in a block.
+ MaxWithdrawalsPerPayload uint64 `yaml:"MAX_WITHDRAWALS_PER_PAYLOAD" spec:"true"` // MaxWithdrawalsPerPayload defines the maximum number of withdrawals in a block.
+ MaxPartialWithdrawalsPerPayload uint64 `yaml:"MAX_PARTIAL_WITHDRAWALS_PER_PAYLOAD" spec:"true"`
  MaxBlsToExecutionChanges uint64 `yaml:"MAX_BLS_TO_EXECUTION_CHANGES" spec:"true"` // MaxBlsToExecutionChanges defines the maximum number of BLS-to-execution-change objects in a block.
  MaxValidatorsPerWithdrawalsSweep uint64 `yaml:"MAX_VALIDATORS_PER_WITHDRAWALS_SWEEP" spec:"true"` // MaxValidatorsPerWithdrawalsSweep bounds the size of the sweep searching for withdrawals per slot.
 
@@ -120,6 +125,7 @@ type BeaconChainConfig struct {
  DomainApplicationMask [4]byte `yaml:"DOMAIN_APPLICATION_MASK" spec:"true"` // DomainApplicationMask defines the BLS signature domain for application mask.
  DomainApplicationBuilder [4]byte `yaml:"DOMAIN_APPLICATION_BUILDER" spec:"true"` // DomainApplicationBuilder defines the BLS signature domain for application builder.
  DomainBLSToExecutionChange [4]byte `yaml:"DOMAIN_BLS_TO_EXECUTION_CHANGE" spec:"true"` // DomainBLSToExecutionChange defines the BLS signature domain to change withdrawal addresses to ETH1 prefix
+ DomainConsolidation [4]byte `yaml:"DOMAIN_CONSOLIDATION" spec:"true"`
 
  // Prysm constants.
  GweiPerEth uint64 // GweiPerEth is the amount of gwei corresponding to 1 eth.
@@ -139,6 +145,7 @@ type BeaconChainConfig struct {
  BeaconStateBellatrixFieldCount int // BeaconStateBellatrixFieldCount defines how many fields are in beacon state post upgrade to Bellatrix.
  BeaconStateCapellaFieldCount int // BeaconStateCapellaFieldCount defines how many fields are in beacon state post upgrade to Capella.
  BeaconStateDenebFieldCount int // BeaconStateDenebFieldCount defines how many fields are in beacon state post upgrade to Deneb.
+ BeaconStateElectraFieldCount int // BeaconStateElectraFieldCount defines how many fields are in beacon state post upgrade to Electra.
 
  // Slasher constants.
  WeakSubjectivityPeriod primitives.Epoch // WeakSubjectivityPeriod defines the time period expressed in number of epochs were proof of stake network should validate block headers and attestations for slashable events.
@@ -229,11 +236,20 @@ type BeaconChainConfig struct {
  MaxRequestBlocksDeneb uint64 `yaml:"MAX_REQUEST_BLOCKS_DENEB" spec:"true"` // MaxRequestBlocksDeneb is the maximum number of blocks in a single request after the deneb epoch.
 
  // Values introduce in Electra upgrade
- NumberOfColumns uint64 `yaml:"NUMBER_OF_COLUMNS" spec:"true"` // NumberOfColumns in the extended data matrix.
- DataColumnSidecarSubnetCount uint64 `yaml:"DATA_COLUMN_SIDECAR_SUBNET_COUNT" spec:"true"` // DataColumnSidecarSubnetCount is the number of data column sidecar subnets used in the gossipsub protocol
- MaxPerEpochActivationExitChurnLimit uint64 `yaml:"MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT" spec:"true"` // MaxPerEpochActivationExitChurnLimit represents the maximum combined activation and exit churn.
- MinPerEpochChurnLimitElectra uint64 `yaml:"MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA" spec:"true"` // MinPerEpochChurnLimitElectra is the minimum amount of churn allotted for validator rotations for electra.
- MaxRequestDataColumnSidecars uint64 `yaml:"MAX_REQUEST_DATA_COLUMN_SIDECARS" spec:"true"` // MaxRequestDataColumnSidecars is the maximum number of data column sidecars in a single request
+ DataColumnSidecarSubnetCount uint64 `yaml:"DATA_COLUMN_SIDECAR_SUBNET_COUNT" spec:"true"` // DataColumnSidecarSubnetCount is the number of data column sidecar subnets used in the gossipsub protocol
+ MaxPerEpochActivationExitChurnLimit uint64 `yaml:"MAX_PER_EPOCH_ACTIVATION_EXIT_CHURN_LIMIT" spec:"true"` // MaxPerEpochActivationExitChurnLimit represents the maximum combined activation and exit churn.
+ MinPerEpochChurnLimitElectra uint64 `yaml:"MIN_PER_EPOCH_CHURN_LIMIT_ELECTRA" spec:"true"` // MinPerEpochChurnLimitElectra is the minimum amount of churn allotted for validator rotations for electra.
+ MaxRequestDataColumnSidecars uint64 `yaml:"MAX_REQUEST_DATA_COLUMN_SIDECARS" spec:"true"` // MaxRequestDataColumnSidecars is the maximum number of data column sidecars in a single request
+ MaxEffectiveBalanceElectra uint64 `yaml:"MAX_EFFECTIVE_BALANCE_ELECTRA" spec:"true"` // MaxEffectiveBalanceElectra is the maximal amount of Gwei that is effective for staking, increased in electra.
+ MinSlashingPenaltyQuotientElectra uint64 `yaml:"MIN_SLASHING_PENALTY_QUOTIENT_ELECTRA" spec:"true"` // MinSlashingPenaltyQuotientElectra is used to calculate the minimum penalty to prevent DoS attacks, modified for electra.
+ WhistleBlowerRewardQuotientElectra uint64 `yaml:"WHISTLEBLOWER_REWARD_QUOTIENT_ELECTRA" spec:"true"` // WhistleBlowerRewardQuotientElectra is used to calculate whistle blower reward, modified in electra.
+ PendingBalanceDepositLimit uint64 `yaml:"PENDING_BALANCE_DEPOSITS_LIMIT" spec:"true"` // PendingBalanceDepositLimit is the maximum number of pending balance deposits allowed in the beacon state.
+ PendingPartialWithdrawalsLimit uint64 `yaml:"PENDING_PARTIAL_WITHDRAWALS_LIMIT" spec:"true"` // PendingPartialWithdrawalsLimit is the maximum number of pending partial withdrawals allowed in the beacon state.
+ PendingConsolidationsLimit uint64 `yaml:"PENDING_CONSOLIDATIONS_LIMIT" spec:"true"` // PendingConsolidationsLimit is the maximum number of pending validator consolidations allowed in the beacon state.
+ MaxConsolidations uint64 `yaml:"MAX_CONSOLIDATIONS" spec:"true"` // MaxConsolidations is the maximum number of consolidations in a block.
+ MaxPendingPartialsPerWithdrawalSweep uint64 `yaml:"MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP" spec:"true"` // MaxPendingPartialsPerWithdrawalSweep is the maximum number of pending partial withdrawals to process per payload.
+ FullExitRequestAmount uint64 `yaml:"FULL_EXIT_REQUEST_AMOUNT" spec:"true"` // FullExitRequestAmount is the amount of Gwei required to request a full exit.
+ MaxWithdrawalRequestsPerPayload uint64 `yaml:"MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD" spec:"true"` // MaxWithdrawalRequestsPerPayload is the maximum number of execution layer withdrawal requests in each payload.
 
  // Networking Specific Parameters
  GossipMaxSize uint64 `yaml:"GOSSIP_MAX_SIZE" spec:"true"` // GossipMaxSize is the maximum allowed size of uncompressed gossip messages.
@@ -252,6 +268,9 @@ type BeaconChainConfig struct {
  AttestationSubnetPrefixBits uint64 `yaml:"ATTESTATION_SUBNET_PREFIX_BITS" spec:"true"` // AttestationSubnetPrefixBits is defined as (ceillog2(ATTESTATION_SUBNET_COUNT) + ATTESTATION_SUBNET_EXTRA_BITS).
  SubnetsPerNode uint64 `yaml:"SUBNETS_PER_NODE" spec:"true"` // SubnetsPerNode is the number of long-lived subnets a beacon node should be subscribed to.
  NodeIdBits uint64 `yaml:"NODE_ID_BITS" spec:"true"` // NodeIdBits defines the bit length of a node id.
+
+ // PeerDAS
+ NumberOfColumns uint64 `yaml:"NUMBER_OF_COLUMNS" spec:"true"` // NumberOfColumns in the extended data matrix.
 }
 
 // InitializeForkSchedule initializes the schedules forks baked into the config.

config/params/loader_test.go

@@ -24,13 +24,21 @@ import (
 // These are variables that we don't use in Prysm. (i.e. future hardfork, light client... etc)
 // IMPORTANT: Use one field per line and sort these alphabetically to reduce conflicts.
 var placeholderFields = []string{
+ "BYTES_PER_LOGS_BLOOM", // Compile time constant on ExecutionPayload.logs_bloom.
  "EIP6110_FORK_EPOCH",
  "EIP6110_FORK_VERSION",
  "EIP7002_FORK_EPOCH",
  "EIP7002_FORK_VERSION",
  "EIP7594_FORK_EPOCH",
  "EIP7594_FORK_VERSION",
+ "FIELD_ELEMENTS_PER_BLOB", // Compile time constant.
+ "KZG_COMMITMENT_INCLUSION_PROOF_DEPTH", // Compile time constant on BlobSidecar.commitment_inclusion_proof.
  "MAX_BLOBS_PER_BLOCK",
+ "MAX_BLOB_COMMITMENTS_PER_BLOCK", // Compile time constant on BeaconBlockBodyDeneb.blob_kzg_commitments.
+ "MAX_BYTES_PER_TRANSACTION", // Used for ssz of EL transactions. Unused in Prysm.
+ "MAX_DEPOSIT_RECEIPTS_PER_PAYLOAD", // Compile time constant on ExecutionPayload.deposit_receipts.
+ "MAX_EXTRA_DATA_BYTES", // Compile time constant on ExecutionPayload.extra_data.
+ "MAX_TRANSACTIONS_PER_PAYLOAD", // Compile time constant on ExecutionPayload.transactions.
  "REORG_HEAD_WEIGHT_THRESHOLD",
  "UPDATE_TIMEOUT",
  "WHISK_EPOCHS_PER_SHUFFLING_PHASE",
@@ -342,9 +350,14 @@ func configFilePath(t *testing.T, config string) string {
 func presetsFilePath(t *testing.T, config string) []string {
  fPath, err := bazel.Runfile("external/consensus_spec")
  require.NoError(t, err)
+
  return []string{
  path.Join(fPath, "presets", config, "phase0.yaml"),
  path.Join(fPath, "presets", config, "altair.yaml"),
+ path.Join(fPath, "presets", config, "bellatrix.yaml"),
+ path.Join(fPath, "presets", config, "capella.yaml"),
+ path.Join(fPath, "presets", config, "deneb.yaml"),
+ path.Join(fPath, "presets", config, "electra.yaml"),
  }
 }