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

Use different name for constant for sync committee aggregates
This commit is contained in:
Danny Ryan 2021-03-22 11:34:32 -06:00 committed by GitHub
commit d49cddc1d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View File

@ -17,7 +17,7 @@ PROPORTIONAL_SLASHING_MULTIPLIER_ALTAIR: 2
# 2**10 (= 1,024) # 2**10 (= 1,024)
SYNC_COMMITTEE_SIZE: 1024 SYNC_COMMITTEE_SIZE: 1024
# 2**6 (= 64) # 2**6 (= 64)
SYNC_SUBCOMMITTEE_SIZE: 64 SYNC_PUBKEYS_PER_AGGREGATE: 64
# 2**2 (= 4) # 2**2 (= 4)
INACTIVITY_SCORE_BIAS: 4 INACTIVITY_SCORE_BIAS: 4

View File

@ -17,7 +17,7 @@ PROPORTIONAL_SLASHING_MULTIPLIER_ALTAIR: 2
# [customized] # [customized]
SYNC_COMMITTEE_SIZE: 32 SYNC_COMMITTEE_SIZE: 32
# [customized] # [customized]
SYNC_SUBCOMMITTEE_SIZE: 16 SYNC_PUBKEYS_PER_AGGREGATE: 16
# 2**2 (= 4) # 2**2 (= 4)
INACTIVITY_SCORE_BIAS: 4 INACTIVITY_SCORE_BIAS: 4

View File

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