Skip to content

chore: move utils/validator.zig → validator.zig #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
markolazic01 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: move utils/validator.zig → validator.zig #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/state_transition/block/process_attester_slashing.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const buildSlashingsCacheIfNeeded = @import("../cache/slashings_cache.zig").buil
const isSlashableAttestationData = @import("../utils/attestation.zig").isSlashableAttestationData;
const findAttesterSlashableIndices = @import("../utils/attestation.zig").findAttesterSlashableIndices;
const isValidIndexedAttestation = @import("./is_valid_indexed_attestation.zig").isValidIndexedAttestation;
const isSlashableValidator = @import("../utils/validator.zig").isSlashableValidator;
const isSlashableValidator = @import("../validator.zig").isSlashableValidator;
const slashValidator = @import("./slash_validator.zig").slashValidator;

/// AS is the AttesterSlashing type
Expand Down
2 changes: 1 addition & 1 deletion src/state_transition/block/process_consolidation_request.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const hasExecutionWithdrawalCredential = electra_utils.hasExecutionWithdrawalCre
const isPubkeyKnown = electra_utils.isPubkeyKnown;
const switchToCompoundingValidator = electra_utils.switchToCompoundingValidator;
const computeConsolidationEpochAndUpdateChurn = @import("../utils/epoch.zig").computeConsolidationEpochAndUpdateChurn;
const validator_utils = @import("../utils/validator.zig");
const validator_utils = @import("../validator.zig");
const getConsolidationChurnLimit = validator_utils.getConsolidationChurnLimit;
const getPendingBalanceToWithdraw = validator_utils.getPendingBalanceToWithdraw;
const isActiveValidatorView = validator_utils.isActiveValidatorView;
Expand Down
2 changes: 1 addition & 1 deletion src/state_transition/block/process_deposit.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const computeDomain = @import("../utils/domain.zig").computeDomain;
const computeSigningRoot = @import("../utils/signing_root.zig").computeSigningRoot;
const bls = @import("bls");
const verify = @import("../utils/bls.zig").verify;
const getMaxEffectiveBalance = @import("../utils/validator.zig").getMaxEffectiveBalance;
const getMaxEffectiveBalance = @import("../validator.zig").getMaxEffectiveBalance;
const increaseBalance = @import("../utils/balance.zig").increaseBalance;
const verifyMerkleBranch = @import("../utils/verify_merkle_branch.zig").verifyMerkleBranch;

Expand Down
2 changes: 1 addition & 1 deletion src/state_transition/block/process_proposer_slashing.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const EpochCache = @import("../cache/epoch_cache.zig").EpochCache;
const SlashingsCache = @import("../cache/slashings_cache.zig").SlashingsCache;
const buildSlashingsCacheIfNeeded = @import("../cache/slashings_cache.zig").buildFromStateIfNeeded;
const types = @import("consensus_types");
const isSlashableValidator = @import("../utils/validator.zig").isSlashableValidator;
const isSlashableValidator = @import("../validator.zig").isSlashableValidator;
const getProposerSlashingSignatureSets = @import("../signature_sets/proposer_slashings.zig").getProposerSlashingSignatureSets;
const verifySignature = @import("../utils/signature_sets.zig").verifySingleSignatureSet;
const slashValidator = @import("./slash_validator.zig").slashValidator;
Expand Down
4 changes: 2 additions & 2 deletions src/state_transition/block/process_voluntary_exit.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ const BeaconState = @import("fork_types").BeaconState;
const types = @import("consensus_types");
const c = @import("constants");
const SignedVoluntaryExit = types.phase0.SignedVoluntaryExit.Type;
const getPendingBalanceToWithdraw = @import("../utils/validator.zig").getPendingBalanceToWithdraw;
const isActiveValidatorView = @import("../utils/validator.zig").isActiveValidatorView;
const getPendingBalanceToWithdraw = @import("../validator.zig").getPendingBalanceToWithdraw;
const isActiveValidatorView = @import("../validator.zig").isActiveValidatorView;
const verifyVoluntaryExitSignature = @import("../signature_sets/voluntary_exits.zig").verifyVoluntaryExitSignature;
const initiateValidatorExit = @import("./initiate_validator_exit.zig").initiateValidatorExit;

