From 5eb6485e14bf52db72bb374ebced93c798c667dd Mon Sep 17 00:00:00 2001 From: terence tsao Date: Wed, 15 Apr 2020 10:27:35 -0700 Subject: [PATCH] Modify `GetValidatorActiveSetChanges` to use new state service (#5408) * Fix import and not use * Update workspace for new spec test * Fix workspace * Merge refs/heads/master into v0.10.1 * Update workspace with new ethapi commit * Unblock a few tests * Merge refs/heads/master into v0.10.1 * fixed block op test * gaz * Merge refs/heads/master into v0.10.1 * 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 * Merge refs/heads/master into v0.10.1 * Fixed all core tests * Fixed all the sync tests * Fixed all the rpc tests * Merge refs/heads/master into v0.10.1 * Merge refs/heads/master into v0.10.1 * Fixed conflict * Fixed conflict * Conflict fix * visibility * Fixed validator tests * Fixing test util * Fixed rest of non spec tests * Fixed a bug proposer index wasn't included * gaz * Merge branch 'v0.11' of github.com:prysmaticlabs/prysm into v0.11 * 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 * Merge branch 'v0.11' of github.com:prysmaticlabs/prysm into v0.11 * Skip e2e tests * Merge branch 'v0.11' of github.com:prysmaticlabs/prysm into v0.11 * Align aggregator action with v0.11 (#5146) * Remove Head Root from Beacon Block by Range Request (#5165) * make proto changes * remove head root * Merge branch 'master' of https://github.com/prysmaticlabs/geth-sharding into v0.11 * add back herumi's library * Update ethapi in workspace, started fixing test. Hand off to Nishant * fix build * All tests passing * Align finalized slot check with v0.11 (#5166) * Merge branch 'master' into v0.11 * 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 * Merge branch 'v0.11' of github.com:prysmaticlabs/prysm into v0.11 * 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> * Sync with master * 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) * Merge branch 'v0.11' of github.com:prysmaticlabs/prysm into v0.11 * 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 * resolve conflicts * fix broken broadcast test * fix tests * include protocol suffix * fix confs * lint * fix test * Merge branch 'v0.11' of github.com:prysmaticlabs/prysm into v0.11 * Merge branch 'master' of github.com:prysmaticlabs/prysm into v0.11 * resolve broken slasher test' * Merge branch 'v0.11' of github.com:prysmaticlabs/prysm into v0.11 * Merge branch 'master' into v0.11 * 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 * Merge branch 'master' into v0.11 * release resources correctly (#5287) * Merge refs/heads/master into v0.11 * 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 * Merge refs/heads/master into v0.11 * 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 * Merge branch 'master' into v0.11 * resolve flakeyness * Merge refs/heads/master into v0.11 * Merge refs/heads/master into v0.11 * 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 * Merge branch 'master' of https://github.com/prysmaticlabs/geth-sharding into v0.11 * 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 * Merge branch 'master' of https://github.com/prysmaticlabs/geth-sharding into v0.11 * Updates for remote keymanager (#5260) * Merge branch 'spec-v0.11' of github.com:prysmaticlabs/prysm into v0.11 * Merge remote-tracking branch 'origin' into v0.11 * 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 * Sync with master * Merge branch 'v0.11' of github.com:prysmaticlabs/prysm into v0.11 * 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 * Merge refs/heads/master into v0.11 * Merge refs/heads/master into v0.11 * 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 * Merge refs/heads/master into v0.11 * resolve confs * 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> * Merge refs/heads/master into v0.11 * 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 * Merge refs/heads/master into v0.11 * 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 * Merge refs/heads/master into v0.11 * Merge refs/heads/master into v0.11 * Merge refs/heads/master into v0.11 * 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> * Merge branch 'v0.11' of github.com:prysmaticlabs/prysm into v0.11 * 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> * Merge refs/heads/master into v0.11 * 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 * Merge branch 'master' of github.com:prysmaticlabs/prysm into v0.11 * fix after merge * Merge refs/heads/master into v0.11 * 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> * Merge branch 'master' into v0.11 * Merge refs/heads/master into v0.11 * 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. * Merge refs/heads/master into v0.11 * use string for deposit flag * Update Bootnode to v0.11 (#5387) * fix bootnode * add changes * gaz * fix docker * Merge branch 'master' of github.com:prysmaticlabs/prysm into v0.11 * build fix * fix flaky test * Merge refs/heads/master into v0.11 * 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 * Merge branch 'master' of https://github.com/prysmaticlabs/prysm into v0.11 * Merge refs/heads/master into v0.11 * Merge branch 'master' of github.com:prysmaticlabs/prysm into v0.11 * Update beacon-chain/p2p/broadcaster_test.go * Merge refs/heads/master into v0.11 * Update GetValidatorActiveSetChanges * Fixed tests * Pass E2E Tests for v0.11 and Enable Attestation Subnets By Default (#5407) * Merge refs/heads/v0.11 into fix-active-set-changes * Update README.md Co-Authored-By: Preston Van Loon * Merge refs/heads/v0.11 into fix-active-set-changes * Apply suggestions from code review Co-Authored-By: Preston Van Loon * Merge refs/heads/v0.11 into fix-active-set-changes * Update beacon-chain/p2p/config.go Co-Authored-By: Preston Van Loon * Merge refs/heads/v0.11 into fix-active-set-changes * Update shared/keystore/deposit_input.go Co-Authored-By: Preston Van Loon * Merge refs/heads/v0.11 into fix-active-set-changes * Update tools/faucet/server.go Co-Authored-By: Preston Van Loon * Merge refs/heads/v0.11 into fix-active-set-changes * Update beacon-chain/p2p/service.go Co-Authored-By: Preston Van Loon * Merge refs/heads/v0.11 into fix-active-set-changes * Update shared/benchutil/pregen_test.go Co-Authored-By: Preston Van Loon * Merge refs/heads/v0.11 into fix-active-set-changes * Update shared/benchutil/pregen_test.go Co-Authored-By: Preston Van Loon * Merge refs/heads/v0.11 into fix-active-set-changes * Update proto/beacon/p2p/v1/BUILD.bazel Co-Authored-By: Preston Van Loon * Merge refs/heads/v0.11 into fix-active-set-changes * Update shared/benchutil/pregen_test.go Co-Authored-By: Preston Van Loon * Merge refs/heads/v0.11 into fix-active-set-changes * Update shared/bls/spectest/aggregate_verify_test.go * Merge refs/heads/v0.11 into fix-active-set-changes * Addressed feedback. All test passing * Merge branch 'v0.11' of github.com:prysmaticlabs/prysm into v0.11 * Merge refs/heads/v0.11 into fix-active-set-changes * Update beacon-chain/core/blocks/block_operations_fuzz_test.go Co-Authored-By: Ivan Martinez * Merge refs/heads/v0.11 into fix-active-set-changes * Update beacon-chain/core/blocks/block_operations_test.go Co-Authored-By: Ivan Martinez * Merge refs/heads/v0.11 into fix-active-set-changes * Update shared/testutil/helpers.go Co-Authored-By: Ivan Martinez * Merge refs/heads/v0.11 into fix-active-set-changes * Update beacon-chain/core/helpers/signing_root.go Co-Authored-By: Ivan Martinez * Merge refs/heads/v0.11 into fix-active-set-changes * 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> * Merge refs/heads/v0.11 into fix-active-set-changes * 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> * Merge refs/heads/v0.11 into fix-active-set-changes * Update BLS and limit visibility (#5415) * remove duplicated BLS, add golang.org/x/mod * Update BLS and restrict visibility * fix build * Merge refs/heads/v0.11 into fix-active-set-changes * Fix eth1data test and fix order of ops (#5413) * Merge refs/heads/v0.11 into fix-active-set-changes * use multiaddr builder (#5419) * Merge refs/heads/v0.11 into fix-active-set-changes * Unskip benchutil and minor v0.11 fixes (#5417) * Unskip benchutil tests * Remove protos and gaz * Fixes * Merge refs/heads/v0.11 into fix-active-set-changes * Networking Fixes (#5421) * check * fix test * fix size * fix test * more fixes * fix test again * Merge refs/heads/v0.11 into fix-active-set-changes * Update ethereum APIs with latest master * Merge refs/heads/v0.11 into fix-active-set-changes * Error handling for v0.11 tests (#5428) * Proper err handling for tests * Lint * Fixed rest of the tests * Gaz * Fixed old master tests * Sync with master * Rm old aggregate_test.go * Sync with v0.11 * Sync with master * Merge refs/heads/master into fix-active-set-changes * Merge refs/heads/master into fix-active-set-changes * Merge refs/heads/master into fix-active-set-changes * Merge refs/heads/master into fix-active-set-changes * Merge refs/heads/master into fix-active-set-changes * Merge branch 'master' into fix-active-set-changes * Gaz * Merge refs/heads/master into fix-active-set-changes * Fixed test * Merge branch 'fix-active-set-changes' of github.com:prysmaticlabs/prysm into fix-active-set-changes * Merge refs/heads/master into fix-active-set-changes --- beacon-chain/rpc/beacon/validators.go | 88 +++++------- beacon-chain/rpc/beacon/validators_test.go | 149 ++++----------------- 2 files changed, 59 insertions(+), 178 deletions(-) diff --git a/beacon-chain/rpc/beacon/validators.go b/beacon-chain/rpc/beacon/validators.go index cd41b3a3eb6..1c28f2b933e 100644 --- a/beacon-chain/rpc/beacon/validators.go +++ b/beacon-chain/rpc/beacon/validators.go @@ -360,60 +360,18 @@ func (bs *Server) GetValidator( func (bs *Server) GetValidatorActiveSetChanges( ctx context.Context, req *ethpb.GetValidatorActiveSetChangesRequest, ) (*ethpb.ActiveSetChanges, error) { - headState, err := bs.HeadFetcher.HeadState(ctx) - if err != nil { - return nil, status.Error(codes.Internal, "Could not get head state") - } - currentEpoch := helpers.CurrentEpoch(headState) - requestedEpoch := currentEpoch - requestingGenesis := false + currentEpoch := helpers.SlotToEpoch(bs.GenesisTimeFetcher.CurrentSlot()) + var requestedEpoch uint64 switch q := req.QueryFilter.(type) { case *ethpb.GetValidatorActiveSetChangesRequest_Genesis: - requestingGenesis = q.Genesis requestedEpoch = 0 case *ethpb.GetValidatorActiveSetChangesRequest_Epoch: requestedEpoch = q.Epoch + default: + requestedEpoch = currentEpoch } - - activatedIndices := make([]uint64, 0) - exitedIndices := make([]uint64, 0) - slashedIndices := make([]uint64, 0) - ejectedIndices := make([]uint64, 0) - if requestingGenesis || requestedEpoch < currentEpoch { - archivedChanges, err := bs.BeaconDB.ArchivedActiveValidatorChanges(ctx, requestedEpoch) - if err != nil { - return nil, status.Errorf(codes.Internal, "Could not fetch archived active validator changes: %v", err) - } - if archivedChanges == nil { - return nil, status.Errorf( - codes.NotFound, - "Did not find any data for epoch %d - perhaps no active set changed occurred during the epoch", - requestedEpoch, - ) - } - activatedIndices = archivedChanges.Activated - exitedIndices = archivedChanges.Exited - slashedIndices = archivedChanges.Slashed - ejectedIndices = archivedChanges.Ejected - } else if requestedEpoch == currentEpoch { - activeValidatorCount, err := helpers.ActiveValidatorCount(headState, helpers.PrevEpoch(headState)) - if err != nil { - return nil, status.Errorf(codes.Internal, "Could not get active validator count: %v", err) - } - vals := headState.Validators() - activatedIndices = validators.ActivatedValidatorIndices(helpers.PrevEpoch(headState), vals) - exitedIndices, err = validators.ExitedValidatorIndices(helpers.PrevEpoch(headState), vals, activeValidatorCount) - if err != nil { - return nil, status.Errorf(codes.Internal, "Could not determine exited validator indices: %v", err) - } - slashedIndices = validators.SlashedValidatorIndices(helpers.PrevEpoch(headState), vals) - ejectedIndices, err = validators.EjectedValidatorIndices(helpers.PrevEpoch(headState), vals, activeValidatorCount) - if err != nil { - return nil, status.Errorf(codes.Internal, "Could not determine ejected validator indices: %v", err) - } - } else { - // We are requesting data from the future and we return an error. + if requestedEpoch > currentEpoch { return nil, status.Errorf( codes.InvalidArgument, "Cannot retrieve information about an epoch in the future, current epoch %d, requesting %d", @@ -422,25 +380,51 @@ func (bs *Server) GetValidatorActiveSetChanges( ) } - // We retrieve the public keys for the indices. + activatedIndices := make([]uint64, 0) + exitedIndices := make([]uint64, 0) + slashedIndices := make([]uint64, 0) + ejectedIndices := make([]uint64, 0) + + requestedState, err := bs.StateGen.StateBySlot(ctx, helpers.StartSlot(requestedEpoch)) + if err != nil { + return nil, status.Errorf(codes.Internal, "Could not get state: %v", err) + } + + activeValidatorCount, err := helpers.ActiveValidatorCount(requestedState, helpers.CurrentEpoch(requestedState)) + if err != nil { + return nil, status.Errorf(codes.Internal, "Could not get active validator count: %v", err) + } + vs := requestedState.Validators() + activatedIndices = validators.ActivatedValidatorIndices(helpers.CurrentEpoch(requestedState), vs) + exitedIndices, err = validators.ExitedValidatorIndices(helpers.CurrentEpoch(requestedState), vs, activeValidatorCount) + if err != nil { + return nil, status.Errorf(codes.Internal, "Could not determine exited validator indices: %v", err) + } + slashedIndices = validators.SlashedValidatorIndices(helpers.CurrentEpoch(requestedState), vs) + ejectedIndices, err = validators.EjectedValidatorIndices(helpers.CurrentEpoch(requestedState), vs, activeValidatorCount) + if err != nil { + return nil, status.Errorf(codes.Internal, "Could not determine ejected validator indices: %v", err) + } + + // Retrieve public keys for the indices. activatedKeys := make([][]byte, len(activatedIndices)) exitedKeys := make([][]byte, len(exitedIndices)) slashedKeys := make([][]byte, len(slashedIndices)) ejectedKeys := make([][]byte, len(ejectedIndices)) for i, idx := range activatedIndices { - pubkey := headState.PubkeyAtIndex(idx) + pubkey := requestedState.PubkeyAtIndex(idx) activatedKeys[i] = pubkey[:] } for i, idx := range exitedIndices { - pubkey := headState.PubkeyAtIndex(idx) + pubkey := requestedState.PubkeyAtIndex(idx) exitedKeys[i] = pubkey[:] } for i, idx := range slashedIndices { - pubkey := headState.PubkeyAtIndex(idx) + pubkey := requestedState.PubkeyAtIndex(idx) slashedKeys[i] = pubkey[:] } for i, idx := range ejectedIndices { - pubkey := headState.PubkeyAtIndex(idx) + pubkey := requestedState.PubkeyAtIndex(idx) ejectedKeys[i] = pubkey[:] } return ðpb.ActiveSetChanges{ diff --git a/beacon-chain/rpc/beacon/validators_test.go b/beacon-chain/rpc/beacon/validators_test.go index 773b475057f..0fd3834439b 100644 --- a/beacon-chain/rpc/beacon/validators_test.go +++ b/beacon-chain/rpc/beacon/validators_test.go @@ -1123,27 +1123,19 @@ func TestServer_GetValidator(t *testing.T) { } func TestServer_GetValidatorActiveSetChanges_CannotRequestFutureEpoch(t *testing.T) { - db := dbTest.SetupDB(t) - defer dbTest.TeardownDB(t, db) - ctx := context.Background() st := testutil.NewBeaconState() if err := st.SetSlot(0); err != nil { t.Fatal(err) } - bs := &Server{ - BeaconDB: db, - HeadFetcher: &mock.ChainService{ - State: st, - }, - } + bs := &Server{GenesisTimeFetcher: &mock.ChainService{}} wanted := "Cannot retrieve information about an epoch in the future" if _, err := bs.GetValidatorActiveSetChanges( ctx, ðpb.GetValidatorActiveSetChangesRequest{ QueryFilter: ðpb.GetValidatorActiveSetChangesRequest_Epoch{ - Epoch: 1, + Epoch: helpers.SlotToEpoch(bs.GenesisTimeFetcher.CurrentSlot()) + 1, }, }, ); err != nil && !strings.Contains(err.Error(), wanted) { @@ -1152,6 +1144,9 @@ func TestServer_GetValidatorActiveSetChanges_CannotRequestFutureEpoch(t *testing } func TestServer_GetValidatorActiveSetChanges(t *testing.T) { + db := dbTest.SetupDB(t) + defer dbTest.TeardownDB(t, db) + ctx := context.Background() validators := make([]*ethpb.Validator, 8) headState := testutil.NewBeaconState() @@ -1196,110 +1191,28 @@ func TestServer_GetValidatorActiveSetChanges(t *testing.T) { t.Fatal(err) } } - bs := &Server{ - HeadFetcher: &mock.ChainService{ - State: headState, - }, - FinalizationFetcher: &mock.ChainService{ - FinalizedCheckPoint: ðpb.Checkpoint{Epoch: 0}, - }, - } - res, err := bs.GetValidatorActiveSetChanges(ctx, ðpb.GetValidatorActiveSetChangesRequest{}) - if err != nil { + b := ðpb.SignedBeaconBlock{Block: ðpb.BeaconBlock{}} + if err := db.SaveBlock(ctx, b); err != nil { t.Fatal(err) } - wantedActive := [][]byte{ - pubKey(0), - pubKey(2), - pubKey(4), - pubKey(6), - } - wantedActiveIndices := []uint64{0, 2, 4, 6} - wantedExited := [][]byte{ - pubKey(5), - } - wantedExitedIndices := []uint64{5} - wantedSlashed := [][]byte{ - pubKey(3), - } - wantedSlashedIndices := []uint64{3} - wantedEjected := [][]byte{ - pubKey(7), - } - wantedEjectedIndices := []uint64{7} - wanted := ðpb.ActiveSetChanges{ - Epoch: 0, - ActivatedPublicKeys: wantedActive, - ActivatedIndices: wantedActiveIndices, - ExitedPublicKeys: wantedExited, - ExitedIndices: wantedExitedIndices, - SlashedPublicKeys: wantedSlashed, - SlashedIndices: wantedSlashedIndices, - EjectedPublicKeys: wantedEjected, - EjectedIndices: wantedEjectedIndices, - } - if !proto.Equal(wanted, res) { - t.Errorf("Wanted \n%v, received \n%v", wanted, res) - } -} -func TestServer_GetValidatorActiveSetChanges_FromArchive(t *testing.T) { - db := dbTest.SetupDB(t) - defer dbTest.TeardownDB(t, db) - ctx := context.Background() - validators := make([]*ethpb.Validator, 8) - headState := testutil.NewBeaconState() - if err := headState.SetSlot(helpers.StartSlot(100)); err != nil { - t.Fatal(err) - } - if err := headState.SetValidators(validators); err != nil { + gRoot, err := ssz.HashTreeRoot(b.Block) + if err != nil { t.Fatal(err) } - activatedIndices := make([]uint64, 0) - exitedIndices := make([]uint64, 0) - slashedIndices := make([]uint64, 0) - ejectedIndices := make([]uint64, 0) - for i := 0; i < len(validators); i++ { - // Mark indices divisible by two as activated. - if i%2 == 0 { - activatedIndices = append(activatedIndices, uint64(i)) - } else if i%3 == 0 { - // Mark indices divisible by 3 as slashed. - slashedIndices = append(slashedIndices, uint64(i)) - } else if i%5 == 0 { - // Mark indices divisible by 5 as exited. - exitedIndices = append(exitedIndices, uint64(i)) - } else if i%7 == 0 { - // Mark indices divisible by 7 as ejected. - ejectedIndices = append(ejectedIndices, uint64(i)) - } - key := make([]byte, 48) - copy(key, strconv.Itoa(i)) - if err := headState.UpdateValidatorAtIndex(uint64(i), ðpb.Validator{ - PublicKey: key, - }); err != nil { - t.Fatal(err) - } - } - archivedChanges := &pbp2p.ArchivedActiveSetChanges{ - Activated: activatedIndices, - Exited: exitedIndices, - Slashed: slashedIndices, - Ejected: ejectedIndices, - } - // We store the changes during the genesis epoch. - if err := db.SaveArchivedActiveValidatorChanges(ctx, 0, archivedChanges); err != nil { + if err := db.SaveGenesisBlockRoot(ctx, gRoot); err != nil { t.Fatal(err) } - // We store the same changes during epoch 5 for further testing. - if err := db.SaveArchivedActiveValidatorChanges(ctx, 5, archivedChanges); err != nil { + if err := db.SaveState(ctx, headState, gRoot); err != nil { t.Fatal(err) } + bs := &Server{ - BeaconDB: db, - HeadFetcher: &mock.ChainService{ - State: headState, + FinalizationFetcher: &mock.ChainService{ + FinalizedCheckPoint: ðpb.Checkpoint{Epoch: 0}, }, + GenesisTimeFetcher: &mock.ChainService{}, + StateGen: stategen.New(db, cache.NewStateSummaryCache()), } res, err := bs.GetValidatorActiveSetChanges(ctx, ðpb.GetValidatorActiveSetChangesRequest{ QueryFilter: ðpb.GetValidatorActiveSetChangesRequest_Genesis{Genesis: true}, @@ -1307,29 +1220,23 @@ func TestServer_GetValidatorActiveSetChanges_FromArchive(t *testing.T) { if err != nil { t.Fatal(err) } - wantedKeys := make([][]byte, 8) - for i := 0; i < len(wantedKeys); i++ { - k := make([]byte, 48) - copy(k, strconv.Itoa(i)) - wantedKeys[i] = k - } wantedActive := [][]byte{ - wantedKeys[0], - wantedKeys[2], - wantedKeys[4], - wantedKeys[6], + pubKey(0), + pubKey(2), + pubKey(4), + pubKey(6), } wantedActiveIndices := []uint64{0, 2, 4, 6} wantedExited := [][]byte{ - wantedKeys[5], + pubKey(5), } wantedExitedIndices := []uint64{5} wantedSlashed := [][]byte{ - wantedKeys[3], + pubKey(3), } wantedSlashedIndices := []uint64{3} wantedEjected := [][]byte{ - wantedKeys[7], + pubKey(7), } wantedEjectedIndices := []uint64{7} wanted := ðpb.ActiveSetChanges{ @@ -1346,16 +1253,6 @@ func TestServer_GetValidatorActiveSetChanges_FromArchive(t *testing.T) { if !proto.Equal(wanted, res) { t.Errorf("Wanted \n%v, received \n%v", wanted, res) } - res, err = bs.GetValidatorActiveSetChanges(ctx, ðpb.GetValidatorActiveSetChangesRequest{ - QueryFilter: ðpb.GetValidatorActiveSetChangesRequest_Epoch{Epoch: 5}, - }) - if err != nil { - t.Fatal(err) - } - wanted.Epoch = 5 - if !proto.Equal(wanted, res) { - t.Errorf("Wanted \n%v, received \n%v", wanted, res) - } } func TestServer_GetValidatorQueue_PendingActivation(t *testing.T) {