Merge 3ae7cd9 into 8bd19f4

ChainSafe · Dec 9, 2023 · 23cc705 · 23cc705
2 parents 8bd19f4 + 3ae7cd9
commit 23cc705
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/packages/beacon-node/src/chain/opPools/aggregatedAttestationPool.ts b/packages/beacon-node/src/chain/opPools/aggregatedAttestationPool.ts
@@ -166,10 +166,16 @@ export class AggregatedAttestationPool {
       }
     }
 
-    return attestationsByScore
-      .sort((a, b) => b.score - a.score)
-      .slice(0, MAX_ATTESTATIONS)
-      .map((attestation) => attestation.attestation);
+    const sortedAttestationsByScore = attestationsByScore.sort((a, b) => b.score - a.score);
+    const attestationsForBlock: phase0.Attestation[] = [];
+    for (const [i, attestationWithScore] of sortedAttestationsByScore.entries()) {
+      if (i >= MAX_ATTESTATIONS) {
+        break;
+      }
+      // attestations could be modified in this op pool, so we need to clone for block
+      attestationsForBlock.push(ssz.phase0.Attestation.clone(attestationWithScore.attestation));
+    }
+    return attestationsForBlock;
   }
 
   /**