Expand Down
4 changes: 2 additions & 2 deletions src/state_transition/block/process_withdrawal_request.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ const WithdrawalRequest = types.electra.WithdrawalRequest.Type;
const PendingPartialWithdrawal = types.electra.PendingPartialWithdrawal.Type;
const hasCompoundingWithdrawalCredential = @import("../utils/electra.zig").hasCompoundingWithdrawalCredential;
const hasExecutionWithdrawalCredential = @import("../utils/electra.zig").hasExecutionWithdrawalCredential;
const isActiveValidatorView = @import("../utils/validator.zig").isActiveValidatorView;
const getPendingBalanceToWithdraw = @import("../utils/validator.zig").getPendingBalanceToWithdraw;
const isActiveValidatorView = @import("../validator.zig").isActiveValidatorView;
const getPendingBalanceToWithdraw = @import("../validator.zig").getPendingBalanceToWithdraw;
const initiateValidatorExit = @import("./initiate_validator_exit.zig").initiateValidatorExit;
const computeExitEpochAndUpdateChurn = @import("../utils/epoch.zig").computeExitEpochAndUpdateChurn;

Expand Down
2 changes: 1 addition & 1 deletion src/state_transition/block/process_withdrawals.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const ValidatorIndex = types.primitive.ValidatorIndex.Type;
const ExecutionAddress = types.primitive.ExecutionAddress.Type;
const hasExecutionWithdrawalCredential = @import("../utils/electra.zig").hasExecutionWithdrawalCredential;
const hasEth1WithdrawalCredential = @import("../utils/capella.zig").hasEth1WithdrawalCredential;
const getMaxEffectiveBalance = @import("../utils/validator.zig").getMaxEffectiveBalance;
const getMaxEffectiveBalance = @import("../validator.zig").getMaxEffectiveBalance;
const decreaseBalance = @import("../utils/balance.zig").decreaseBalance;
const Node = @import("persistent_merkle_tree").Node;

Expand Down
2 changes: 1 addition & 1 deletion src/state_transition/block/slash_validator.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const decreaseBalance = @import("../utils/balance.zig").decreaseBalance;
const increaseBalance = @import("../utils/balance.zig").increaseBalance;
const initiateValidatorExit = @import("./initiate_validator_exit.zig").initiateValidatorExit;
const computePreviousEpoch = @import("../utils/epoch.zig").computePreviousEpoch;
const isActiveValidatorView = @import("../utils/validator.zig").isActiveValidatorView;
const isActiveValidatorView = @import("../validator.zig").isActiveValidatorView;
const getBeaconProposer = @import("../cache/get_beacon_proposer.zig").getBeaconProposer;

/// Same to https://github.com/ethereum/eth2.0-specs/blob/v1.1.0-alpha.5/specs/altair/beacon-chain.md#has_flag
Expand Down
6 changes: 3 additions & 3 deletions src/state_transition/cache/epoch_cache.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ const calculateShufflingDecisionRoot = @import("../utils/epoch_shuffling.zig").c

const sumTargetUnslashedBalanceIncrements = @import("../utils/target_unslashed_balance.zig").sumTargetUnslashedBalanceIncrements;

const isActiveValidator = @import("../utils/validator.zig").isActiveValidator;
const getChurnLimit = @import("../utils/validator.zig").getChurnLimit;
const getActivationChurnLimit = @import("../utils/validator.zig").getActivationChurnLimit;
const isActiveValidator = @import("../validator.zig").isActiveValidator;
const getChurnLimit = @import("../validator.zig").getChurnLimit;
const getActivationChurnLimit = @import("../validator.zig").getActivationChurnLimit;

