fix: simtest

Author: anshalshukla

pkgs/node/src/chain.zig

@@ -924,9 +924,7 @@ pub const BeamChain = struct {
             .signature = proposer_signature,
         };
 
-        // store signature if we are aggregator and there are multiple registered validators
-        const store_signature = if (self.is_aggregator_enabled and self.registered_validator_ids.len > 1) true else false;
-        self.forkChoice.onGossipAttestation(signed_proposer_attestation, store_signature) catch |e| {
+        self.forkChoice.onGossipAttestation(signed_proposer_attestation, true) catch |e| {
             self.module_logger.err("error processing proposer attestation={f} error={any}", .{ signed_proposer_attestation, e });
         };
 
@@ -1421,8 +1419,7 @@ pub const BeamChain = struct {
             &signedAttestation.message.signature,
         );
 
-        const store_signature = if (self.is_aggregator_enabled and self.registered_validator_ids.len > 1) true else false;
-        return self.forkChoice.onGossipAttestation(signedAttestation.message, store_signature);
+        return self.forkChoice.onGossipAttestation(signedAttestation.message, true);
     }
 
     pub fn onGossipAggregatedAttestation(self: *Self, signedAggregation: types.SignedAggregatedAttestation) !void {

pkgs/node/src/forkchoice.zig

@@ -923,11 +923,9 @@ 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
-        var attestation_map = self.attestations.iterator();
-        while (attestation_map.next()) |entry| {
-            const validator_id = entry.key_ptr.*;
-            const latest_known = entry.value_ptr.latestKnown orelse ProtoAttestation{};
-            const attestation_data = latest_known.attestation_data;
+        for (0..self.config.genesis.numValidators()) |validator_id| {
+            const attestation_data = ((self.attestations.get(validator_id) orelse AttestationTracker{})
+                .latestKnown orelse ProtoAttestation{}).attestation_data;
 
             if (attestation_data) |att_data| {
                 if (std.mem.eql(u8, &latest_justified.root, &att_data.source.root)) {