AtHeartEngineer/prysm
1
0
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-09 13:28:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make until_epoch exclusive in PrepareSyncCommitteeSubnets (#9579)

Browse Source 
Co-authored-by: Raul Jordan <raul@prysmaticlabs.com>
Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
This commit is contained in:
Radosław Kapka
2021-09-14 17:14:28 +02:00
committed by GitHub
parent 25f2ca4159
commit ac3c544e29
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
beacon-chain/rpc/eth/validator/validator.go
View File

@@ -486,16 +486,16 @@ func (vs *Server) SubmitSyncCommitteeSubscription(ctx context.Context, req *ethp
startEpoch := types.Epoch(currPeriod * uint64(params.BeaconConfig().EpochsPerSyncCommitteePeriod))
for i, sub := range req.Data {
if sub.UntilEpoch < currEpoch {
return nil, status.Errorf(codes.InvalidArgument, "Epoch for subscription at index %d is in the past. It must be at least %d", i, currEpoch)
if sub.UntilEpoch <= currEpoch {
return nil, status.Errorf(codes.InvalidArgument, "Epoch for subscription at index %d is in the past. It must be at least %d", i, currEpoch+1)
}
maxValidEpoch := startEpoch + params.BeaconConfig().EpochsPerSyncCommitteePeriod
if sub.UntilEpoch > maxValidEpoch {
if sub.UntilEpoch > maxValidEpoch+1 {
return nil, status.Errorf(
codes.InvalidArgument,
"Epoch for subscription at index %d is too far in the future. It can be at most %d",
i,
maxValidEpoch,
maxValidEpoch+1,
)
}
}

4
beacon-chain/rpc/eth/validator/validator_test.go
View File

@@ -1101,8 +1101,6 @@ func TestSubmitSyncCommitteeSubscription(t *testing.T) {
require.NoError(t, err)
bs, err := sharedtestutil.GenesisBeaconState(context.Background(), deposits, 0, eth1Data)
require.NoError(t, err, "Could not set up genesis state")
// Set state to epoch 1.
require.NoError(t, bs.SetSlot(params.BeaconConfig().SlotsPerEpoch))
genesisRoot, err := genesis.Block.HashTreeRoot()
require.NoError(t, err, "Could not get signing root")
roots := make([][]byte, params.BeaconConfig().SlotsPerHistoricalRoot)
@@ -1215,7 +1213,7 @@ func TestSubmitSyncCommitteeSubscription(t *testing.T) {
{
ValidatorIndex: 0,
SyncCommitteeIndices: []uint64{},
UntilEpoch: params.BeaconConfig().EpochsPerSyncCommitteePeriod + 1,
UntilEpoch: params.BeaconConfig().EpochsPerSyncCommitteePeriod + 2,
},
},
}

2
proto/eth/v2/validator.proto
View File

@@ -65,7 +65,7 @@ message SyncCommitteeSubscription {
// The sync committee indices to be subscribed to.
repeated uint64 sync_committee_indices = 2;
// The final epoch that the specified validator requires the subscription for.
// The final epoch (exclusive value) that the specified validator requires the subscription for.
uint64 until_epoch = 3 [(ethereum.eth.ext.cast_type) = "github.com/prysmaticlabs/eth2-types.Epoch"];
}