mirror of
https://github.com/OffchainLabs/prysm.git
synced 2026-01-09 13:28:01 -05:00
* Merge refs/heads/master into v0.10.1 * Merge refs/heads/master into v0.10.1 * Merge refs/heads/master into v0.10.1 * Merge refs/heads/master into v0.10.1 * Merge refs/heads/master into v0.10.1 * Merge refs/heads/master into v0.10.1 * Merge refs/heads/master into v0.10.1 * Merge refs/heads/master into v0.10.1 * Merge refs/heads/master into v0.10.1 * Merge refs/heads/master into v0.10.1 * Merge refs/heads/master into v0.10.1 * Merge refs/heads/master into v0.10.1 * Merge refs/heads/master into v0.10.1 * Merge refs/heads/master into v0.10.1 * Merge refs/heads/master into v0.10.1 * Merge refs/heads/master into v0.10.1 * add in new patch and workspace * update cloners * Handle rewards overflow (#5122) * Refactoring of initial sync (#5096) * implements blocks queue * refactors updateCounter method * fixes deadlock on stop w/o start * refactors updateSchedulerState * more tests on schduler * parseFetchResponse tests * wraps up tests for blocks queue * eod commit * fixes data race in round robin * revamps fetcher * fixes race conditions + livelocks + deadlocks * less verbose output * fixes data race, by isolating critical sections * minor refactoring: resolves blocking calls * implements init-sync queue * udpate fetch/send buffers in blocks fetcher * blockState enum-like type alias * refactors common code into releaseTicket() * better gc * linter * minor fix to round robin * moves original round robin into its own package * adds enableInitSyncQueue flag * fixes issue with init-sync service selection * Update beacon-chain/sync/initial-sync/round_robin.go Co-Authored-By: terence tsao <terence@prysmaticlabs.com> * initsyncv1 -> initsyncold * adds span Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> Co-authored-by: Raul Jordan <raul@prysmaticlabs.com> Co-authored-by: terence tsao <terence@prysmaticlabs.com> * Handle rewards overflow * Revert "Refactoring of initial sync (#5096)" This reverts commit3ec2a0f9e0. Co-authored-by: Victor Farazdagi <simple.square@gmail.com> Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> Co-authored-by: Raul Jordan <raul@prysmaticlabs.com> * updated block operations * updated validator client * Merge refs/heads/master into v0.10.1 * updated block operations test * skip benchmark test * updated transition test * updated db kv tests * updated ops tests * updated ops tests * updated slashing tests * updated rpc tests * updated state utils * updated test utils and miscs * Temp skips minimal spec tests * Fixed proposer slashing test * Gaz * Skip 2 more minimal tests * Skip 2 more minimal tests * Update readme * gaz * Conflict * 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 <preston@prysmaticlabs.com> * 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 <raul@prysmaticlabs.com> * 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 <nishdas93@gmail.com> 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@prysmaticlabs.com> * 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 <terence@prysmaticlabs.com> Co-authored-by: Raul Jordan <raul@prysmaticlabs.com> * 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 <ivanthegreatdev@gmail.com> * 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 commitdf9a534826. Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Revert "Remove deprecated parameters (#5249)" (#5276) This reverts commit7d17c9ac34. * 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 <terence@prysmaticlabs.com> 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 <nishdas93@gmail.com> * 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 <terence@prysmaticlabs.com> * 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 <ivanthegreatdev@gmail.com> * no more named args Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> Co-authored-by: Raul Jordan <raul@prysmaticlabs.com> Co-authored-by: terence tsao <terence@prysmaticlabs.com> Co-authored-by: Ivan Martinez <ivanthegreatdev@gmail.com> * 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 <terence@prysmaticlabs.com> * 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 <ivanthegreatdev@gmail.com> Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> * Revert "Revert "Remove deprecated parameters (#5249)" (#5276)" (#5277) This reverts commit47e5a2cf96. * 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 <thezluf@gmail.com> * Apply suggestions from code review Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> Co-authored-by: shayzluf <thezluf@gmail.com> Co-authored-by: Raul Jordan <raul@prysmaticlabs.com> * 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 <terence@prysmaticlabs.com> * 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 <raul@prysmaticlabs.com> 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 commite5aef1686e. * 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 <preston@prysmaticlabs.com> * Update beacon-chain/p2p/service.go Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com> * no comment Co-authored-by: Preston Van Loon <preston@prysmaticlabs.com> * 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 <preston@prysmaticlabs.com> * 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 <preston@prysmaticlabs.com> Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com> Co-authored-by: terence tsao <terence@prysmaticlabs.com> * 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 <ivanthegreatdev@gmail.com> 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 commita8d32d504a. * 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 * Pass E2E Tests for v0.11 and Enable Attestation Subnets By Default (#5407) * Update README.md Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com> * Apply suggestions from code review Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com> * Update beacon-chain/p2p/config.go Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com> * Update shared/keystore/deposit_input.go Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com> * Update tools/faucet/server.go Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com> * Update beacon-chain/p2p/service.go Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com> * Update shared/benchutil/pregen_test.go Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com> * Update shared/benchutil/pregen_test.go Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com> * Update proto/beacon/p2p/v1/BUILD.bazel Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com> * Update shared/benchutil/pregen_test.go Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com> * Update shared/bls/spectest/aggregate_verify_test.go * Addressed feedback. All test passing * Merge branch 'v0.11' of github.com:prysmaticlabs/prysm into v0.11 * Update beacon-chain/core/blocks/block_operations_fuzz_test.go Co-Authored-By: Ivan Martinez <ivanthegreatdev@gmail.com> * Update beacon-chain/core/blocks/block_operations_test.go Co-Authored-By: Ivan Martinez <ivanthegreatdev@gmail.com> * Update shared/testutil/helpers.go Co-Authored-By: Ivan Martinez <ivanthegreatdev@gmail.com> * Update beacon-chain/core/helpers/signing_root.go Co-Authored-By: Ivan Martinez <ivanthegreatdev@gmail.com> * 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 commitbbcd895db5. * Revert "Remove keystore keymanager from validator (#5236)" This reverts commit46008770c1. * Revert "Update eth2 wallet keymanager (#4984)" This reverts commit7f7ef43f21. 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 * Sync with master * Rm old aggregate_test.go
613 lines
19 KiB
Go
613 lines
19 KiB
Go
package kv
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"fmt"
|
|
"math"
|
|
"strconv"
|
|
|
|
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
|
|
|
|
"github.com/pkg/errors"
|
|
ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
|
|
"github.com/prysmaticlabs/prysm/beacon-chain/core/helpers"
|
|
"github.com/prysmaticlabs/prysm/beacon-chain/db/filters"
|
|
"github.com/prysmaticlabs/prysm/shared/bytesutil"
|
|
"github.com/prysmaticlabs/prysm/shared/featureconfig"
|
|
"github.com/prysmaticlabs/prysm/shared/params"
|
|
"github.com/prysmaticlabs/prysm/shared/sliceutil"
|
|
log "github.com/sirupsen/logrus"
|
|
bolt "go.etcd.io/bbolt"
|
|
"go.opencensus.io/trace"
|
|
)
|
|
|
|
// Block retrieval by root.
|
|
func (k *Store) Block(ctx context.Context, blockRoot [32]byte) (*ethpb.SignedBeaconBlock, error) {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.Block")
|
|
defer span.End()
|
|
// Return block from cache if it exists.
|
|
if v, ok := k.blockCache.Get(string(blockRoot[:])); v != nil && ok {
|
|
return v.(*ethpb.SignedBeaconBlock), nil
|
|
}
|
|
var block *ethpb.SignedBeaconBlock
|
|
err := k.db.View(func(tx *bolt.Tx) error {
|
|
bkt := tx.Bucket(blocksBucket)
|
|
enc := bkt.Get(blockRoot[:])
|
|
if enc == nil {
|
|
return nil
|
|
}
|
|
block = ðpb.SignedBeaconBlock{}
|
|
return decode(enc, block)
|
|
})
|
|
return block, err
|
|
}
|
|
|
|
// HeadBlock returns the latest canonical block in eth2.
|
|
func (k *Store) HeadBlock(ctx context.Context) (*ethpb.SignedBeaconBlock, error) {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.HeadBlock")
|
|
defer span.End()
|
|
var headBlock *ethpb.SignedBeaconBlock
|
|
err := k.db.View(func(tx *bolt.Tx) error {
|
|
bkt := tx.Bucket(blocksBucket)
|
|
headRoot := bkt.Get(headBlockRootKey)
|
|
if headRoot == nil {
|
|
return nil
|
|
}
|
|
enc := bkt.Get(headRoot)
|
|
if enc == nil {
|
|
return nil
|
|
}
|
|
headBlock = ðpb.SignedBeaconBlock{}
|
|
return decode(enc, headBlock)
|
|
})
|
|
return headBlock, err
|
|
}
|
|
|
|
// Blocks retrieves a list of beacon blocks by filter criteria.
|
|
func (k *Store) Blocks(ctx context.Context, f *filters.QueryFilter) ([]*ethpb.SignedBeaconBlock, error) {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.Blocks")
|
|
defer span.End()
|
|
blocks := make([]*ethpb.SignedBeaconBlock, 0)
|
|
err := k.db.View(func(tx *bolt.Tx) error {
|
|
bkt := tx.Bucket(blocksBucket)
|
|
|
|
keys, err := getBlockRootsByFilter(ctx, tx, f)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
for i := 0; i < len(keys); i++ {
|
|
encoded := bkt.Get(keys[i])
|
|
block := ðpb.SignedBeaconBlock{}
|
|
if err := decode(encoded, block); err != nil {
|
|
return err
|
|
}
|
|
blocks = append(blocks, block)
|
|
}
|
|
return nil
|
|
})
|
|
return blocks, err
|
|
}
|
|
|
|
// BlockRoots retrieves a list of beacon block roots by filter criteria.
|
|
func (k *Store) BlockRoots(ctx context.Context, f *filters.QueryFilter) ([][32]byte, error) {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.BlockRoots")
|
|
defer span.End()
|
|
blockRoots := make([][32]byte, 0)
|
|
err := k.db.View(func(tx *bolt.Tx) error {
|
|
keys, err := getBlockRootsByFilter(ctx, tx, f)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
for i := 0; i < len(keys); i++ {
|
|
blockRoots = append(blockRoots, bytesutil.ToBytes32(keys[i]))
|
|
}
|
|
return nil
|
|
})
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "could not retrieve block roots")
|
|
}
|
|
return blockRoots, nil
|
|
}
|
|
|
|
// HasBlock checks if a block by root exists in the db.
|
|
func (k *Store) HasBlock(ctx context.Context, blockRoot [32]byte) bool {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.HasBlock")
|
|
defer span.End()
|
|
if v, ok := k.blockCache.Get(string(blockRoot[:])); v != nil && ok {
|
|
return true
|
|
}
|
|
exists := false
|
|
if err := k.db.View(func(tx *bolt.Tx) error {
|
|
bkt := tx.Bucket(blocksBucket)
|
|
exists = bkt.Get(blockRoot[:]) != nil
|
|
return nil
|
|
}); err != nil { // This view never returns an error, but we'll handle anyway for sanity.
|
|
panic(err)
|
|
}
|
|
return exists
|
|
}
|
|
|
|
// DeleteBlock by block root.
|
|
func (k *Store) DeleteBlock(ctx context.Context, blockRoot [32]byte) error {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.DeleteBlock")
|
|
defer span.End()
|
|
return k.db.Update(func(tx *bolt.Tx) error {
|
|
bkt := tx.Bucket(blocksBucket)
|
|
enc := bkt.Get(blockRoot[:])
|
|
if enc == nil {
|
|
return nil
|
|
}
|
|
block := ðpb.SignedBeaconBlock{}
|
|
if err := decode(enc, block); err != nil {
|
|
return err
|
|
}
|
|
indicesByBucket := createBlockIndicesFromBlock(block.Block)
|
|
if err := deleteValueForIndices(indicesByBucket, blockRoot[:], tx); err != nil {
|
|
return errors.Wrap(err, "could not delete root for DB indices")
|
|
}
|
|
k.blockCache.Del(string(blockRoot[:]))
|
|
if err := k.clearBlockSlotBitField(ctx, tx, block.Block.Slot); err != nil {
|
|
return err
|
|
}
|
|
return bkt.Delete(blockRoot[:])
|
|
})
|
|
}
|
|
|
|
// DeleteBlocks by block roots.
|
|
func (k *Store) DeleteBlocks(ctx context.Context, blockRoots [][32]byte) error {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.DeleteBlocks")
|
|
defer span.End()
|
|
|
|
return k.db.Update(func(tx *bolt.Tx) error {
|
|
bkt := tx.Bucket(blocksBucket)
|
|
for _, blockRoot := range blockRoots {
|
|
enc := bkt.Get(blockRoot[:])
|
|
if enc == nil {
|
|
return nil
|
|
}
|
|
block := ðpb.SignedBeaconBlock{}
|
|
if err := decode(enc, block); err != nil {
|
|
return err
|
|
}
|
|
indicesByBucket := createBlockIndicesFromBlock(block.Block)
|
|
if err := deleteValueForIndices(indicesByBucket, blockRoot[:], tx); err != nil {
|
|
return errors.Wrap(err, "could not delete root for DB indices")
|
|
}
|
|
k.blockCache.Del(string(blockRoot[:]))
|
|
if err := k.clearBlockSlotBitField(ctx, tx, block.Block.Slot); err != nil {
|
|
return err
|
|
}
|
|
if err := bkt.Delete(blockRoot[:]); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
}
|
|
|
|
// SaveBlock to the db.
|
|
func (k *Store) SaveBlock(ctx context.Context, signed *ethpb.SignedBeaconBlock) error {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.SaveBlock")
|
|
defer span.End()
|
|
blockRoot, err := stateutil.BlockRoot(signed.Block)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if v, ok := k.blockCache.Get(string(blockRoot[:])); v != nil && ok {
|
|
return nil
|
|
}
|
|
return k.db.Update(func(tx *bolt.Tx) error {
|
|
if err := k.setBlockSlotBitField(ctx, tx, signed.Block.Slot); err != nil {
|
|
return err
|
|
}
|
|
|
|
bkt := tx.Bucket(blocksBucket)
|
|
if existingBlock := bkt.Get(blockRoot[:]); existingBlock != nil {
|
|
return nil
|
|
}
|
|
enc, err := encode(signed)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
indicesByBucket := createBlockIndicesFromBlock(signed.Block)
|
|
if err := updateValueForIndices(indicesByBucket, blockRoot[:], tx); err != nil {
|
|
return errors.Wrap(err, "could not update DB indices")
|
|
}
|
|
k.blockCache.Set(string(blockRoot[:]), signed, int64(len(enc)))
|
|
return bkt.Put(blockRoot[:], enc)
|
|
})
|
|
}
|
|
|
|
// SaveBlocks via bulk updates to the db.
|
|
func (k *Store) SaveBlocks(ctx context.Context, blocks []*ethpb.SignedBeaconBlock) error {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.SaveBlocks")
|
|
defer span.End()
|
|
|
|
return k.db.Update(func(tx *bolt.Tx) error {
|
|
bkt := tx.Bucket(blocksBucket)
|
|
for _, block := range blocks {
|
|
if err := k.setBlockSlotBitField(ctx, tx, block.Block.Slot); err != nil {
|
|
return err
|
|
}
|
|
blockRoot, err := stateutil.BlockRoot(block.Block)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if existingBlock := bkt.Get(blockRoot[:]); existingBlock != nil {
|
|
continue
|
|
}
|
|
enc, err := encode(block)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
indicesByBucket := createBlockIndicesFromBlock(block.Block)
|
|
if err := updateValueForIndices(indicesByBucket, blockRoot[:], tx); err != nil {
|
|
return errors.Wrap(err, "could not update DB indices")
|
|
}
|
|
k.blockCache.Set(string(blockRoot[:]), block, int64(len(enc)))
|
|
|
|
if err := bkt.Put(blockRoot[:], enc); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
})
|
|
}
|
|
|
|
// SaveHeadBlockRoot to the db.
|
|
func (k *Store) SaveHeadBlockRoot(ctx context.Context, blockRoot [32]byte) error {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.SaveHeadBlockRoot")
|
|
defer span.End()
|
|
return k.db.Update(func(tx *bolt.Tx) error {
|
|
if !featureconfig.Get().DisableNewStateMgmt {
|
|
hasStateSummaryInCache := k.stateSummaryCache.Has(blockRoot)
|
|
hasStateSummaryInDB := tx.Bucket(stateSummaryBucket).Get(blockRoot[:]) != nil
|
|
hasStateInDB := tx.Bucket(stateBucket).Get(blockRoot[:]) != nil
|
|
if !(hasStateInDB || hasStateSummaryInDB || hasStateSummaryInCache) {
|
|
return errors.New("no state or state summary found with head block root")
|
|
}
|
|
} else {
|
|
if tx.Bucket(stateBucket).Get(blockRoot[:]) == nil {
|
|
return errors.New("no state found with head block root")
|
|
}
|
|
}
|
|
|
|
bucket := tx.Bucket(blocksBucket)
|
|
return bucket.Put(headBlockRootKey, blockRoot[:])
|
|
})
|
|
}
|
|
|
|
// GenesisBlock retrieves the genesis block of the beacon chain.
|
|
func (k *Store) GenesisBlock(ctx context.Context) (*ethpb.SignedBeaconBlock, error) {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.GenesisBlock")
|
|
defer span.End()
|
|
var block *ethpb.SignedBeaconBlock
|
|
err := k.db.View(func(tx *bolt.Tx) error {
|
|
bkt := tx.Bucket(blocksBucket)
|
|
root := bkt.Get(genesisBlockRootKey)
|
|
enc := bkt.Get(root)
|
|
if enc == nil {
|
|
return nil
|
|
}
|
|
block = ðpb.SignedBeaconBlock{}
|
|
return decode(enc, block)
|
|
})
|
|
return block, err
|
|
}
|
|
|
|
// SaveGenesisBlockRoot to the db.
|
|
func (k *Store) SaveGenesisBlockRoot(ctx context.Context, blockRoot [32]byte) error {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.SaveGenesisBlockRoot")
|
|
defer span.End()
|
|
return k.db.Update(func(tx *bolt.Tx) error {
|
|
bucket := tx.Bucket(blocksBucket)
|
|
return bucket.Put(genesisBlockRootKey, blockRoot[:])
|
|
})
|
|
}
|
|
|
|
// HighestSlotBlocks returns the blocks with the highest slot from the db.
|
|
func (k *Store) HighestSlotBlocks(ctx context.Context) ([]*ethpb.SignedBeaconBlock, error) {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.HighestSlotBlocks")
|
|
defer span.End()
|
|
|
|
blocks := make([]*ethpb.SignedBeaconBlock, 0)
|
|
err := k.db.View(func(tx *bolt.Tx) error {
|
|
sBkt := tx.Bucket(slotsHasObjectBucket)
|
|
savedSlots := sBkt.Get(savedBlockSlotsKey)
|
|
highestIndex, err := bytesutil.HighestBitIndex(savedSlots)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
blocks, err = k.blocksAtSlotBitfieldIndex(ctx, tx, highestIndex)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
})
|
|
|
|
return blocks, err
|
|
}
|
|
|
|
// HighestSlotBlocksBelow returns the block with the highest slot below the input slot from the db.
|
|
func (k *Store) HighestSlotBlocksBelow(ctx context.Context, slot uint64) ([]*ethpb.SignedBeaconBlock, error) {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.HighestSlotBlocksBelow")
|
|
defer span.End()
|
|
|
|
blocks := make([]*ethpb.SignedBeaconBlock, 0)
|
|
err := k.db.View(func(tx *bolt.Tx) error {
|
|
sBkt := tx.Bucket(slotsHasObjectBucket)
|
|
savedSlots := sBkt.Get(savedBlockSlotsKey)
|
|
if len(savedSlots) == 0 {
|
|
savedSlots = bytesutil.MakeEmptyBitlists(int(slot))
|
|
}
|
|
highestIndex, err := bytesutil.HighestBitIndexAt(savedSlots, int(slot))
|
|
if err != nil {
|
|
return err
|
|
}
|
|
blocks, err = k.blocksAtSlotBitfieldIndex(ctx, tx, highestIndex)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
})
|
|
|
|
return blocks, err
|
|
}
|
|
|
|
// blocksAtSlotBitfieldIndex retrieves the blocks in DB given the input index. The index represents
|
|
// the position of the slot bitfield the saved block maps to.
|
|
func (k *Store) blocksAtSlotBitfieldIndex(ctx context.Context, tx *bolt.Tx, index int) ([]*ethpb.SignedBeaconBlock, error) {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.blocksAtSlotBitfieldIndex")
|
|
defer span.End()
|
|
|
|
highestSlot := index - 1
|
|
highestSlot = int(math.Max(0, float64(highestSlot)))
|
|
|
|
if highestSlot == 0 {
|
|
gBlock, err := k.GenesisBlock(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return []*ethpb.SignedBeaconBlock{gBlock}, nil
|
|
}
|
|
|
|
f := filters.NewFilter().SetStartSlot(uint64(highestSlot)).SetEndSlot(uint64(highestSlot))
|
|
|
|
keys, err := getBlockRootsByFilter(ctx, tx, f)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
blocks := make([]*ethpb.SignedBeaconBlock, 0, len(keys))
|
|
bBkt := tx.Bucket(blocksBucket)
|
|
for i := 0; i < len(keys); i++ {
|
|
encoded := bBkt.Get(keys[i])
|
|
block := ðpb.SignedBeaconBlock{}
|
|
if err := decode(encoded, block); err != nil {
|
|
return nil, err
|
|
}
|
|
blocks = append(blocks, block)
|
|
}
|
|
|
|
return blocks, err
|
|
}
|
|
|
|
// setBlockSlotBitField sets the block slot bit in DB.
|
|
// This helps to track which slot has a saved block in db.
|
|
func (k *Store) setBlockSlotBitField(ctx context.Context, tx *bolt.Tx, slot uint64) error {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.setBlockSlotBitField")
|
|
defer span.End()
|
|
|
|
k.blockSlotBitLock.Lock()
|
|
defer k.blockSlotBitLock.Unlock()
|
|
|
|
bucket := tx.Bucket(slotsHasObjectBucket)
|
|
slotBitfields := bucket.Get(savedBlockSlotsKey)
|
|
|
|
// Copy is needed to avoid unsafe pointer conversions.
|
|
// See: https://github.com/etcd-io/bbolt/pull/201
|
|
tmp := make([]byte, len(slotBitfields))
|
|
copy(tmp, slotBitfields)
|
|
|
|
slotBitfields = bytesutil.SetBit(tmp, int(slot))
|
|
return bucket.Put(savedBlockSlotsKey, slotBitfields)
|
|
}
|
|
|
|
// clearBlockSlotBitField clears the block slot bit in DB.
|
|
// This helps to track which slot has a saved block in db.
|
|
func (k *Store) clearBlockSlotBitField(ctx context.Context, tx *bolt.Tx, slot uint64) error {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.clearBlockSlotBitField")
|
|
defer span.End()
|
|
|
|
k.blockSlotBitLock.Lock()
|
|
defer k.blockSlotBitLock.Unlock()
|
|
|
|
bucket := tx.Bucket(slotsHasObjectBucket)
|
|
slotBitfields := bucket.Get(savedBlockSlotsKey)
|
|
|
|
// Copy is needed to avoid unsafe pointer conversions.
|
|
// See: https://github.com/etcd-io/bbolt/pull/201
|
|
tmp := make([]byte, len(slotBitfields))
|
|
copy(tmp, slotBitfields)
|
|
|
|
slotBitfields = bytesutil.ClearBit(tmp, int(slot))
|
|
return bucket.Put(savedBlockSlotsKey, slotBitfields)
|
|
}
|
|
|
|
// getBlockRootsByFilter retrieves the block roots given the filter criteria.
|
|
func getBlockRootsByFilter(ctx context.Context, tx *bolt.Tx, f *filters.QueryFilter) ([][]byte, error) {
|
|
ctx, span := trace.StartSpan(ctx, "BeaconDB.getBlockRootsByFilter")
|
|
defer span.End()
|
|
|
|
// If no filter criteria are specified, return an error.
|
|
if f == nil {
|
|
return nil, errors.New("must specify a filter criteria for retrieving blocks")
|
|
}
|
|
|
|
// Creates a list of indices from the passed in filter values, such as:
|
|
// []byte("0x2093923") in the parent root indices bucket to be used for looking up
|
|
// block roots that were stored under each of those indices for O(1) lookup.
|
|
indicesByBucket, err := createBlockIndicesFromFilters(f)
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "could not determine lookup indices")
|
|
}
|
|
|
|
// We retrieve block roots that match a filter criteria of slot ranges, if specified.
|
|
filtersMap := f.Filters()
|
|
rootsBySlotRange := fetchBlockRootsBySlotRange(
|
|
tx.Bucket(blockSlotIndicesBucket),
|
|
filtersMap[filters.StartSlot],
|
|
filtersMap[filters.EndSlot],
|
|
filtersMap[filters.StartEpoch],
|
|
filtersMap[filters.EndEpoch],
|
|
filtersMap[filters.SlotStep],
|
|
)
|
|
|
|
// Once we have a list of block roots that correspond to each
|
|
// lookup index, we find the intersection across all of them and use
|
|
// that list of roots to lookup the block. These block will
|
|
// meet the filter criteria.
|
|
indices := lookupValuesForIndices(indicesByBucket, tx)
|
|
keys := rootsBySlotRange
|
|
if len(indices) > 0 {
|
|
// If we have found indices that meet the filter criteria, and there are also
|
|
// block roots that meet the slot range filter criteria, we find the intersection
|
|
// between these two sets of roots.
|
|
if len(rootsBySlotRange) > 0 {
|
|
joined := append([][][]byte{keys}, indices...)
|
|
keys = sliceutil.IntersectionByteSlices(joined...)
|
|
} else {
|
|
// If we have found indices that meet the filter criteria, but there are no block roots
|
|
// that meet the slot range filter criteria, we find the intersection
|
|
// of the regular filter indices.
|
|
keys = sliceutil.IntersectionByteSlices(indices...)
|
|
}
|
|
}
|
|
|
|
return keys, nil
|
|
}
|
|
|
|
// fetchBlockRootsBySlotRange looks into a boltDB bucket and performs a binary search
|
|
// range scan using sorted left-padded byte keys using a start slot and an end slot.
|
|
// If both the start and end slot are the same, and are 0, the function returns nil.
|
|
func fetchBlockRootsBySlotRange(
|
|
bkt *bolt.Bucket,
|
|
startSlotEncoded interface{},
|
|
endSlotEncoded interface{},
|
|
startEpochEncoded interface{},
|
|
endEpochEncoded interface{},
|
|
slotStepEncoded interface{},
|
|
) [][]byte {
|
|
var startSlot, endSlot, step uint64
|
|
var ok bool
|
|
if startSlot, ok = startSlotEncoded.(uint64); !ok {
|
|
startSlot = 0
|
|
}
|
|
if endSlot, ok = endSlotEncoded.(uint64); !ok {
|
|
endSlot = 0
|
|
}
|
|
if step, ok = slotStepEncoded.(uint64); !ok || step == 0 {
|
|
step = 1
|
|
}
|
|
startEpoch, startEpochOk := startEpochEncoded.(uint64)
|
|
endEpoch, endEpochOk := endEpochEncoded.(uint64)
|
|
if startEpochOk && endEpochOk {
|
|
startSlot = helpers.StartSlot(startEpoch)
|
|
endSlot = helpers.StartSlot(endEpoch) + params.BeaconConfig().SlotsPerEpoch - 1
|
|
}
|
|
min := []byte(fmt.Sprintf("%07d", startSlot))
|
|
max := []byte(fmt.Sprintf("%07d", endSlot))
|
|
var conditional func(key, max []byte) bool
|
|
if endSlot == 0 {
|
|
conditional = func(k, max []byte) bool {
|
|
return k != nil
|
|
}
|
|
} else {
|
|
conditional = func(k, max []byte) bool {
|
|
return k != nil && bytes.Compare(k, max) <= 0
|
|
}
|
|
}
|
|
rootsRange := (endSlot - startSlot) / step
|
|
if endSlot < startSlot {
|
|
rootsRange = 0
|
|
}
|
|
roots := make([][]byte, 0, rootsRange)
|
|
c := bkt.Cursor()
|
|
for k, v := c.Seek(min); conditional(k, max); k, v = c.Next() {
|
|
if step > 1 {
|
|
slot, err := strconv.ParseUint(string(k), 10, 64)
|
|
if err != nil {
|
|
log.WithError(err).Error("Cannot parse key to uint")
|
|
continue
|
|
}
|
|
if (slot-startSlot)%step != 0 {
|
|
continue
|
|
}
|
|
}
|
|
numOfRoots := len(v) / 32
|
|
splitRoots := make([][]byte, 0, numOfRoots)
|
|
for i := 0; i < len(v); i += 32 {
|
|
splitRoots = append(splitRoots, v[i:i+32])
|
|
}
|
|
roots = append(roots, splitRoots...)
|
|
}
|
|
return roots
|
|
}
|
|
|
|
// createBlockIndicesFromBlock takes in a beacon block and returns
|
|
// a map of bolt DB index buckets corresponding to each particular key for indices for
|
|
// data, such as (shard indices bucket -> shard 5).
|
|
func createBlockIndicesFromBlock(block *ethpb.BeaconBlock) map[string][]byte {
|
|
indicesByBucket := make(map[string][]byte)
|
|
// Every index has a unique bucket for fast, binary-search
|
|
// range scans for filtering across keys.
|
|
buckets := [][]byte{
|
|
blockSlotIndicesBucket,
|
|
}
|
|
indices := [][]byte{
|
|
[]byte(fmt.Sprintf("%07d", block.Slot)),
|
|
}
|
|
if block.ParentRoot != nil && len(block.ParentRoot) > 0 {
|
|
buckets = append(buckets, blockParentRootIndicesBucket)
|
|
indices = append(indices, block.ParentRoot)
|
|
}
|
|
for i := 0; i < len(buckets); i++ {
|
|
indicesByBucket[string(buckets[i])] = indices[i]
|
|
}
|
|
return indicesByBucket
|
|
}
|
|
|
|
// createBlockFiltersFromIndices takes in filter criteria and returns
|
|
// a list of of byte keys used to retrieve the values stored
|
|
// for the indices from the DB.
|
|
//
|
|
// For blocks, these are list of signing roots of block
|
|
// objects. If a certain filter criterion does not apply to
|
|
// blocks, an appropriate error is returned.
|
|
func createBlockIndicesFromFilters(f *filters.QueryFilter) (map[string][]byte, error) {
|
|
indicesByBucket := make(map[string][]byte)
|
|
for k, v := range f.Filters() {
|
|
switch k {
|
|
case filters.ParentRoot:
|
|
parentRoot, ok := v.([]byte)
|
|
if !ok {
|
|
return nil, errors.New("parent root is not []byte")
|
|
}
|
|
indicesByBucket[string(blockParentRootIndicesBucket)] = parentRoot
|
|
case filters.StartSlot:
|
|
case filters.EndSlot:
|
|
case filters.StartEpoch:
|
|
case filters.EndEpoch:
|
|
case filters.SlotStep:
|
|
default:
|
|
return nil, fmt.Errorf("filter criterion %v not supported for blocks", k)
|
|
}
|
|
}
|
|
return indicesByBucket, nil
|
|
}
|