From 046a00aa87ac00b9184f3cef1d109471fbb18b03 Mon Sep 17 00:00:00 2001 From: terence tsao Date: Wed, 15 Apr 2020 09:00:39 -0700 Subject: [PATCH] Modify `GetValidatorParticipation` to use new state service (#5409) * Skip 2 more minimal tests * Update readme * gaz * Fix import and not use * Update workspace for new spec test * Fix workspace * Update workspace with new ethapi commit * Unblock a few tests * fixed block op test * gaz * Skip gen state test (test setup issue * Updated hysteresis config * Updated epoch processing for new hyteresis * Updated tests * regen proto beacon * update state util for state root * update state types * update getter and setters * update compute domain and get domain and tests * update validators * Add forkdata proto * Updated compute domain api, moved it to helper pkg * Fixed all core tests * Fixed all the sync tests * Fixed all the rpc tests * Conflict fix * visibility * Fixed validator tests * Fixing test util * Fixed rest of non spec tests * Fixed a bug proposer index wasn't included * gaz * Updated eth1 data voting period to epoch based * Fixed failed tests * fix bug * fix error * Fixed more misc tests * Add new SignedAggregateAndProof to pass spec test * Update minimalConfig.PersistentCommitteePeriod * allow to rebuild trie * Skip e2e tests * Align aggregator action with v0.11 (#5146) * Remove Head Root from Beacon Block by Range Request (#5165) * make proto changes * remove head root * add back herumi's library * Update ethapi in workspace, started fixing test. Hand off to Nishant * fix build * Align finalized slot check with v0.11 (#5166) * Add DoS resistance for v0.11 (#5158) * Add Fork Digest Helper (#5173) * Extend DoS prevention to rest of operation objects (#5174) * Update mapping * Add caches * Update seen block in validation pipeline * Update seen att in validation pipeline * Update seen att in validation pipeline * Fixed rest of tests * Gazelle * Better writes * Lint * Preston's feedback * Switched to LRU cache and fixed tests * Gazelle * Fix test * Update proposer slashing * Update proposer slashing * Fixed a block test * Update exit * Update atteser slashing * Raul's feedback Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Add remote keymanager (#5133) * Add remote keymanager * Add generic signRoot() helper * Add tests for remote keymanager * NewRemote -> NewRemoteWallet * signRoot -> signOject, to increase reuse * Fix end-to-end compile error Co-authored-by: Preston Van Loon * Add Snappy Framing to the Encoder (#5172) * change to framing * more fixes * fix everything * add stricter limits * preston feedback Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> Co-authored-by: rauljordan * Move Subnet Functionality to its Own File (#5179) * move subnets to their own file * fix build fail * build * Update beacon-chain/p2p/discovery_test.go Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Verify proposer signature in sync (#5206) * Fix Signed Attestation In Sync (#5207) * Add Eth2 Fork ENR Functionality (#5181) * add fork entry enr * add in fork * add the required fork entry to node * add and retrieve fork entry * await state initialized * utilize new structure * more progress, utilizing a config map instead * send the genesis validators root via the event feed * struct method for discovery * fix broken builds * fixed up more tsts using state feed initializer * fix up most tests * only one more failing test * almost done with tests * p2p tests all pass * config fix * fix blockchain test * gaz * add in todo * lint * add compare func * ensure fork ENR versions match between peers * add in test for discovery * test name * tests complete * tests done * done * comments * fix all flakes * addressed comments * build using ssz gen * marshal record * use custom ssz * deduplicate import * fix build * add enr proto * p2p tests done Co-authored-by: nisdas Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Verify aggregator signature in sync (#5208) * Add Fork Digest For Gossip Topics (#5191) * update for the day * fix remaining failing test * fix one more test * change message * Apply suggestions from code review Co-Authored-By: terence tsao * terence's review * implement fork digest' * align digest to interface' * passed all tests * spawn in goroutine Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> Co-authored-by: terence tsao Co-authored-by: Raul Jordan * Fix Incorrect Attester Slashing Method (#5229) * Remove keystore keymanager from validator (#5236) * Remove keystore keymanager from validator * Update dependency * Update validator/flags/flags.go * Update validator/flags/flags.go Co-authored-by: Ivan Martinez * fix broadcaster * update metrics with fork digest for p2p (#5251) * update metrics with fork digest for p2p * update p2p metrics * update metrics using att values * wrapped up * fix bug Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Fix incorrect domain type comments (#5250) * Fix incorrect domain type comments * fix broken broadcast test * fix tests * include protocol suffix * lint * fix test * resolve broken slasher test' * fix config override * Remove deprecated parameters (#5249) * Avoid div by zero in extreme balance case (#5273) * Return effective balance increment instead of 1 * Update to new spec tests v0.11.1 * Revert "Regen historical states for `new-state-mgmt` compatibility (#5261)" This reverts commit df9a534826037ddac8dcaac0b1b470ce9fa8ecd4. Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Revert "Remove deprecated parameters (#5249)" (#5276) This reverts commit 7d17c9ac3455ee15c67b3645485693309216bc97. * Verify block proposer index before gossip (#5274) * Update pipeline * Update tests Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Add in Proposer Index to Custom HTR (#5269) * fix test * Update beacon-chain/state/stateutil/blocks_test.go Co-authored-by: terence tsao Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Resolve Flakey P2P Tests (#5285) * double time for flakey test * fix test flakeyness in p2p: * flakey * time tolerance * greater tolerance * release resources correctly (#5287) * Enable NOISE Handshake by Default v0.11 (#5272) * noise handshakes by default * fix build * noisy noise everywhere * deprecated noisy noise flag with more noise * add secio as fallback Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> Co-authored-by: nisdas * new ports * fix broken build * Make `new-state-mgmt` canonical (#5289) * Invert the flags * Update checking messages * Fixed all db tests * Fixed rest of the block chain tests * Fix chain race tests * Fixed rpc tests * Disable soudns better... * Merge branch 'v0.11' into invert-new-state-mgmt * Merge refs/heads/v0.11 into invert-new-state-mgmt * Fix export * Merge branch 'invert-new-state-mgmt' of github.com:prysmaticlabs/prysm into invert-new-state-mgmt * Fix conflict tests * Gazelle * Merge refs/heads/v0.11 into invert-new-state-mgmt * Merge refs/heads/v0.11 into invert-new-state-mgmt * resolve flakeyness * Detect Proposer Slashing Implementation (#5139) * detect blocks * detect blocks * use stub * use stub * use stub * todo * fix test * add tests and utils * fix imports * fix imports * fix comment * todo * proposerIndex * fix broken test * formatting and simplified if * Update slasher/detection/service.go * Update slasher/detection/testing/utils.go Co-Authored-By: terence tsao * fixed up final comments * better naming * Update slasher/detection/service.go * Update slasher/detection/service.go * Update slasher/detection/service.go Co-Authored-By: Ivan Martinez * no more named args Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> Co-authored-by: Raul Jordan Co-authored-by: terence tsao Co-authored-by: Ivan Martinez * Add Metadata And Ping RPC methods (#5271) * add new proto files * add flag and helper * add initializer * imports * add ping method * add receive/send ping request * add ping test * refactor rpc methods and add ping test * finish adding all tests * fix up tests * Apply suggestions from code review * lint * imports * lint * Update beacon-chain/p2p/service.go * Update shared/cmd/flags.go Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> Co-authored-by: terence tsao * Updates for remote keymanager (#5260) * Update to slash by slot instead of epoch (#5297) * change to slash by slot instead of epoch * gaz * fix test * fix test * fix infinite loop on error parse * Update proposer protection to v0.11 (#5292) * Complete most of changes * Fix other tests * Test progress * Tests * Finish tests * update pbs * Fix mocked tests * Gazelle * pt 2 * Fix * Fixes * Fix tests wit hwrong copying * Implement `SubscribeCommitteeSubnet` method (#5299) * Add client implementation * Update workspace * Update server * Update service * Gaz * Mocks * Fixed validator tests * Add round tirp tests * Fixed subnet test * Comment * Update committee cache * Comment * Update RPC * Fixed test * Nishant's comment * Gaz * Refresh ENR is for epoch * Needs to be append * Validator subscribe subnet to next epoch (#5312) * Alert to subscribe to next epoch * Fixed tests * Comments * Fixed tests * Update validator/client/validator.go Co-authored-by: Ivan Martinez Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Revert "Revert "Remove deprecated parameters (#5249)" (#5276)" (#5277) This reverts commit 47e5a2cf96f5add151bf135a5352c2dad7922615. * Aggregate on demand for v0.11 (#5302) * Add client implementation * Update workspace * Update server * Update service * Gaz * Mocks * Fixed validator tests * Add round tirp tests * Fixed subnet test * Wait 1/3 on validator side * Lint * Comment * Update committee cache * Comment * Update RPC * Fixed test * Nishant's comment * Gaz * Refresh ENR is for epoch * Needs to be append * Fixed duplication * Tests * Skip e2e * Update beacon-chain/rpc/validator/aggregator.go Co-Authored-By: shayzluf * Apply suggestions from code review Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> Co-authored-by: shayzluf Co-authored-by: Raul Jordan * Refactor Dynamic Subscriptions (#5318) * clean up * comment * metrics * fix Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Fix listindexed attestations and detect historic attestations (#5321) * fix list indexed attestations * fix tests * goimports * names * Add check for slot == 0 (#5322) * Change attester protection to return default if DB is empty (#5323) * Change how default values are set * Remove unused imports * Remove wasteful db call * Fix db tests * Fix db test * fix it (#5326) * V0.11 run time fixes to use interop config (#5324) * Started testing * Bunch of fixes * use-interop * Sync with v0.11 * Conflict * Uncomment wait for activation * Move pending block queue from subscriber to validator pipeline * Merge branch 'v0.11' into use-interop-config * passing tests * Merge refs/heads/v0.11 into use-interop-config * Merge refs/heads/v0.11 into use-interop-config * Nil Checks in Process Attestation v0.11 (#5331) * Started testing * Bunch of fixes * use-interop * Sync with v0.11 * Uncomment wait for activation * Move pending block queue from subscriber to validator pipeline * passing tests * nil checks to prevent panics * lint Co-authored-by: terence tsao * Validator batch subscribe subnets (#5332) * Update both beacon node and validator * Comments * Tests * Lint Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Validator smarter subscribe (#5334) * Fix incorrect proposer index calculation (#5336) * Use correct parent state * Fixed test Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * enhance error * enhance error * Update P2P Service to Handle Local Metadata (#5319) * add metadata to ENR * add new methods * glue everything * fix all tests and refs * add tests * add more tests * Apply suggestions from code review * fix method * raul's review * gaz * fix test setup * fix all tests * better naming * fix broken test * validate nil Co-authored-by: rauljordan Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Revert "Revert "Revert "Remove deprecated parameters (#5249)" (#5276)" (#5277)" (#5343) This reverts commit e5aef1686e582fc2077767c42187c8527f3a742f. * Wait for Genesis Event to Start P2P (#5303) * use event feed for state initialized events * add in handler for tests * wait till genesis for p2p * Apply suggestions from code review Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Avoid duplicated aggregation request (#5346) * Avoid duplicated aggregation request * Test and lock * Gaz * Fix Validate For Metadata (#5348) * return true * shay's review Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Multiple Proposer Slots Allowed Per Epoch for Validators (#5344) * allow multiple proposer slots * multi propose * proposer indices to slots map * remove deprecated comm assign * Apply suggestions from code review * resolve broken tests, add logic in validator client * fix val tests Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Networking Fixes (#5349) * close stream later * add ping method * add method * lint * More efficient aggregation on demand (#5354) * Return Nil Error if Pre-Genesis in P2P Service Healthz Check (#5355) * pregenesis healthz check: * optimal * right order * Update beacon-chain/p2p/service.go Co-Authored-By: Preston Van Loon * Update beacon-chain/p2p/service.go Co-Authored-By: Preston Van Loon * no comment Co-authored-by: Preston Van Loon * Release DiscoveryV5 for Testnet Restart (#5357) * release discv5 * fix build * Fix Overflow in Status Check (#5361) * fix overflow * Apply suggestions from code review * fix after merge * Make Mainnet Config Default, No More Demo Config (#5367) * bye bye demo config * gaz * fix usage * fix dep * gaz * Update default balance for sendDeposits Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> Co-authored-by: Preston Van Loon * Use FastSSZ Marshal/Unmarshal for DB Encodings in v0.11.1 (#5351) * try * use marshaler structure for db instead of proto * white list types * attempt * revert * testutil.NewBeaconState() * Fully populate fields for round trip ssz marshal * fix //beacon-chain/db/kv:go_default_test * more passing tests * another test target passed * fixed stategen * blockchain tests green * passing sync * more targets fixed * more test fixes in rpc/validator * most rpc val * validators test fixes * skip round robin old * aggregate test * whitelist done * Update beacon-chain/rpc/validator/attester_test.go * edit baz * Fixed tests * Fixed getblock test * Add back init * reduce test size * fix broken build * tests pass Co-authored-by: Preston Van Loon Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> Co-authored-by: terence tsao * Reconnect slasher streams on beacon node shutdown (#5376) * restart streams on beacon node shutdown * fix comment * remove export * ivan feedback * ivan feedback * case insensitive * Update slasher/beaconclient/receivers.go * raul feedback Co-authored-by: Ivan Martinez Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Amend Faucet to Offer 32.5 ETH for v0.11 (#5378) * deposit amount in faucet * fix eth amount * gas cost * unskip exec transition test * Revert "Enable NOISE Handshake by Default v0.11 (#5272)" (#5381) This reverts commit a8d32d504a8f923cdf7fa9dfc2684f8804fbab92. * use string for deposit flag * Update Bootnode to v0.11 (#5387) * fix bootnode * add changes * gaz * fix docker * build fix * fix flaky test * Unskip E2E for V0.11 (#5386) * Begin work on fixing e2e for v0.11 * Start bootnode work * Begin implementing bootnode into e2e * Fix E2E for v0.11 * Remove extra * gaz * Remove unused key gen code * Remove trailing multiaddr code * add skip for slashing * Fix slashing e2e * Fix docker image build * Update beacon-chain/p2p/broadcaster_test.go * Update GetValidatorParticipation * Update tests * Gaz * Pass E2E Tests for v0.11 and Enable Attestation Subnets By Default (#5407) * Update README.md Co-Authored-By: Preston Van Loon * Apply suggestions from code review Co-Authored-By: Preston Van Loon * Update beacon-chain/p2p/config.go Co-Authored-By: Preston Van Loon * Update shared/keystore/deposit_input.go Co-Authored-By: Preston Van Loon * Update tools/faucet/server.go Co-Authored-By: Preston Van Loon * Update beacon-chain/p2p/service.go Co-Authored-By: Preston Van Loon * Update shared/benchutil/pregen_test.go Co-Authored-By: Preston Van Loon * Update shared/benchutil/pregen_test.go Co-Authored-By: Preston Van Loon * Update proto/beacon/p2p/v1/BUILD.bazel Co-Authored-By: Preston Van Loon * Update shared/benchutil/pregen_test.go Co-Authored-By: Preston Van Loon * Update shared/bls/spectest/aggregate_verify_test.go * Addressed feedback. All test passing * Update beacon-chain/core/blocks/block_operations_fuzz_test.go Co-Authored-By: Ivan Martinez * Update beacon-chain/core/blocks/block_operations_test.go Co-Authored-By: Ivan Martinez * Update shared/testutil/helpers.go Co-Authored-By: Ivan Martinez * Update beacon-chain/core/helpers/signing_root.go Co-Authored-By: Ivan Martinez * Resolve Misc v0.11 Items (Raul) (#5414) * address all comments * set faucet * nishant feedback * Update beacon-chain/p2p/service.go Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Revert keymanager changes (#5416) * Revert "Updates for remote keymanager (#5260)" This reverts commit bbcd895db50ce5e7c0ecb64210471cf56f63b373. * Revert "Remove keystore keymanager from validator (#5236)" This reverts commit 46008770c162e741251e13772fd7356b43a9af87. * Revert "Update eth2 wallet keymanager (#4984)" This reverts commit 7f7ef43f218598a671aaeb327342d7e5130fe8b1. Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Update BLS and limit visibility (#5415) * remove duplicated BLS, add golang.org/x/mod * Update BLS and restrict visibility * fix build * Fix eth1data test and fix order of ops (#5413) * use multiaddr builder (#5419) * Unskip benchutil and minor v0.11 fixes (#5417) * Unskip benchutil tests * Remove protos and gaz * Fixes * Networking Fixes (#5421) * check * fix test * fix size * fix test * more fixes * fix test again * Update ethereum APIs with latest master * Error handling for v0.11 tests (#5428) * Proper err handling for tests * Lint * Fixed rest of the tests * Gaz * Fixed old master tests * Rm old aggregate_test.go Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> Co-authored-by: Raul Jordan Co-authored-by: nisdas Co-authored-by: Jim McDonald Co-authored-by: Preston Van Loon Co-authored-by: Ivan Martinez Co-authored-by: shayzluf --- beacon-chain/rpc/beacon/BUILD.bazel | 1 - beacon-chain/rpc/beacon/validators.go | 114 ++++------ beacon-chain/rpc/beacon/validators_test.go | 234 ++++----------------- 3 files changed, 86 insertions(+), 263 deletions(-) diff --git a/beacon-chain/rpc/beacon/BUILD.bazel b/beacon-chain/rpc/beacon/BUILD.bazel index 255efd72d..884e86fc9 100644 --- a/beacon-chain/rpc/beacon/BUILD.bazel +++ b/beacon-chain/rpc/beacon/BUILD.bazel @@ -75,7 +75,6 @@ go_test( deps = [ "//beacon-chain/blockchain/testing:go_default_library", "//beacon-chain/cache:go_default_library", - "//beacon-chain/core/epoch/precompute:go_default_library", "//beacon-chain/core/feed:go_default_library", "//beacon-chain/core/feed/block:go_default_library", "//beacon-chain/core/feed/operation:go_default_library", diff --git a/beacon-chain/rpc/beacon/validators.go b/beacon-chain/rpc/beacon/validators.go index 1616db8c6..cd41b3a3e 100644 --- a/beacon-chain/rpc/beacon/validators.go +++ b/beacon-chain/rpc/beacon/validators.go @@ -462,81 +462,57 @@ func (bs *Server) GetValidatorActiveSetChanges( func (bs *Server) GetValidatorParticipation( ctx context.Context, req *ethpb.GetValidatorParticipationRequest, ) (*ethpb.ValidatorParticipationResponse, error) { + currentEpoch := helpers.SlotToEpoch(bs.GenesisTimeFetcher.CurrentSlot()) + + var requestedEpoch uint64 + switch q := req.QueryFilter.(type) { + case *ethpb.GetValidatorParticipationRequest_Genesis: + requestedEpoch = 0 + case *ethpb.GetValidatorParticipationRequest_Epoch: + requestedEpoch = q.Epoch + default: + // Prevent underflow and ensure participation is always queried for previous epoch. + if currentEpoch > 1 { + requestedEpoch = currentEpoch - 1 + } + } + + if requestedEpoch >= currentEpoch { + return nil, status.Errorf( + codes.InvalidArgument, + "Cannot retrieve information about an epoch until older than current epoch, current epoch %d, requesting %d", + currentEpoch, + requestedEpoch, + ) + } + + requestedState, err := bs.StateGen.StateBySlot(ctx, helpers.StartSlot(requestedEpoch+1)) + if err != nil { + return nil, status.Error(codes.Internal, "Could not get state") + } + + v, b, err := precompute.New(ctx, requestedState) + if err != nil { + return nil, status.Error(codes.Internal, "Could not set up pre compute instance") + } + _, b, err = precompute.ProcessAttestations(ctx, requestedState, v, b) + if err != nil { + return nil, status.Error(codes.Internal, "Could not pre compute attestations") + } + headState, err := bs.HeadFetcher.HeadState(ctx) if err != nil { return nil, status.Error(codes.Internal, "Could not get head state") } - currentEpoch := helpers.CurrentEpoch(headState) - prevEpoch := helpers.PrevEpoch(headState) - - var requestedEpoch uint64 - var requestingGenesis bool - switch q := req.QueryFilter.(type) { - case *ethpb.GetValidatorParticipationRequest_Genesis: - requestingGenesis = q.Genesis - requestedEpoch = 0 - case *ethpb.GetValidatorParticipationRequest_Epoch: - requestedEpoch = q.Epoch - default: - requestedEpoch = prevEpoch - } - - // If the request is from genesis or another past epoch, we look into our archived - // data to find it and return it if it exists. - if requestingGenesis || requestedEpoch < prevEpoch { - participation, err := bs.BeaconDB.ArchivedValidatorParticipation(ctx, requestedEpoch) - if err != nil { - return nil, status.Errorf(codes.Internal, "Could not fetch archived participation: %v", err) - } - if participation == nil { - return nil, status.Errorf( - codes.NotFound, - "Could not retrieve data for epoch %d, perhaps --archive in the running beacon node is disabled", - 0, - ) - } - return ðpb.ValidatorParticipationResponse{ - Epoch: requestedEpoch, - Finalized: requestedEpoch <= headState.FinalizedCheckpointEpoch(), - Participation: participation, - }, nil - } else if requestedEpoch == currentEpoch { - // We cannot retrieve participation for an epoch currently in progress. - return nil, status.Errorf( - codes.InvalidArgument, - "Cannot retrieve information about an epoch currently in progress, current epoch %d, requesting %d", - currentEpoch, - requestedEpoch, - ) - } else if requestedEpoch > currentEpoch { - // We are requesting data from the future and we return an error. - return nil, status.Errorf( - codes.InvalidArgument, - "Cannot retrieve information about an epoch in the future, current epoch %d, requesting %d", - currentEpoch, - requestedEpoch, - ) - } - - p := bs.ParticipationFetcher.Participation(requestedEpoch) - if p == nil { - p = &precompute.Balance{} - } - participation := ðpb.ValidatorParticipation{ - EligibleEther: p.PrevEpoch, - VotedEther: p.PrevEpochTargetAttesters, - } - participation.GlobalParticipationRate = float32(0) - // only divide if prevEpoch is non zero - if p.PrevEpoch != 0 { - participation.GlobalParticipationRate = float32(p.PrevEpochTargetAttesters) / float32(p.PrevEpoch) - } - return ðpb.ValidatorParticipationResponse{ - Epoch: requestedEpoch, - Finalized: requestedEpoch <= headState.FinalizedCheckpointEpoch(), - Participation: participation, + Epoch: requestedEpoch, + Finalized: requestedEpoch <= headState.FinalizedCheckpointEpoch(), + Participation: ðpb.ValidatorParticipation{ + GlobalParticipationRate: float32(b.PrevEpochTargetAttesters) / float32(b.PrevEpoch), + VotedEther: b.PrevEpochTargetAttesters, + EligibleEther: b.PrevEpoch, + }, }, nil } diff --git a/beacon-chain/rpc/beacon/validators_test.go b/beacon-chain/rpc/beacon/validators_test.go index 98b92a0da..773b47505 100644 --- a/beacon-chain/rpc/beacon/validators_test.go +++ b/beacon-chain/rpc/beacon/validators_test.go @@ -15,12 +15,13 @@ import ( ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1" "github.com/prysmaticlabs/go-ssz" mock "github.com/prysmaticlabs/prysm/beacon-chain/blockchain/testing" - "github.com/prysmaticlabs/prysm/beacon-chain/core/epoch/precompute" + "github.com/prysmaticlabs/prysm/beacon-chain/cache" "github.com/prysmaticlabs/prysm/beacon-chain/core/helpers" "github.com/prysmaticlabs/prysm/beacon-chain/db" dbTest "github.com/prysmaticlabs/prysm/beacon-chain/db/testing" "github.com/prysmaticlabs/prysm/beacon-chain/flags" stateTrie "github.com/prysmaticlabs/prysm/beacon-chain/state" + "github.com/prysmaticlabs/prysm/beacon-chain/state/stategen" pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1" "github.com/prysmaticlabs/prysm/shared/params" "github.com/prysmaticlabs/prysm/shared/testutil" @@ -1546,35 +1547,6 @@ func TestServer_GetValidatorQueue_PendingExit(t *testing.T) { } } -func TestServer_GetValidatorParticipation_CannotRequestCurrentEpoch(t *testing.T) { - db := dbTest.SetupDB(t) - defer dbTest.TeardownDB(t, db) - - ctx := context.Background() - headState := testutil.NewBeaconState() - if err := headState.SetSlot(helpers.StartSlot(2)); err != nil { - t.Fatal(err) - } - bs := &Server{ - BeaconDB: db, - HeadFetcher: &mock.ChainService{ - State: headState, - }, - } - - wanted := "Cannot retrieve information about an epoch currently in progress" - if _, err := bs.GetValidatorParticipation( - ctx, - ðpb.GetValidatorParticipationRequest{ - QueryFilter: ðpb.GetValidatorParticipationRequest_Epoch{ - Epoch: 2, - }, - }, - ); err != nil && !strings.Contains(err.Error(), wanted) { - t.Errorf("Expected error %v, received %v", wanted, err) - } -} - func TestServer_GetValidatorParticipation_CannotRequestFutureEpoch(t *testing.T) { db := dbTest.SetupDB(t) defer dbTest.TeardownDB(t, db) @@ -1589,14 +1561,15 @@ func TestServer_GetValidatorParticipation_CannotRequestFutureEpoch(t *testing.T) HeadFetcher: &mock.ChainService{ State: headState, }, + GenesisTimeFetcher: &mock.ChainService{}, } - wanted := "Cannot retrieve information about an epoch in the future" + wanted := "Cannot retrieve information about an epoch until older than current epoch" if _, err := bs.GetValidatorParticipation( ctx, ðpb.GetValidatorParticipationRequest{ QueryFilter: ðpb.GetValidatorParticipationRequest_Epoch{ - Epoch: 1, + Epoch: helpers.SlotToEpoch(bs.GenesisTimeFetcher.CurrentSlot()) + 1, }, }, ); err != nil && !strings.Contains(err.Error(), wanted) { @@ -1604,122 +1577,11 @@ func TestServer_GetValidatorParticipation_CannotRequestFutureEpoch(t *testing.T) } } -func TestServer_GetValidatorParticipation_FromArchive(t *testing.T) { - db := dbTest.SetupDB(t) - defer dbTest.TeardownDB(t, db) - ctx := context.Background() - epoch := uint64(4) - part := ðpb.ValidatorParticipation{ - GlobalParticipationRate: 1.0, - VotedEther: 20, - EligibleEther: 20, - } - if err := db.SaveArchivedValidatorParticipation(ctx, epoch-2, part); err != nil { - t.Fatal(err) - } - - headState := testutil.NewBeaconState() - if err := headState.SetSlot(helpers.StartSlot(epoch + 1)); err != nil { - t.Fatal(err) - } - if err := headState.SetFinalizedCheckpoint(ðpb.Checkpoint{Epoch: epoch + 1}); err != nil { - t.Fatal(err) - } - bs := &Server{ - BeaconDB: db, - HeadFetcher: &mock.ChainService{ - State: headState, - }, - } - if _, err := bs.GetValidatorParticipation(ctx, ðpb.GetValidatorParticipationRequest{ - QueryFilter: ðpb.GetValidatorParticipationRequest_Epoch{ - Epoch: epoch + 2, - }, - }); err == nil { - t.Error("Expected error when requesting future epoch, received nil") - } - // We request data from epoch 0, which we didn't archive, so we should expect an error. - if _, err := bs.GetValidatorParticipation(ctx, ðpb.GetValidatorParticipationRequest{ - QueryFilter: ðpb.GetValidatorParticipationRequest_Genesis{ - Genesis: true, - }, - }); err == nil { - t.Error("Expected error when data from archive is not found, received nil") - } - - want := ðpb.ValidatorParticipationResponse{ - Epoch: epoch - 2, - Finalized: true, - Participation: part, - } - res, err := bs.GetValidatorParticipation(ctx, ðpb.GetValidatorParticipationRequest{ - QueryFilter: ðpb.GetValidatorParticipationRequest_Epoch{ - Epoch: epoch - 2, - }, - }) - if err != nil { - t.Fatal(err) - } - if !proto.Equal(want, res) { - t.Errorf("Wanted %v, received %v", want, res) - } -} - -func TestServer_GetValidatorParticipation_FromArchive_FinalizedEpoch(t *testing.T) { - db := dbTest.SetupDB(t) - defer dbTest.TeardownDB(t, db) - ctx := context.Background() - part := ðpb.ValidatorParticipation{ - GlobalParticipationRate: 1.0, - VotedEther: 20, - EligibleEther: 20, - } - epoch := uint64(1) - // We archive data for epoch 1. - if err := db.SaveArchivedValidatorParticipation(ctx, epoch, part); err != nil { - t.Fatal(err) - } - headState := testutil.NewBeaconState() - if err := headState.SetSlot(helpers.StartSlot(epoch + 10)); err != nil { - t.Fatal(err) - } - if err := headState.SetFinalizedCheckpoint(ðpb.Checkpoint{Epoch: epoch + 5}); err != nil { - t.Fatal(err) - } - - bs := &Server{ - BeaconDB: db, - HeadFetcher: &mock.ChainService{ - // 10 epochs into the future. - State: headState, - }, - } - want := ðpb.ValidatorParticipationResponse{ - Epoch: epoch, - Finalized: true, - Participation: part, - } - // We request epoch 1. - res, err := bs.GetValidatorParticipation(ctx, ðpb.GetValidatorParticipationRequest{ - QueryFilter: ðpb.GetValidatorParticipationRequest_Epoch{ - Epoch: epoch, - }, - }) - if err != nil { - t.Fatal(err) - } - if !proto.Equal(want, res) { - t.Errorf("Wanted %v, received %v", want, res) - } -} - func TestServer_GetValidatorParticipation_PrevEpoch(t *testing.T) { db := dbTest.SetupDB(t) defer dbTest.TeardownDB(t, db) ctx := context.Background() - epoch := uint64(1) - attestedBalance := uint64(1) validatorCount := uint64(100) validators := make([]*ethpb.Validator, validatorCount) @@ -1734,7 +1596,7 @@ func TestServer_GetValidatorParticipation_PrevEpoch(t *testing.T) { atts := []*pbp2p.PendingAttestation{{Data: ðpb.AttestationData{Target: ðpb.Checkpoint{}}}} headState := testutil.NewBeaconState() - if err := headState.SetSlot(epoch*params.BeaconConfig().SlotsPerEpoch + 1); err != nil { + if err := headState.SetSlot(params.BeaconConfig().SlotsPerEpoch); err != nil { t.Fatal(err) } if err := headState.SetValidators(validators); err != nil { @@ -1743,34 +1605,37 @@ func TestServer_GetValidatorParticipation_PrevEpoch(t *testing.T) { if err := headState.SetBalances(balances); err != nil { t.Fatal(err) } - if err := headState.SetCurrentEpochAttestations(atts); err != nil { + if err := headState.SetPreviousEpochAttestations(atts); err != nil { t.Fatal(err) } - m := &mock.ChainService{ - State: headState, - Balance: &precompute.Balance{ - PrevEpoch: validatorCount * params.BeaconConfig().MaxEffectiveBalance, - PrevEpochTargetAttesters: attestedBalance, - }, + b := ðpb.SignedBeaconBlock{Block: ðpb.BeaconBlock{Slot: params.BeaconConfig().SlotsPerEpoch}} + if err := db.SaveBlock(ctx, b); err != nil { + t.Fatal(err) } + bRoot, err := ssz.HashTreeRoot(b.Block) + if err != nil { + t.Fatal(err) + } + if err := db.SaveState(ctx, headState, bRoot); err != nil { + t.Fatal(err) + } + + m := &mock.ChainService{State: headState} bs := &Server{ BeaconDB: db, HeadFetcher: m, ParticipationFetcher: m, + GenesisTimeFetcher: &mock.ChainService{}, + StateGen: stategen.New(db, cache.NewStateSummaryCache()), } - res, err := bs.GetValidatorParticipation(ctx, ðpb.GetValidatorParticipationRequest{}) + res, err := bs.GetValidatorParticipation(ctx, ðpb.GetValidatorParticipationRequest{QueryFilter: ðpb.GetValidatorParticipationRequest_Epoch{Epoch: 0}}) if err != nil { t.Fatal(err) } - wanted := ðpb.ValidatorParticipation{ - VotedEther: attestedBalance, - EligibleEther: validatorCount * params.BeaconConfig().MaxEffectiveBalance, - GlobalParticipationRate: float32(attestedBalance) / float32(validatorCount*params.BeaconConfig().MaxEffectiveBalance), - } - + wanted := ðpb.ValidatorParticipation{EligibleEther: validatorCount * params.BeaconConfig().MaxEffectiveBalance} if !reflect.DeepEqual(res.Participation, wanted) { t.Error("Incorrect validator participation respond") } @@ -1779,58 +1644,41 @@ func TestServer_GetValidatorParticipation_PrevEpoch(t *testing.T) { func TestServer_GetValidatorParticipation_DoesntExist(t *testing.T) { db := dbTest.SetupDB(t) defer dbTest.TeardownDB(t, db) - ctx := context.Background() - epoch := uint64(1) - validatorCount := uint64(100) - validators := make([]*ethpb.Validator, validatorCount) - balances := make([]uint64, validatorCount) - for i := 0; i < len(validators); i++ { - validators[i] = ðpb.Validator{ - ExitEpoch: params.BeaconConfig().FarFutureEpoch, - EffectiveBalance: params.BeaconConfig().MaxEffectiveBalance, - } - balances[i] = params.BeaconConfig().MaxEffectiveBalance - } - - atts := []*pbp2p.PendingAttestation{{Data: ðpb.AttestationData{Target: ðpb.Checkpoint{}}}} headState := testutil.NewBeaconState() - if err := headState.SetSlot(epoch*params.BeaconConfig().SlotsPerEpoch + 1); err != nil { - t.Fatal(err) - } - if err := headState.SetValidators(validators); err != nil { - t.Fatal(err) - } - if err := headState.SetBalances(balances); err != nil { - t.Fatal(err) - } - if err := headState.SetCurrentEpochAttestations(atts); err != nil { + if err := headState.SetSlot(params.BeaconConfig().SlotsPerEpoch); err != nil { t.Fatal(err) } - m := &mock.ChainService{ - State: headState, + b := ðpb.SignedBeaconBlock{Block: ðpb.BeaconBlock{Slot: params.BeaconConfig().SlotsPerEpoch}} + if err := db.SaveBlock(ctx, b); err != nil { + t.Fatal(err) } + bRoot, err := ssz.HashTreeRoot(b.Block) + if err != nil { + t.Fatal(err) + } + if err := db.SaveState(ctx, headState, bRoot); err != nil { + t.Fatal(err) + } + + m := &mock.ChainService{State: headState} bs := &Server{ BeaconDB: db, HeadFetcher: m, ParticipationFetcher: m, + GenesisTimeFetcher: &mock.ChainService{}, + StateGen: stategen.New(db, cache.NewStateSummaryCache()), } - res, err := bs.GetValidatorParticipation(ctx, ðpb.GetValidatorParticipationRequest{}) + res, err := bs.GetValidatorParticipation(ctx, ðpb.GetValidatorParticipationRequest{QueryFilter: ðpb.GetValidatorParticipationRequest_Epoch{Epoch: 0}}) if err != nil { t.Fatal(err) } - wanted := ðpb.ValidatorParticipation{ - GlobalParticipationRate: 0, - VotedEther: 0, - EligibleEther: 0, - } - - if !reflect.DeepEqual(res.Participation, wanted) { - t.Errorf("Incorrect validator participation response, got %s", res.Participation.String()) + if res.Participation.VotedEther != 0 || res.Participation.EligibleEther != 0 { + t.Error("Incorrect validator participation response") } }