Electra: field renames

beacon-chain/core/electra/deposits.go

@@ -77,11 +77,11 @@ func ProcessPendingBalanceDeposits(ctx context.Context, st state.BeaconState, ac
  }
 }
 
-// ProcessDepositReceipts is a function as part of electra to process execution layer deposits
-func ProcessDepositReceipts(ctx context.Context, beaconState state.BeaconState, receipts []*enginev1.DepositReceipt) (state.BeaconState, error) {
- _, span := trace.StartSpan(ctx, "electra.ProcessDepositReceipts")
+// ProcessDepositRequests is a function as part of electra to process execution layer deposits
+func ProcessDepositRequests(ctx context.Context, beaconState state.BeaconState, requests []*enginev1.DepositRequest) (state.BeaconState, error) {
+ _, span := trace.StartSpan(ctx, "electra.ProcessDepositRequests")
  defer span.End()
  // TODO: replace with 6110 logic
- // return b.ProcessDepositReceipts(beaconState, receipts)
+ // return b.ProcessDepositRequests(beaconState, requests)
  return beaconState, nil
 }

beacon-chain/core/electra/upgrade.go

@@ -38,7 +38,7 @@ import (
 // withdrawals_root=pre.latest_execution_payload_header.withdrawals_root,
 // blob_gas_used=pre.latest_execution_payload_header.blob_gas_used,
 // excess_blob_gas=pre.latest_execution_payload_header.excess_blob_gas,
-// deposit_receipts_root=Root(), # [New in Electra:EIP6110]
+// deposit_requests_root=Root(), # [New in Electra:EIP6110]
 // withdrawal_requests_root=Root(), # [New in Electra:EIP7002],
 // )
 //
@@ -94,7 +94,7 @@ import (
 // # Deep history valid from Capella onwards
 // historical_summaries=pre.historical_summaries,
 // # [New in Electra:EIP6110]
-// deposit_receipts_start_index=UNSET_DEPOSIT_RECEIPTS_START_INDEX,
+// deposit_requests_start_index=UNSET_DEPOSIT_REQUESTS_START_INDEX,
 // # [New in Electra:EIP7251]
 // deposit_balance_to_consume=0,
 // exit_balance_to_consume=0,
@@ -261,14 +261,14 @@ func UpgradeToElectra(beaconState state.BeaconState) (state.BeaconState, error)
  WithdrawalsRoot: wdRoot,
  ExcessBlobGas: excessBlobGas,
  BlobGasUsed: blobGasUsed,
- DepositReceiptsRoot: bytesutil.Bytes32(0), // [New in Electra:EIP6110]
+ DepositRequestsRoot: bytesutil.Bytes32(0), // [New in Electra:EIP6110]
  WithdrawalRequestsRoot: bytesutil.Bytes32(0), // [New in Electra:EIP7002]
  },
  NextWithdrawalIndex: wi,
  NextWithdrawalValidatorIndex: vi,
  HistoricalSummaries: summaries,
 
- DepositReceiptsStartIndex: params.BeaconConfig().UnsetDepositReceiptsStartIndex,
+ DepositRequestsStartIndex: params.BeaconConfig().UnsetDepositRequestsStartIndex,
  DepositBalanceToConsume: 0,
  ExitBalanceToConsume: helpers.ActivationExitChurnLimit(primitives.Gwei(tab)),
  EarliestExitEpoch: earliestExitEpoch,

beacon-chain/core/electra/upgrade_test.go

@@ -128,7 +128,7 @@ func TestUpgradeToElectra(t *testing.T) {
  BlockHash: prevHeader.BlockHash(),
  TransactionsRoot: txRoot,
  WithdrawalsRoot: wdRoot,
- DepositReceiptsRoot: bytesutil.Bytes32(0),
+ DepositRequestsRoot: bytesutil.Bytes32(0),
  WithdrawalRequestsRoot: bytesutil.Bytes32(0),
  }
  require.DeepEqual(t, wanted, protoHeader)
@@ -145,9 +145,9 @@ func TestUpgradeToElectra(t *testing.T) {
  require.NoError(t, err)
  require.Equal(t, 0, len(summaries))
 
- startIndex, err := mSt.DepositReceiptsStartIndex()
+ startIndex, err := mSt.DepositRequestsStartIndex()
  require.NoError(t, err)
- require.Equal(t, params.BeaconConfig().UnsetDepositReceiptsStartIndex, startIndex)
+ require.Equal(t, params.BeaconConfig().UnsetDepositRequestsStartIndex, startIndex)
 
  balance, err := mSt.DepositBalanceToConsume()
  require.NoError(t, err)

beacon-chain/core/electra/withdrawals.go

@@ -19,15 +19,15 @@ import (
  "go.opencensus.io/trace"
 )
 
-// ProcessExecutionLayerWithdrawalRequests processes the validator withdrawals from the provided execution payload
+// ProcessWithdrawalRequests processes the validator withdrawals from the provided execution payload
 // into the beacon state triggered by the execution layer.
 //
 // Spec pseudocode definition:
 //
-// def process_execution_layer_withdrawal_request(
+// def process_withdrawal_request(
 //
 // state: BeaconState,
-// execution_layer_withdrawal_request: ExecutionLayerWithdrawalRequest
+// withdrawal_request: WithdrawalRequest
 //
 // ) -> None:
 // amount = execution_layer_withdrawal_request.amount
@@ -86,8 +86,8 @@ import (
 // amount=to_withdraw,
 // withdrawable_epoch=withdrawable_epoch,
 // ))
-func ProcessExecutionLayerWithdrawalRequests(ctx context.Context, st state.BeaconState, wrs []*enginev1.ExecutionLayerWithdrawalRequest) (state.BeaconState, error) {
- ctx, span := trace.StartSpan(ctx, "electra.ProcessExecutionLayerWithdrawalRequests")
+func ProcessWithdrawalRequests(ctx context.Context, st state.BeaconState, wrs []*enginev1.WithdrawalRequest) (state.BeaconState, error) {
+ ctx, span := trace.StartSpan(ctx, "electra.ProcessWithdrawalRequests")
  defer span.End()
  currentEpoch := slots.ToEpoch(st.Slot())
  for _, wr := range wrs {

beacon-chain/core/electra/withdrawals_test.go

@@ -19,7 +19,7 @@ import (
  "github.com/sirupsen/logrus/hooks/test"
 )
 
-func TestProcessExecutionLayerWithdrawRequests(t *testing.T) {
+func TestProcessWithdrawRequests(t *testing.T) {
  logHook := test.NewGlobal()
  source, err := hexutil.Decode("0xb20a608c624Ca5003905aA834De7156C68b2E1d0")
  require.NoError(t, err)
@@ -30,7 +30,7 @@ func TestProcessExecutionLayerWithdrawRequests(t *testing.T) {
  require.NoError(t, err)
  type args struct {
  st state.BeaconState
- wrs []*enginev1.ExecutionLayerWithdrawalRequest
+ wrs []*enginev1.WithdrawalRequest
  }
  tests := []struct {
  name string
@@ -56,7 +56,7 @@ func TestProcessExecutionLayerWithdrawRequests(t *testing.T) {
  require.NoError(t, preSt.SetValidators([]*eth.Validator{v}))
  return preSt
  }(),
- wrs: []*enginev1.ExecutionLayerWithdrawalRequest{
+ wrs: []*enginev1.WithdrawalRequest{
  {
  SourceAddress: source,
  ValidatorPubkey: bytesutil.SafeCopyBytes(val.PublicKey),
@@ -121,7 +121,7 @@ func TestProcessExecutionLayerWithdrawRequests(t *testing.T) {
  }))
  return preSt
  }(),
- wrs: []*enginev1.ExecutionLayerWithdrawalRequest{
+ wrs: []*enginev1.WithdrawalRequest{
  {
  SourceAddress: source,
  ValidatorPubkey: bytesutil.SafeCopyBytes(val.PublicKey),
@@ -190,7 +190,7 @@ func TestProcessExecutionLayerWithdrawRequests(t *testing.T) {
  require.NoError(t, preSt.SetValidators([]*eth.Validator{v}))
  return preSt
  }(),
- wrs: []*enginev1.ExecutionLayerWithdrawalRequest{
+ wrs: []*enginev1.WithdrawalRequest{
  {
  SourceAddress: source,
  ValidatorPubkey: bytesutil.SafeCopyBytes(val.PublicKey),
@@ -227,7 +227,7 @@ func TestProcessExecutionLayerWithdrawRequests(t *testing.T) {
  require.NoError(t, preSt.SetValidators([]*eth.Validator{v}))
  return preSt
  }(),
- wrs: []*enginev1.ExecutionLayerWithdrawalRequest{
+ wrs: []*enginev1.WithdrawalRequest{
  {
  SourceAddress: source,
  ValidatorPubkey: bytesutil.SafeCopyBytes(val.PublicKey),
@@ -266,7 +266,7 @@ func TestProcessExecutionLayerWithdrawRequests(t *testing.T) {
  }))
  return preSt
  }(),
- wrs: []*enginev1.ExecutionLayerWithdrawalRequest{
+ wrs: []*enginev1.WithdrawalRequest{
  {
  SourceAddress: source,
  ValidatorPubkey: bytesutil.SafeCopyBytes(val.PublicKey),
@@ -284,9 +284,9 @@ func TestProcessExecutionLayerWithdrawRequests(t *testing.T) {
  for _, tt := range tests {
  t.Run(tt.name, func(t *testing.T) {
 
- got, err := electra.ProcessExecutionLayerWithdrawalRequests(context.Background(), tt.args.st, tt.args.wrs)
+ got, err := electra.ProcessWithdrawalRequests(context.Background(), tt.args.st, tt.args.wrs)
  if (err != nil) != tt.wantErr {
- t.Errorf("ProcessExecutionLayerWithdrawalRequests() error = %v, wantErr %v", err, tt.wantErr)
+ t.Errorf("ProcessWithdrawalRequests() error = %v, wantErr %v", err, tt.wantErr)
  return
  }
  tt.wantFn(t, got)

beacon-chain/core/transition/transition_no_verify_sig.go

@@ -227,7 +227,7 @@ func ProcessBlockNoVerifyAnySig(
 // def process_operations(state: BeaconState, body: BeaconBlockBody) -> None:
 // # [Modified in Electra:EIP6110]
 // # Disable former deposit mechanism once all prior deposits are processed
-// eth1_deposit_index_limit = min(state.eth1_data.deposit_count, state.deposit_receipts_start_index)
+// eth1_deposit_index_limit = min(state.eth1_data.deposit_count, state.deposit_requests_start_index)
 // if state.eth1_deposit_index < eth1_deposit_index_limit:
 // assert len(body.deposits) == min(MAX_DEPOSITS, eth1_deposit_index_limit - state.eth1_deposit_index)
 // else:
@@ -245,7 +245,7 @@ func ProcessBlockNoVerifyAnySig(
 // for_ops(body.bls_to_execution_changes, process_bls_to_execution_change)
 // # [New in Electra:EIP7002:EIP7251]
 // for_ops(body.execution_payload.withdrawal_requests, process_execution_layer_withdrawal_request)
-// for_ops(body.execution_payload.deposit_receipts, process_deposit_receipt) # [New in Electra:EIP6110]
+// for_ops(body.execution_payload.deposit_requests, process_deposit_requests) # [New in Electra:EIP6110]
 // for_ops(body.consolidations, process_consolidation) # [New in Electra:EIP7251]
 func ProcessOperationsNoVerifyAttsSigs(
  ctx context.Context,
@@ -401,7 +401,7 @@ func VerifyBlobCommitmentCount(blk interfaces.ReadOnlyBeaconBlock) error {
 // def process_operations(state: BeaconState, body: BeaconBlockBody) -> None:
 // # [Modified in Electra:EIP6110]
 // # Disable former deposit mechanism once all prior deposits are processed
-// eth1_deposit_index_limit = min(state.eth1_data.deposit_count, state.deposit_receipts_start_index)
+// eth1_deposit_index_limit = min(state.eth1_data.deposit_count, state.deposit_requests_start_index)
 // if state.eth1_deposit_index < eth1_deposit_index_limit:
 // assert len(body.deposits) == min(MAX_DEPOSITS, eth1_deposit_index_limit - state.eth1_deposit_index)
 // else:
@@ -419,7 +419,7 @@ func VerifyBlobCommitmentCount(blk interfaces.ReadOnlyBeaconBlock) error {
 // for_ops(body.bls_to_execution_changes, process_bls_to_execution_change)
 // # [New in Electra:EIP7002:EIP7251]
 // for_ops(body.execution_payload.withdrawal_requests, process_execution_layer_withdrawal_request)
-// for_ops(body.execution_payload.deposit_receipts, process_deposit_receipt) # [New in Electra:EIP6110]
+// for_ops(body.execution_payload.deposit_requests, process_deposit_requests) # [New in Electra:EIP6110]
 // for_ops(body.consolidations, process_consolidation) # [New in Electra:EIP7251]
 func electraOperations(
  ctx context.Context,
@@ -445,12 +445,12 @@ func electraOperations(
  if !ok {
  return nil, errors.New("could not cast execution data to electra execution data")
  }
- st, err = electra.ProcessExecutionLayerWithdrawalRequests(ctx, st, exe.WithdrawalRequests())
+ st, err = electra.ProcessWithdrawalRequests(ctx, st, exe.WithdrawalRequests())
  if err != nil {
  return nil, errors.Wrap(err, "could not process execution layer withdrawal requests")
  }
 
- st, err = electra.ProcessDepositReceipts(ctx, st, exe.DepositReceipts()) // TODO: EIP-6110 deposit changes.
+ st, err = electra.ProcessDepositRequests(ctx, st, exe.DepositRequests()) // TODO: EIP-6110 deposit changes.
  if err != nil {
  return nil, errors.Wrap(err, "could not process deposit receipts")
  }

beacon-chain/db/kv/state_test.go

@@ -149,7 +149,7 @@ func TestState_CanSaveRetrieve(t *testing.T) {
  BlockHash: make([]byte, 32),
  TransactionsRoot: make([]byte, 32),
  WithdrawalsRoot: make([]byte, 32),
- DepositReceiptsRoot: make([]byte, 32),
+ DepositRequestsRoot: make([]byte, 32),
  WithdrawalRequestsRoot: make([]byte, 32),
  })
  require.NoError(t, err)

beacon-chain/execution/engine_client.go

@@ -631,7 +631,7 @@ func fullPayloadFromPayloadBody(
  Withdrawals: body.Withdrawals,
  ExcessBlobGas: ebg,
  BlobGasUsed: bgu,
- DepositReceipts: dr,
+ DepositRequests: dr,
  WithdrawalRequests: wr,
  }) // We can't get the block value and don't care about the block value for this instance
  default:
@@ -780,8 +780,8 @@ func buildEmptyExecutionPayload(v int) (proto.Message, error) {
  BlockHash: make([]byte, fieldparams.RootLength),
  Transactions: make([][]byte, 0),
  Withdrawals: make([]*pb.Withdrawal, 0),
- WithdrawalRequests: make([]*pb.ExecutionLayerWithdrawalRequest, 0),
- DepositReceipts: make([]*pb.DepositReceipt, 0),
+ WithdrawalRequests: make([]*pb.WithdrawalRequest, 0),
+ DepositRequests: make([]*pb.DepositRequest, 0),
  }, nil
  default:
  return nil, errors.Wrapf(ErrUnsupportedVersion, "version=%s", version.String(v))

beacon-chain/execution/engine_client_test.go

@@ -1559,7 +1559,7 @@ func fixturesStruct() *payloadFixtures {
  Withdrawals: []*pb.Withdrawal{},
  BlobGasUsed: 2,
  ExcessBlobGas: 3,
- DepositReceipts: dr,
+ DepositRequests: dr,
  WithdrawalRequests: wr,
  }
  hexUint := hexutil.Uint64(1)

beacon-chain/execution/payload_body_test.go

@@ -66,7 +66,7 @@ func payloadToBody(t *testing.T, ed interfaces.ExecutionData) *pb.ExecutionPaylo
  }
  eed, isElectra := ed.(interfaces.ExecutionDataElectra)
  if isElectra {
- body.DepositRequests = pb.ProtoDepositRequestsToJson(eed.DepositReceipts())
+ body.DepositRequests = pb.ProtoDepositRequestsToJson(eed.DepositRequests())
  body.WithdrawalRequests = pb.ProtoWithdrawalRequestsToJson(eed.WithdrawalRequests())
  }
  return body

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

@@ -149,7 +149,8 @@ func TestGetSpec(t *testing.T) {
  config.MaxAttestationsElectra = 89
  config.MaxWithdrawalRequestsPerPayload = 90
  config.MaxCellsInExtendedMatrix = 91
- config.UnsetDepositReceiptsStartIndex = 92
+ config.UnsetDepositRequestsStartIndex = 92
+ config.MaxDepositRequestsPerPayload = 93
 
  var dbp [4]byte
  copy(dbp[:], []byte{'0', '0', '0', '1'})
@@ -192,7 +193,7 @@ func TestGetSpec(t *testing.T) {
  data, ok := resp.Data.(map[string]interface{})
  require.Equal(t, true, ok)
 
- assert.Equal(t, 154, len(data))
+ assert.Equal(t, 155, len(data))
  for k, v := range data {
  t.Run(k, func(t *testing.T) {
  switch k {
@@ -525,8 +526,10 @@ func TestGetSpec(t *testing.T) {
  assert.Equal(t, "90", v)
  case "MAX_CELLS_IN_EXTENDED_MATRIX":
  assert.Equal(t, "91", v)
- case "UNSET_DEPOSIT_RECEIPTS_START_INDEX":
+ case "UNSET_DEPOSIT_REQUESTS_START_INDEX":
  assert.Equal(t, "92", v)
+ case "MAX_DEPOSIT_REQUESTS_PER_PAYLOAD":
+ assert.Equal(t, "93", v)
  default:
  t.Errorf("Incorrect key: %s", k)
  }

beacon-chain/rpc/prysm/v1alpha1/validator/proposer_test.go

@@ -630,14 +630,14 @@ func TestServer_GetBeaconBlock_Electra(t *testing.T) {
  require.NoError(t, err)
  timeStamp, err := slots.ToTime(beaconState.GenesisTime(), electraSlot+1)
  require.NoError(t, err)
- dr := []*enginev1.DepositReceipt{{
+ dr := []*enginev1.DepositRequest{{
  Pubkey: bytesutil.PadTo(privKeys[0].PublicKey().Marshal(), 48),
  WithdrawalCredentials: bytesutil.PadTo([]byte("wc"), 32),
  Amount: 123,
  Signature: bytesutil.PadTo([]byte("sig"), 96),
  Index: 456,
  }}
- wr := []*enginev1.ExecutionLayerWithdrawalRequest{
+ wr := []*enginev1.WithdrawalRequest{
  {
  SourceAddress: bytesutil.PadTo([]byte("sa"), 20),
  ValidatorPubkey: bytesutil.PadTo(privKeys[1].PublicKey().Marshal(), 48),
@@ -654,7 +654,7 @@ func TestServer_GetBeaconBlock_Electra(t *testing.T) {
  PrevRandao: random,
  BaseFeePerGas: make([]byte, fieldparams.RootLength),
  BlockHash: make([]byte, fieldparams.RootLength),
- DepositReceipts: dr,
+ DepositRequests: dr,
  WithdrawalRequests: wr,
  }
 
@@ -680,7 +680,7 @@ func TestServer_GetBeaconBlock_Electra(t *testing.T) {
  got, err := proposerServer.GetBeaconBlock(ctx, req)
  require.NoError(t, err)
  p := got.GetElectra().Block.Body.ExecutionPayload
- require.DeepEqual(t, dr, p.DepositReceipts)
+ require.DeepEqual(t, dr, p.DepositRequests)
  require.DeepEqual(t, wr, p.WithdrawalRequests)
 }
 

beacon-chain/state/interfaces.go

@@ -219,7 +219,7 @@ type ReadOnlySyncCommittee interface {
 
 type ReadOnlyDeposits interface {
  DepositBalanceToConsume() (primitives.Gwei, error)
- DepositReceiptsStartIndex() (uint64, error)
+ DepositRequestsStartIndex() (uint64, error)
  PendingBalanceDeposits() ([]*ethpb.PendingBalanceDeposit, error)
 }
 
@@ -327,7 +327,7 @@ type WriteOnlyConsolidations interface {
 
 type WriteOnlyDeposits interface {
  AppendPendingBalanceDeposit(index primitives.ValidatorIndex, amount uint64) error
- SetDepositReceiptsStartIndex(index uint64) error
+ SetDepositRequestsStartIndex(index uint64) error
  SetPendingBalanceDeposits(val []*ethpb.PendingBalanceDeposit) error
  SetDepositBalanceToConsume(primitives.Gwei) error
 }

beacon-chain/state/state-native/BUILD.bazel

@@ -12,7 +12,7 @@ go_library(
  "getters_block.go",
  "getters_checkpoint.go",
  "getters_consolidation.go",
- "getters_deposit_receipts.go",
+ "getters_deposit_requests.go",
  "getters_eth1.go",
  "getters_exit.go",
  "getters_misc.go",
@@ -33,7 +33,7 @@ go_library(
  "setters_checkpoint.go",
  "setters_churn.go",
  "setters_consolidation.go",
- "setters_deposit_receipts.go",
+ "setters_deposit_requests.go",
  "setters_eth1.go",
  "setters_misc.go",
  "setters_participation.go",
@@ -94,7 +94,7 @@ go_test(
  "getters_block_test.go",
  "getters_checkpoint_test.go",
  "getters_consolidation_test.go",
- "getters_deposit_receipts_test.go",
+ "getters_deposit_requests_test.go",
  "getters_exit_test.go",
  "getters_participation_test.go",
  "getters_test.go",
@@ -109,7 +109,7 @@ go_test(
  "setters_balance_deposits_test.go",
  "setters_churn_test.go",
  "setters_consolidation_test.go",
- "setters_deposit_receipts_test.go",
+ "setters_deposit_requests_test.go",
  "setters_eth1_test.go",
  "setters_misc_test.go",
  "setters_participation_test.go",