From ccf61e170073791d13307cf108f577bdde46a1b3 Mon Sep 17 00:00:00 2001 From: Justin Traglia <95511699+jtraglia@users.noreply.github.com> Date: Fri, 8 Nov 2024 15:15:43 -0600 Subject: [PATCH] Rename remaining "deposit receipt" to "deposit request" (#14629) * Rename remaining "deposit receipt" to "deposit request" * Add changelog entry --------- Co-authored-by: james-prysm <90280386+james-prysm@users.noreply.github.com> --- CHANGELOG.md | 1 + beacon-chain/core/electra/deposits.go | 2 +- beacon-chain/core/electra/transition_no_verify_sig.go | 4 ++-- beacon-chain/state/state-native/getters_deposit_requests.go | 2 +- encoding/ssz/htrutils.go | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2061f001d81a..da236f641ac1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ The format is based on Keep a Changelog, and this project adheres to Semantic Ve - Fixed panic when http request to subscribe to event stream fails. - Return early for blob reconstructor during capella fork - Updated block endpoint from V1 to V2 +- Rename instances of "deposit receipts" to "deposit requests". ### Deprecated diff --git a/beacon-chain/core/electra/deposits.go b/beacon-chain/core/electra/deposits.go index 58fcbb3eee7d..b20ba0a308fe 100644 --- a/beacon-chain/core/electra/deposits.go +++ b/beacon-chain/core/electra/deposits.go @@ -560,7 +560,7 @@ func ProcessDepositRequests(ctx context.Context, beaconState state.BeaconState, return beaconState, nil } -// processDepositRequest processes the specific deposit receipt +// processDepositRequest processes the specific deposit request // def process_deposit_request(state: BeaconState, deposit_request: DepositRequest) -> None: // // # Set deposit request start index diff --git a/beacon-chain/core/electra/transition_no_verify_sig.go b/beacon-chain/core/electra/transition_no_verify_sig.go index c7b478b09857..e9f8f99f9f6d 100644 --- a/beacon-chain/core/electra/transition_no_verify_sig.go +++ b/beacon-chain/core/electra/transition_no_verify_sig.go @@ -84,11 +84,11 @@ func ProcessOperations( } st, err = ProcessDepositRequests(ctx, st, requests.Deposits) if err != nil { - return nil, errors.Wrap(err, "could not process deposit receipts") + return nil, errors.Wrap(err, "could not process deposit requests") } st, err = ProcessWithdrawalRequests(ctx, st, requests.Withdrawals) if err != nil { - return nil, errors.Wrap(err, "could not process execution layer withdrawal requests") + return nil, errors.Wrap(err, "could not process withdrawal requests") } if err := ProcessConsolidationRequests(ctx, st, requests.Consolidations); err != nil { return nil, fmt.Errorf("could not process consolidation requests: %w", err) diff --git a/beacon-chain/state/state-native/getters_deposit_requests.go b/beacon-chain/state/state-native/getters_deposit_requests.go index 2e91709d8ef8..7b1567721c5c 100644 --- a/beacon-chain/state/state-native/getters_deposit_requests.go +++ b/beacon-chain/state/state-native/getters_deposit_requests.go @@ -4,7 +4,7 @@ import ( "github.com/prysmaticlabs/prysm/v5/runtime/version" ) -// DepositRequestsStartIndex is used for returning the deposit receipts start index which is used for eip6110 +// DepositRequestsStartIndex is used for returning the deposit requests start index which is used for eip6110 func (b *BeaconState) DepositRequestsStartIndex() (uint64, error) { if b.version < version.Electra { return 0, errNotSupported("DepositRequestsStartIndex", b.version) diff --git a/encoding/ssz/htrutils.go b/encoding/ssz/htrutils.go index d0581d47e809..3076adcbbcc4 100644 --- a/encoding/ssz/htrutils.go +++ b/encoding/ssz/htrutils.go @@ -141,7 +141,7 @@ func WithdrawalSliceRoot(withdrawals []*enginev1.Withdrawal, limit uint64) ([32] return MixInLength(bytesRoot, bytesRootBufRoot), nil } -// DepositRequestsSliceRoot computes the HTR of a slice of deposit receipts. +// DepositRequestsSliceRoot computes the HTR of a slice of deposit requests. // The limit parameter is used as input to the bitwise merkleization algorithm. func DepositRequestsSliceRoot(depositRequests []*enginev1.DepositRequest, limit uint64) ([32]byte, error) { return SliceRoot(depositRequests, limit)