mirror of
https://github.com/OffchainLabs/prysm.git
synced 2026-01-08 21:08:10 -05:00
#### This PR sets the foundation for the new logging features. --- The goal of this big PR is the following: 1. Adding a log.go file to every package: [_commit_](54f6396d4c) - Writing a bash script that adds the log.go file to every package that imports logrus, except the excluded packages, configured at the top of the bash script. - the log.go file creates a log variable and sets a field called `package` to the full path of that package. - I have tried to fix every error/problem that came from mass generation of this file. (duplicate declarations, different prefix names, etc...) - some packages had the log.go file from before, and had some helper functions in there as well. I've moved all of them to a `log_helpers.go` file within each package. 2. Create a CI rule which verifies that: [_commit_](b799c3a0ef) - every package which imports logrus, also has a log.go file, except the excluded packages. - the `package` field of each log.go variable, has the correct path. (to detect when we move a package or change it's name) - I pushed a commit with a manually changed log.go file to trigger the ci check failure and it worked. 3. Alter the logging system to read the prefix from this `package` field for every log while outputing: [_commit_](b0c7f1146c) - some packages have/want/need a different log prefix than their package name (like `kv`). This can be solved by keeping a map of package paths to prefix names somewhere. --- **Some notes:** - Please review everything carefully. - I created the `prefixReplacement` map and populated the data that I deemed necessary. Please check it and complain if something doesn't make sense or is missing. I attached at the bottom, the list of all the packages that used to use a different name than their package name as their prefix. - I have chosen to mark some packages to be excluded from this whole process. They will either not log anything, or log without a prefix, or log using their previously defined prefix. See the list of exclusions in the bottom. - I fixed all the tests that failed because of this change. These were failing because they were expecting the old prefix to be in the generated logs. I have changed those to expect the new `package` field instead. This might not be a great solution. Ideally we might want to remove this from the tests so they only test for relevant fields in the logs. but this is a problem for another day. - Please run the node with this config, and mention if you see something weird in the logs. (use different verbosities) - The CI workflow uses a script that basically runs the `hack/gen-logs.sh` and checks that the git diff is zero. that script is `hack/check-logs.sh`. This means that if one runs this script locally, it will not actually _check_ anything, rather than just regenerate the log.go files and fix any mistake. This might be confusing. Please suggest solutions if you think it's a problem. --- **A list of packages that used a different prefix than their package names for their logs:** - beacon-chain/cache/depositsnapshot/ package depositsnapshot, prefix "cache" - beacon-chain/core/transition/log.go — package transition, prefix "state" - beacon-chain/db/kv/log.go — package kv, prefix "db" - beacon-chain/db/slasherkv/log.go — package slasherkv, prefix "slasherdb" - beacon-chain/db/pruner/pruner.go — package pruner, prefix "db-pruner" - beacon-chain/light-client/log.go — package light_client, prefix "light-client" - beacon-chain/operations/attestations/log.go — package attestations, prefix "pool/attestations" - beacon-chain/operations/slashings/log.go — package slashings, prefix "pool/slashings" - beacon-chain/rpc/core/log.go — package core, prefix "rpc/core" - beacon-chain/rpc/eth/beacon/log.go — package beacon, prefix "rpc/beaconv1" - beacon-chain/rpc/eth/validator/log.go — package validator, prefix "beacon-api" - beacon-chain/rpc/prysm/v1alpha1/beacon/log.go — package beacon, prefix "rpc" - beacon-chain/rpc/prysm/v1alpha1/validator/log.go — package validator, prefix "rpc/validator" - beacon-chain/state/stategen/log.go — package stategen, prefix "state-gen" - beacon-chain/sync/checkpoint/log.go — package checkpoint, prefix "checkpoint-sync" - beacon-chain/sync/initial-sync/log.go — package initialsync, prefix "initial-sync" - cmd/prysmctl/p2p/log.go — package p2p, prefix "prysmctl-p2p" - config/features/log.go -- package features, prefix "flags" - io/file/log.go — package file, prefix "fileutil" - proto/prysm/v1alpha1/log.go — package eth, prefix "protobuf" - validator/client/beacon-api/log.go — package beacon_api, prefix "beacon-api" - validator/db/kv/log.go — package kv, prefix "db" - validator/db/filesystem/db.go — package filesystem, prefix "db" - validator/keymanager/derived/log.go — package derived, prefix "derived-keymanager" - validator/keymanager/local/log.go — package local, prefix "local-keymanager" - validator/keymanager/remote-web3signer/log.go — package remote_web3signer, prefix "remote-keymanager" - validator/keymanager/remote-web3signer/internal/log.go — package internal, prefix "remote-web3signer- internal" - beacon-chain/forkchoice/doubly... prefix is "forkchoice-doublylinkedtree" **List of excluded directories (their subdirectories are also excluded):** ``` EXCLUDED_PATH_PREFIXES=( "testing" "validator/client/testutil" "beacon-chain/p2p/testing" "beacon-chain/rpc/eth/config" "beacon-chain/rpc/prysm/v1alpha1/debug" "tools" "runtime" "monitoring" "io" "cmd" ".well-known" "changelog" "hack" "specrefs" "third_party" "bazel-out" "bazel-bin" "bazel-prysm" "bazel-testlogs" "build" ".github" ".jj" ".idea" ".vscode" ) ```
209 lines
8.2 KiB
Go
209 lines
8.2 KiB
Go
package electra
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
|
|
"github.com/OffchainLabs/prysm/v7/beacon-chain/core/helpers"
|
|
"github.com/OffchainLabs/prysm/v7/beacon-chain/core/validators"
|
|
"github.com/OffchainLabs/prysm/v7/beacon-chain/state"
|
|
"github.com/OffchainLabs/prysm/v7/config/params"
|
|
"github.com/OffchainLabs/prysm/v7/consensus-types/primitives"
|
|
"github.com/OffchainLabs/prysm/v7/encoding/bytesutil"
|
|
"github.com/OffchainLabs/prysm/v7/monitoring/tracing/trace"
|
|
enginev1 "github.com/OffchainLabs/prysm/v7/proto/engine/v1"
|
|
ethpb "github.com/OffchainLabs/prysm/v7/proto/prysm/v1alpha1"
|
|
"github.com/OffchainLabs/prysm/v7/runtime/version"
|
|
"github.com/OffchainLabs/prysm/v7/time/slots"
|
|
"github.com/ethereum/go-ethereum/common/hexutil"
|
|
"github.com/pkg/errors"
|
|
)
|
|
|
|
// ProcessWithdrawalRequests processes the validator withdrawals from the provided execution payload
|
|
// into the beacon state triggered by the execution layer.
|
|
//
|
|
// Spec pseudocode definition:
|
|
//
|
|
// def process_withdrawal_request(
|
|
//
|
|
// state: BeaconState,
|
|
// withdrawal_request: WithdrawalRequest
|
|
//
|
|
// ) -> None:
|
|
//
|
|
// amount = withdrawal_request.amount
|
|
// is_full_exit_request = amount == FULL_EXIT_REQUEST_AMOUNT
|
|
//
|
|
// # If partial withdrawal queue is full, only full exits are processed
|
|
// if len(state.pending_partial_withdrawals) == PENDING_PARTIAL_WITHDRAWALS_LIMIT and not is_full_exit_request:
|
|
// return
|
|
//
|
|
// validator_pubkeys = [v.pubkey for v in state.validators]
|
|
// # Verify pubkey exists
|
|
// request_pubkey = withdrawal_request.validator_pubkey
|
|
// if request_pubkey not in validator_pubkeys:
|
|
// return
|
|
// index = ValidatorIndex(validator_pubkeys.index(request_pubkey))
|
|
// validator = state.validators[index]
|
|
//
|
|
// # Verify withdrawal credentials
|
|
// has_correct_credential = has_execution_withdrawal_credential(validator)
|
|
// is_correct_source_address = (
|
|
// validator.withdrawal_credentials[12:] == withdrawal_request.source_address
|
|
// )
|
|
// if not (has_correct_credential and is_correct_source_address):
|
|
// return
|
|
// # Verify the validator is active
|
|
// if not is_active_validator(validator, get_current_epoch(state)):
|
|
// return
|
|
// # Verify exit has not been initiated
|
|
// if validator.exit_epoch != FAR_FUTURE_EPOCH:
|
|
// return
|
|
// # Verify the validator has been active long enough
|
|
// if get_current_epoch(state) < validator.activation_epoch + SHARD_COMMITTEE_PERIOD:
|
|
// return
|
|
//
|
|
// pending_balance_to_withdraw = get_pending_balance_to_withdraw(state, index)
|
|
//
|
|
// if is_full_exit_request:
|
|
// # Only exit validator if it has no pending withdrawals in the queue
|
|
// if pending_balance_to_withdraw == 0:
|
|
// initiate_validator_exit(state, index)
|
|
// return
|
|
//
|
|
// has_sufficient_effective_balance = validator.effective_balance >= MIN_ACTIVATION_BALANCE
|
|
// has_excess_balance = state.balances[index] > MIN_ACTIVATION_BALANCE + pending_balance_to_withdraw
|
|
//
|
|
// # Only allow partial withdrawals with compounding withdrawal credentials
|
|
// if has_compounding_withdrawal_credential(validator) and has_sufficient_effective_balance and has_excess_balance:
|
|
// to_withdraw = min(
|
|
// state.balances[index] - MIN_ACTIVATION_BALANCE - pending_balance_to_withdraw,
|
|
// amount
|
|
// )
|
|
// exit_queue_epoch = compute_exit_epoch_and_update_churn(state, to_withdraw)
|
|
// withdrawable_epoch = Epoch(exit_queue_epoch + MIN_VALIDATOR_WITHDRAWABILITY_DELAY)
|
|
// state.pending_partial_withdrawals.append(PendingPartialWithdrawal(
|
|
// index=index,
|
|
// amount=to_withdraw,
|
|
// withdrawable_epoch=withdrawable_epoch,
|
|
// ))
|
|
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())
|
|
if len(wrs) == 0 {
|
|
return st, nil
|
|
}
|
|
// It is correct to compute exitInfo once for all withdrawals in the block, as the ExitInfo pointer is
|
|
// updated within InitiateValidatorExit which is the only function that uses it.
|
|
var exitInfo *validators.ExitInfo
|
|
if st.Version() < version.Electra {
|
|
exitInfo = validators.ExitInformation(st)
|
|
} else {
|
|
// After Electra, the function InitiateValidatorExit ignores the exitInfo passed to it and recomputes it anyway.
|
|
exitInfo = &validators.ExitInfo{}
|
|
}
|
|
for _, wr := range wrs {
|
|
if wr == nil {
|
|
return nil, errors.New("nil execution layer withdrawal request")
|
|
}
|
|
amount := wr.Amount
|
|
isFullExitRequest := amount == params.BeaconConfig().FullExitRequestAmount
|
|
// If partial withdrawal queue is full, only full exits are processed
|
|
if n, err := st.NumPendingPartialWithdrawals(); err != nil {
|
|
return nil, err
|
|
} else if n == params.BeaconConfig().PendingPartialWithdrawalsLimit && !isFullExitRequest {
|
|
// if the PendingPartialWithdrawalsLimit is met, the user would have paid for a partial withdrawal that's not included
|
|
log.Debug("Skipping execution layer withdrawal request, PendingPartialWithdrawalsLimit reached")
|
|
continue
|
|
}
|
|
|
|
vIdx, exists := st.ValidatorIndexByPubkey(bytesutil.ToBytes48(wr.ValidatorPubkey))
|
|
if !exists {
|
|
log.WithField("validator", hexutil.Encode(wr.ValidatorPubkey)).Debug("Skipping execution layer withdrawal request, validator index not found")
|
|
continue
|
|
}
|
|
validator, err := st.ValidatorAtIndexReadOnly(vIdx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// Verify withdrawal credentials
|
|
hasCorrectCredential := validator.HasExecutionWithdrawalCredentials()
|
|
wc := validator.GetWithdrawalCredentials()
|
|
isCorrectSourceAddress := bytes.Equal(wc[12:], wr.SourceAddress)
|
|
if !hasCorrectCredential || !isCorrectSourceAddress {
|
|
log.Debug("Skipping execution layer withdrawal request, wrong withdrawal credentials")
|
|
continue
|
|
}
|
|
|
|
// Verify the validator is active.
|
|
if !helpers.IsActiveValidatorUsingTrie(validator, currentEpoch) {
|
|
log.Debug("Skipping execution layer withdrawal request, validator not active")
|
|
continue
|
|
}
|
|
// Verify the validator has not yet submitted an exit.
|
|
if validator.ExitEpoch() != params.BeaconConfig().FarFutureEpoch {
|
|
log.Debug("Skipping execution layer withdrawal request, validator has submitted an exit already")
|
|
continue
|
|
}
|
|
// Verify the validator has been active long enough.
|
|
if currentEpoch < validator.ActivationEpoch().AddEpoch(params.BeaconConfig().ShardCommitteePeriod) {
|
|
log.Debug("Skipping execution layer withdrawal request, validator has not been active long enough")
|
|
continue
|
|
}
|
|
|
|
pendingBalanceToWithdraw, err := st.PendingBalanceToWithdraw(vIdx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if isFullExitRequest {
|
|
// Only exit validator if it has no pending withdrawals in the queue
|
|
if pendingBalanceToWithdraw == 0 {
|
|
var err error
|
|
// exitInfo is updated within InitiateValidatorExit
|
|
st, err = validators.InitiateValidatorExit(ctx, st, vIdx, exitInfo)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
continue
|
|
}
|
|
|
|
hasSufficientEffectiveBalance := validator.EffectiveBalance() >= params.BeaconConfig().MinActivationBalance
|
|
vBal, err := st.BalanceAtIndex(vIdx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
hasExcessBalance := vBal > params.BeaconConfig().MinActivationBalance+pendingBalanceToWithdraw
|
|
|
|
// Only allow partial withdrawals with compounding withdrawal credentials
|
|
if validator.HasCompoundingWithdrawalCredentials() && hasSufficientEffectiveBalance && hasExcessBalance {
|
|
// Spec definition:
|
|
// to_withdraw = min(
|
|
// state.balances[index] - MIN_ACTIVATION_BALANCE - pending_balance_to_withdraw,
|
|
// amount
|
|
// )
|
|
|
|
// note: you can safely subtract these values because haxExcessBalance is checked
|
|
toWithdraw := min(vBal-params.BeaconConfig().MinActivationBalance-pendingBalanceToWithdraw, amount)
|
|
exitQueueEpoch, err := st.ExitEpochAndUpdateChurn(primitives.Gwei(toWithdraw))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
// safe add the uint64 to avoid overflow
|
|
withdrawableEpoch, err := exitQueueEpoch.SafeAddEpoch(params.BeaconConfig().MinValidatorWithdrawabilityDelay)
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "failed to add withdrawability delay to exit queue epoch")
|
|
}
|
|
if err := st.AppendPendingPartialWithdrawal(ðpb.PendingPartialWithdrawal{
|
|
Index: vIdx,
|
|
Amount: toWithdraw,
|
|
WithdrawableEpoch: withdrawableEpoch,
|
|
}); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
}
|
|
return st, nil
|
|
}
|