const ForkSeq = @import("config").ForkSeq;
const ForkTypes = @import("fork_types").ForkTypes;
Expand Down
2 changes: 1 addition & 1 deletion src/state_transition/epoch/process_pending_deposits.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const BeaconConfig = @import("config").BeaconConfig;
const BeaconState = @import("fork_types").BeaconState;
const EpochCache = @import("../cache/epoch_cache.zig").EpochCache;
const EpochTransitionCache = @import("../cache/epoch_transition_cache.zig").EpochTransitionCache;
const getActivationExitChurnLimit = @import("../utils/validator.zig").getActivationExitChurnLimit;
const getActivationExitChurnLimit = @import("../validator.zig").getActivationExitChurnLimit;
const preset = @import("preset").preset;
const isValidatorKnown = @import("../utils/electra.zig").isValidatorKnown;
const validateDepositSignature = @import("../block/process_deposit.zig").validateDepositSignature;
Expand Down
4 changes: 2 additions & 2 deletions src/state_transition/slot/upgrade_state_to_electra.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ const ct = @import("consensus_types");
const ValidatorIndex = ct.primitive.ValidatorIndex.Type;
const constants = @import("constants");
const computeActivationExitEpoch = @import("../utils/epoch.zig").computeActivationExitEpoch;
const getActivationExitChurnLimit = @import("../utils/validator.zig").getActivationExitChurnLimit;
const getConsolidationChurnLimit = @import("../utils/validator.zig").getConsolidationChurnLimit;
const getActivationExitChurnLimit = @import("../validator.zig").getActivationExitChurnLimit;
const getConsolidationChurnLimit = @import("../validator.zig").getConsolidationChurnLimit;
const hasCompoundingWithdrawalCredential = @import("../utils/electra.zig").hasCompoundingWithdrawalCredential;
const queueExcessActiveBalance = @import("../utils/electra.zig").queueExcessActiveBalance;

Expand Down
4 changes: 2 additions & 2 deletions src/state_transition/utils/epoch.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ const Gwei = types.primitive.Gwei.Type;
const ForkSeq = @import("config").ForkSeq;
const BeaconState = @import("fork_types").BeaconState;
const EpochCache = @import("../cache/epoch_cache.zig").EpochCache;
const getActivationExitChurnLimit = @import("../utils/validator.zig").getActivationExitChurnLimit;
const getConsolidationChurnLimit = @import("../utils/validator.zig").getConsolidationChurnLimit;
const getActivationExitChurnLimit = @import("../validator.zig").getActivationExitChurnLimit;
const getConsolidationChurnLimit = @import("../validator.zig").getConsolidationChurnLimit;

pub fn computeEpochAtSlot(slot: Slot) Epoch {
return @divFloor(slot, preset.SLOTS_PER_EPOCH);
Expand Down
2 changes: 1 addition & 1 deletion src/state_transition/utils/target_unslashed_balance.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const Validator = types.phase0.Validator.Type;
const Epoch = types.primitive.Epoch.Type;
const preset = @import("preset").preset;
const c = @import("constants");
const isActiveValidator = @import("./validator.zig").isActiveValidator;
const isActiveValidator = @import("../validator.zig").isActiveValidator;

const TIMELY_TARGET = 1 << c.TIMELY_TARGET_FLAG_INDEX;

Expand Down
1 change: 0 additions & 1 deletion src/state_transition/utils_test_root.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,5 @@ test "state_transition utils" {
_ = @import("utils/signing_root.zig");
_ = @import("utils/sync_committee.zig");
_ = @import("utils/target_unslashed_balance.zig");
_ = @import("utils/validator.zig");
_ = @import("utils/verify_merkle_branch.zig");
}
4 changes: 2 additions & 2 deletions src/state_transition/utils/validator.zig → src/state_transition/validator.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ const ValidatorIndex = types.primitive.ValidatorIndex.Type;
const BeaconState = @import("fork_types").BeaconState;
const BeaconConfig = @import("config").BeaconConfig;
const ForkSeq = @import("config").ForkSeq;
const EpochCache = @import("../cache/epoch_cache.zig").EpochCache;
const EpochCache = @import("./cache/epoch_cache.zig").EpochCache;
const WithdrawalCredentials = types.primitive.Root.Type;
const hasCompoundingWithdrawalCredential = @import("./electra.zig").hasCompoundingWithdrawalCredential;
const hasCompoundingWithdrawalCredential = @import("./utils/electra.zig").hasCompoundingWithdrawalCredential;
Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

This line exceeds the 100-column limit specified in the repository style guide. Please wrap the import to adhere to the typographic measure constraints.

const electra_utils = @import("./utils/electra.zig");
const hasCompoundingWithdrawalCredential = electra_utils.hasCompoundingWithdrawalCredential;
References
  1. Hard limit all line lengths, without exception, to at most 100 columns for a good typographic 'measure'. Use it up. Never go beyond. (link)

Copy link
Copy Markdown
Author

@markolazic01 markolazic01 Apr 21, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like an unrelated change request as the repo generally does not follow this rule, I guess it should be formatted as a whole some time later.
Will leave as is.


pub fn isActiveValidator(validator: *const Validator.Type, epoch: Epoch) bool {
return validator.activation_epoch <= epoch and epoch < validator.exit_epoch;
Expand Down
Loading