Skip to content

perf: iterate HashMap entries to avoid unnecessary hash lookups #666

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

Merged
anshalshukla merged 2 commits into from
Mar 19, 2026
+11 −11
Merged

perf: iterate HashMap entries to avoid unnecessary hash lookups #666

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09b29b8
perf: iterate HashMap entries to avoid unnecessary hash lookups (clos…
Mar 13, 2026
cd614b7
Merge branch 'main' into zclawz/issue-663
anshalshukla Mar 19, 2026
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
22 changes: 11 additions & 11 deletions pkgs/node/src/forkchoice.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -928,9 +928,10 @@ pub const ForkChoice = struct {
// TODO naive strategy to include all attestations that are consistent with the latest justified
// replace by the other mini 3sf simple strategy to loop and see if justification happens and
// till no further attestations can be added
for (0..self.config.genesis.numValidators()) |validator_id| {
const attestation_data = ((self.attestations.get(validator_id) orelse AttestationTracker{})
.latestKnown orelse ProtoAttestation{}).attestation_data;
var att_iter = self.attestations.iterator();
while (att_iter.next()) |entry| {
const validator_id = entry.key_ptr.*;
const attestation_data = (entry.value_ptr.latestKnown orelse ProtoAttestation{}).attestation_data;

if (attestation_data) |att_data| {
if (std.mem.eql(u8, &latest_justified.root, &att_data.source.root)) {
Expand Down Expand Up @@ -988,23 +989,22 @@ pub const ForkChoice = struct {
// balances are right now same for the dummy chain and each weighing 1
const validatorWeight = 1;

for (0..self.config.genesis.numValidators()) |validator_id| {
var attestation_tracker = self.attestations.get(validator_id) orelse AttestationTracker{};
if (attestation_tracker.appliedIndex) |applied_index| {
var delta_iter = self.attestations.iterator();
while (delta_iter.next()) |entry| {
if (entry.value_ptr.appliedIndex) |applied_index| {
self.deltas.items[applied_index] -= validatorWeight;
}
attestation_tracker.appliedIndex = null;
entry.value_ptr.appliedIndex = null;

const latest_attestation = if (from_known)
attestation_tracker.latestKnown
entry.value_ptr.latestKnown
else
attestation_tracker.latestNew;
entry.value_ptr.latestNew;

if (latest_attestation) |delta_attestation| {
self.deltas.items[delta_attestation.index] += validatorWeight;
attestation_tracker.appliedIndex = delta_attestation.index;
entry.value_ptr.appliedIndex = delta_attestation.index;
}
try self.attestations.put(validator_id, attestation_tracker);
}

return self.deltas.items;
Expand Down
Loading