Merge pull request #2255 from ralexstokes/update-subcommittee-name

Use different name for constant for sync committee aggregates
ethereum · Mar 22, 2021 · d49cddc · d49cddc
2 parents 3a5f0e9 + 484fae3
commit d49cddc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/configs/mainnet/altair.yaml b/configs/mainnet/altair.yaml
@@ -17,7 +17,7 @@ PROPORTIONAL_SLASHING_MULTIPLIER_ALTAIR: 2
 # 2**10 (= 1,024)
 SYNC_COMMITTEE_SIZE: 1024
 # 2**6 (= 64)
-SYNC_SUBCOMMITTEE_SIZE: 64
+SYNC_PUBKEYS_PER_AGGREGATE: 64
 # 2**2 (= 4)
 INACTIVITY_SCORE_BIAS: 4
 

diff --git a/configs/minimal/altair.yaml b/configs/minimal/altair.yaml
@@ -17,7 +17,7 @@ PROPORTIONAL_SLASHING_MULTIPLIER_ALTAIR: 2
 # [customized]
 SYNC_COMMITTEE_SIZE: 32
 # [customized]
-SYNC_SUBCOMMITTEE_SIZE: 16
+SYNC_PUBKEYS_PER_AGGREGATE: 16
 # 2**2 (= 4)
 INACTIVITY_SCORE_BIAS: 4
 

diff --git a/specs/altair/beacon-chain.md b/specs/altair/beacon-chain.md
@@ -117,7 +117,7 @@ This patch updates a few configuration values to move penalty parameters toward
 | Name | Value |
 | - | - |
 | `SYNC_COMMITTEE_SIZE` | `uint64(2**10)` (= 1,024) |
-| `SYNC_SUBCOMMITTEE_SIZE` | `uint64(2**6)` (= 64) |
+| `SYNC_PUBKEYS_PER_AGGREGATE` | `uint64(2**6)` (= 64) |
 | `INACTIVITY_SCORE_BIAS` | `uint64(4)` |
 
 ### Time parameters
@@ -210,7 +210,7 @@ class SyncAggregate(Container):
 ```python
 class SyncCommittee(Container):
     pubkeys: Vector[BLSPubkey, SYNC_COMMITTEE_SIZE]
-    pubkey_aggregates: Vector[BLSPubkey, SYNC_COMMITTEE_SIZE // SYNC_SUBCOMMITTEE_SIZE]
+    pubkey_aggregates: Vector[BLSPubkey, SYNC_COMMITTEE_SIZE // SYNC_PUBKEYS_PER_AGGREGATE]
 ```
 
 ## Helper functions
@@ -294,8 +294,8 @@ def get_sync_committee(state: BeaconState, epoch: Epoch) -> SyncCommittee:
     """
     indices = get_sync_committee_indices(state, epoch)
     pubkeys = [state.validators[index].pubkey for index in indices]
-    subcommitees = [pubkeys[i:i + SYNC_SUBCOMMITTEE_SIZE] for i in range(0, len(pubkeys), SYNC_SUBCOMMITTEE_SIZE)]
-    pubkey_aggregates = [bls.AggregatePKs(subcommitee) for subcommitee in subcommitees]
+    partition = [pubkeys[i:i + SYNC_PUBKEYS_PER_AGGREGATE] for i in range(0, len(pubkeys), SYNC_PUBKEYS_PER_AGGREGATE)]
+    pubkey_aggregates = [bls.AggregatePKs(preaggregate) for preaggregate in partition]
     return SyncCommittee(pubkeys=pubkeys, pubkey_aggregates=pubkey_aggregates)
 ```