mirror of
https://gitlab.com/pulsechaincom/prysm-pulse.git
synced 2025-01-06 01:32:18 +00:00
cb045dd0e3
* 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 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 <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 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 <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 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 <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 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 * 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 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 * Sync with master * Rm old aggregate_test.go
763 lines
20 KiB
Go
763 lines
20 KiB
Go
package state
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/gogo/protobuf/proto"
|
|
"github.com/pkg/errors"
|
|
ethpb "github.com/prysmaticlabs/ethereumapis/eth/v1alpha1"
|
|
"github.com/prysmaticlabs/go-bitfield"
|
|
coreutils "github.com/prysmaticlabs/prysm/beacon-chain/core/state/stateutils"
|
|
pbp2p "github.com/prysmaticlabs/prysm/proto/beacon/p2p/v1"
|
|
"github.com/prysmaticlabs/prysm/shared/hashutil"
|
|
)
|
|
|
|
// SetGenesisTime for the beacon state.
|
|
func (b *BeaconState) SetGenesisTime(val uint64) error {
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.GenesisTime = val
|
|
b.markFieldAsDirty(genesisTime)
|
|
return nil
|
|
}
|
|
|
|
// SetGenesisValidatorRoot for the beacon state.
|
|
func (b *BeaconState) SetGenesisValidatorRoot(val []byte) error {
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.GenesisValidatorsRoot = val
|
|
b.markFieldAsDirty(genesisValidatorRoot)
|
|
return nil
|
|
}
|
|
|
|
// SetSlot for the beacon state.
|
|
func (b *BeaconState) SetSlot(val uint64) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.Slot = val
|
|
b.markFieldAsDirty(slot)
|
|
return nil
|
|
}
|
|
|
|
// SetFork version for the beacon chain.
|
|
func (b *BeaconState) SetFork(val *pbp2p.Fork) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
fk, ok := proto.Clone(val).(*pbp2p.Fork)
|
|
if !ok {
|
|
return errors.New("proto.Clone did not return a fork proto")
|
|
}
|
|
b.state.Fork = fk
|
|
b.markFieldAsDirty(fork)
|
|
return nil
|
|
}
|
|
|
|
// SetLatestBlockHeader in the beacon state.
|
|
func (b *BeaconState) SetLatestBlockHeader(val *ethpb.BeaconBlockHeader) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.LatestBlockHeader = CopyBeaconBlockHeader(val)
|
|
b.markFieldAsDirty(latestBlockHeader)
|
|
return nil
|
|
}
|
|
|
|
// SetBlockRoots for the beacon state. This PR updates the entire
|
|
// list to a new value by overwriting the previous one.
|
|
func (b *BeaconState) SetBlockRoots(val [][]byte) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.sharedFieldReferences[blockRoots].refs--
|
|
b.sharedFieldReferences[blockRoots] = &reference{refs: 1}
|
|
|
|
b.state.BlockRoots = val
|
|
b.markFieldAsDirty(blockRoots)
|
|
return nil
|
|
}
|
|
|
|
// UpdateBlockRootAtIndex for the beacon state. This PR updates the randao mixes
|
|
// at a specific index to a new value.
|
|
func (b *BeaconState) UpdateBlockRootAtIndex(idx uint64, blockRoot [32]byte) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
if len(b.state.BlockRoots) <= int(idx) {
|
|
return fmt.Errorf("invalid index provided %d", idx)
|
|
}
|
|
|
|
b.lock.RLock()
|
|
r := b.state.BlockRoots
|
|
if ref := b.sharedFieldReferences[blockRoots]; ref.refs > 1 {
|
|
// Copy on write since this is a shared array.
|
|
r = b.BlockRoots()
|
|
|
|
ref.MinusRef()
|
|
b.sharedFieldReferences[blockRoots] = &reference{refs: 1}
|
|
}
|
|
b.lock.RUnlock()
|
|
|
|
// Must secure lock after copy or hit a deadlock.
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
r[idx] = blockRoot[:]
|
|
b.state.BlockRoots = r
|
|
|
|
b.markFieldAsDirty(blockRoots)
|
|
b.AddDirtyIndices(blockRoots, []uint64{idx})
|
|
return nil
|
|
}
|
|
|
|
// SetStateRoots for the beacon state. This PR updates the entire
|
|
// to a new value by overwriting the previous one.
|
|
func (b *BeaconState) SetStateRoots(val [][]byte) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.sharedFieldReferences[stateRoots].refs--
|
|
b.sharedFieldReferences[stateRoots] = &reference{refs: 1}
|
|
|
|
b.state.StateRoots = val
|
|
b.markFieldAsDirty(stateRoots)
|
|
b.rebuildTrie[stateRoots] = true
|
|
return nil
|
|
}
|
|
|
|
// UpdateStateRootAtIndex for the beacon state. This PR updates the randao mixes
|
|
// at a specific index to a new value.
|
|
func (b *BeaconState) UpdateStateRootAtIndex(idx uint64, stateRoot [32]byte) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
if len(b.state.StateRoots) <= int(idx) {
|
|
return errors.Errorf("invalid index provided %d", idx)
|
|
}
|
|
|
|
b.lock.RLock()
|
|
// Check if we hold the only reference to the shared state roots slice.
|
|
r := b.state.StateRoots
|
|
if ref := b.sharedFieldReferences[stateRoots]; ref.refs > 1 {
|
|
// Perform a copy since this is a shared reference and we don't want to mutate others.
|
|
r = b.StateRoots()
|
|
|
|
ref.MinusRef()
|
|
b.sharedFieldReferences[stateRoots] = &reference{refs: 1}
|
|
}
|
|
b.lock.RUnlock()
|
|
|
|
// Must secure lock after copy or hit a deadlock.
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
r[idx] = stateRoot[:]
|
|
b.state.StateRoots = r
|
|
|
|
b.markFieldAsDirty(stateRoots)
|
|
b.AddDirtyIndices(stateRoots, []uint64{idx})
|
|
return nil
|
|
}
|
|
|
|
// SetHistoricalRoots for the beacon state. This PR updates the entire
|
|
// list to a new value by overwriting the previous one.
|
|
func (b *BeaconState) SetHistoricalRoots(val [][]byte) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.sharedFieldReferences[historicalRoots].refs--
|
|
b.sharedFieldReferences[historicalRoots] = &reference{refs: 1}
|
|
|
|
b.state.HistoricalRoots = val
|
|
b.markFieldAsDirty(historicalRoots)
|
|
return nil
|
|
}
|
|
|
|
// SetEth1Data for the beacon state.
|
|
func (b *BeaconState) SetEth1Data(val *ethpb.Eth1Data) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.Eth1Data = val
|
|
b.markFieldAsDirty(eth1Data)
|
|
return nil
|
|
}
|
|
|
|
// SetEth1DataVotes for the beacon state. This PR updates the entire
|
|
// list to a new value by overwriting the previous one.
|
|
func (b *BeaconState) SetEth1DataVotes(val []*ethpb.Eth1Data) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.sharedFieldReferences[eth1DataVotes].refs--
|
|
b.sharedFieldReferences[eth1DataVotes] = &reference{refs: 1}
|
|
|
|
b.state.Eth1DataVotes = val
|
|
b.markFieldAsDirty(eth1DataVotes)
|
|
b.rebuildTrie[eth1DataVotes] = true
|
|
return nil
|
|
}
|
|
|
|
// AppendEth1DataVotes for the beacon state. This PR appends the new value
|
|
// to the the end of list.
|
|
func (b *BeaconState) AppendEth1DataVotes(val *ethpb.Eth1Data) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.RLock()
|
|
votes := b.state.Eth1DataVotes
|
|
if b.sharedFieldReferences[eth1DataVotes].refs > 1 {
|
|
votes = b.Eth1DataVotes()
|
|
b.sharedFieldReferences[eth1DataVotes].MinusRef()
|
|
b.sharedFieldReferences[eth1DataVotes] = &reference{refs: 1}
|
|
}
|
|
b.lock.RUnlock()
|
|
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.Eth1DataVotes = append(votes, val)
|
|
b.markFieldAsDirty(eth1DataVotes)
|
|
b.AddDirtyIndices(eth1DataVotes, []uint64{uint64(len(b.state.Eth1DataVotes) - 1)})
|
|
return nil
|
|
}
|
|
|
|
// SetEth1DepositIndex for the beacon state.
|
|
func (b *BeaconState) SetEth1DepositIndex(val uint64) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.Eth1DepositIndex = val
|
|
b.markFieldAsDirty(eth1DepositIndex)
|
|
return nil
|
|
}
|
|
|
|
// SetValidators for the beacon state. This PR updates the entire
|
|
// to a new value by overwriting the previous one.
|
|
func (b *BeaconState) SetValidators(val []*ethpb.Validator) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.Validators = val
|
|
b.sharedFieldReferences[validators].refs--
|
|
b.sharedFieldReferences[validators] = &reference{refs: 1}
|
|
b.markFieldAsDirty(validators)
|
|
b.rebuildTrie[validators] = true
|
|
b.valIdxMap = coreutils.ValidatorIndexMap(b.state.Validators)
|
|
return nil
|
|
}
|
|
|
|
// ApplyToEveryValidator applies the provided callback function to each validator in the
|
|
// validator registry.
|
|
func (b *BeaconState) ApplyToEveryValidator(f func(idx int, val *ethpb.Validator) (bool, error)) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.RLock()
|
|
v := b.state.Validators
|
|
if ref := b.sharedFieldReferences[validators]; ref.refs > 1 {
|
|
// Perform a copy since this is a shared reference and we don't want to mutate others.
|
|
v = b.Validators()
|
|
|
|
ref.MinusRef()
|
|
b.sharedFieldReferences[validators] = &reference{refs: 1}
|
|
}
|
|
b.lock.RUnlock()
|
|
changedVals := []uint64{}
|
|
for i, val := range v {
|
|
changed, err := f(i, val)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if changed {
|
|
changedVals = append(changedVals, uint64(i))
|
|
}
|
|
}
|
|
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.Validators = v
|
|
b.markFieldAsDirty(validators)
|
|
b.AddDirtyIndices(validators, changedVals)
|
|
|
|
return nil
|
|
}
|
|
|
|
// UpdateValidatorAtIndex for the beacon state. This PR updates the randao mixes
|
|
// at a specific index to a new value.
|
|
func (b *BeaconState) UpdateValidatorAtIndex(idx uint64, val *ethpb.Validator) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
if len(b.state.Validators) <= int(idx) {
|
|
return errors.Errorf("invalid index provided %d", idx)
|
|
}
|
|
|
|
b.lock.RLock()
|
|
v := b.state.Validators
|
|
if ref := b.sharedFieldReferences[validators]; ref.refs > 1 {
|
|
// Perform a copy since this is a shared reference and we don't want to mutate others.
|
|
v = b.Validators()
|
|
|
|
ref.MinusRef()
|
|
b.sharedFieldReferences[validators] = &reference{refs: 1}
|
|
}
|
|
b.lock.RUnlock()
|
|
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
v[idx] = val
|
|
b.state.Validators = v
|
|
b.markFieldAsDirty(validators)
|
|
b.AddDirtyIndices(validators, []uint64{idx})
|
|
|
|
return nil
|
|
}
|
|
|
|
// SetValidatorIndexByPubkey updates the validator index mapping maintained internally to
|
|
// a given input 48-byte, public key.
|
|
func (b *BeaconState) SetValidatorIndexByPubkey(pubKey [48]byte, validatorIdx uint64) {
|
|
// Copy on write since this is a shared map.
|
|
m := b.validatorIndexMap()
|
|
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
m[pubKey] = validatorIdx
|
|
b.valIdxMap = m
|
|
}
|
|
|
|
// SetBalances for the beacon state. This PR updates the entire
|
|
// list to a new value by overwriting the previous one.
|
|
func (b *BeaconState) SetBalances(val []uint64) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.sharedFieldReferences[balances].refs--
|
|
b.sharedFieldReferences[balances] = &reference{refs: 1}
|
|
|
|
b.state.Balances = val
|
|
b.markFieldAsDirty(balances)
|
|
return nil
|
|
}
|
|
|
|
// UpdateBalancesAtIndex for the beacon state. This method updates the balance
|
|
// at a specific index to a new value.
|
|
func (b *BeaconState) UpdateBalancesAtIndex(idx uint64, val uint64) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
if len(b.state.Balances) <= int(idx) {
|
|
return errors.Errorf("invalid index provided %d", idx)
|
|
}
|
|
|
|
b.lock.RLock()
|
|
bals := b.state.Balances
|
|
if b.sharedFieldReferences[balances].refs > 1 {
|
|
bals = b.Balances()
|
|
b.sharedFieldReferences[balances].MinusRef()
|
|
b.sharedFieldReferences[balances] = &reference{refs: 1}
|
|
}
|
|
b.lock.RUnlock()
|
|
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
bals[idx] = val
|
|
b.state.Balances = bals
|
|
b.markFieldAsDirty(balances)
|
|
return nil
|
|
}
|
|
|
|
// SetRandaoMixes for the beacon state. This PR updates the entire
|
|
// list to a new value by overwriting the previous one.
|
|
func (b *BeaconState) SetRandaoMixes(val [][]byte) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.sharedFieldReferences[randaoMixes].refs--
|
|
b.sharedFieldReferences[randaoMixes] = &reference{refs: 1}
|
|
|
|
b.state.RandaoMixes = val
|
|
b.markFieldAsDirty(randaoMixes)
|
|
b.rebuildTrie[randaoMixes] = true
|
|
return nil
|
|
}
|
|
|
|
// UpdateRandaoMixesAtIndex for the beacon state. This PR updates the randao mixes
|
|
// at a specific index to a new value.
|
|
func (b *BeaconState) UpdateRandaoMixesAtIndex(val []byte, idx uint64) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
if len(b.state.RandaoMixes) <= int(idx) {
|
|
return errors.Errorf("invalid index provided %d", idx)
|
|
}
|
|
|
|
b.lock.RLock()
|
|
mixes := b.state.RandaoMixes
|
|
if refs := b.sharedFieldReferences[randaoMixes].refs; refs > 1 {
|
|
mixes = b.RandaoMixes()
|
|
b.sharedFieldReferences[randaoMixes].MinusRef()
|
|
b.sharedFieldReferences[randaoMixes] = &reference{refs: 1}
|
|
}
|
|
b.lock.RUnlock()
|
|
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
mixes[idx] = val
|
|
b.state.RandaoMixes = mixes
|
|
b.markFieldAsDirty(randaoMixes)
|
|
b.AddDirtyIndices(randaoMixes, []uint64{idx})
|
|
|
|
return nil
|
|
}
|
|
|
|
// SetSlashings for the beacon state. This PR updates the entire
|
|
// list to a new value by overwriting the previous one.
|
|
func (b *BeaconState) SetSlashings(val []uint64) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.sharedFieldReferences[slashings].refs--
|
|
b.sharedFieldReferences[slashings] = &reference{refs: 1}
|
|
|
|
b.state.Slashings = val
|
|
b.markFieldAsDirty(slashings)
|
|
return nil
|
|
}
|
|
|
|
// UpdateSlashingsAtIndex for the beacon state. This PR updates the randao mixes
|
|
// at a specific index to a new value.
|
|
func (b *BeaconState) UpdateSlashingsAtIndex(idx uint64, val uint64) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
if len(b.state.Slashings) <= int(idx) {
|
|
return errors.Errorf("invalid index provided %d", idx)
|
|
}
|
|
b.lock.RLock()
|
|
s := b.state.Slashings
|
|
|
|
if b.sharedFieldReferences[slashings].refs > 1 {
|
|
s = b.Slashings()
|
|
b.sharedFieldReferences[slashings].MinusRef()
|
|
b.sharedFieldReferences[slashings] = &reference{refs: 1}
|
|
}
|
|
b.lock.RUnlock()
|
|
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
s[idx] = val
|
|
|
|
b.state.Slashings = s
|
|
|
|
b.markFieldAsDirty(slashings)
|
|
return nil
|
|
}
|
|
|
|
// SetPreviousEpochAttestations for the beacon state. This PR updates the entire
|
|
// list to a new value by overwriting the previous one.
|
|
func (b *BeaconState) SetPreviousEpochAttestations(val []*pbp2p.PendingAttestation) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.sharedFieldReferences[previousEpochAttestations].refs--
|
|
b.sharedFieldReferences[previousEpochAttestations] = &reference{refs: 1}
|
|
|
|
b.state.PreviousEpochAttestations = val
|
|
b.markFieldAsDirty(previousEpochAttestations)
|
|
b.rebuildTrie[previousEpochAttestations] = true
|
|
return nil
|
|
}
|
|
|
|
// SetCurrentEpochAttestations for the beacon state. This PR updates the entire
|
|
// list to a new value by overwriting the previous one.
|
|
func (b *BeaconState) SetCurrentEpochAttestations(val []*pbp2p.PendingAttestation) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.sharedFieldReferences[currentEpochAttestations].refs--
|
|
b.sharedFieldReferences[currentEpochAttestations] = &reference{refs: 1}
|
|
|
|
b.state.CurrentEpochAttestations = val
|
|
b.markFieldAsDirty(currentEpochAttestations)
|
|
b.rebuildTrie[currentEpochAttestations] = true
|
|
return nil
|
|
}
|
|
|
|
// AppendHistoricalRoots for the beacon state. This PR appends the new value
|
|
// to the the end of list.
|
|
func (b *BeaconState) AppendHistoricalRoots(root [32]byte) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.RLock()
|
|
roots := b.state.HistoricalRoots
|
|
if b.sharedFieldReferences[historicalRoots].refs > 1 {
|
|
roots = b.HistoricalRoots()
|
|
b.sharedFieldReferences[historicalRoots].MinusRef()
|
|
b.sharedFieldReferences[historicalRoots] = &reference{refs: 1}
|
|
}
|
|
b.lock.RUnlock()
|
|
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.HistoricalRoots = append(roots, root[:])
|
|
b.markFieldAsDirty(historicalRoots)
|
|
return nil
|
|
}
|
|
|
|
// AppendCurrentEpochAttestations for the beacon state. This PR appends the new value
|
|
// to the the end of list.
|
|
func (b *BeaconState) AppendCurrentEpochAttestations(val *pbp2p.PendingAttestation) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.RLock()
|
|
|
|
atts := b.state.CurrentEpochAttestations
|
|
if b.sharedFieldReferences[currentEpochAttestations].refs > 1 {
|
|
atts = b.CurrentEpochAttestations()
|
|
b.sharedFieldReferences[currentEpochAttestations].MinusRef()
|
|
b.sharedFieldReferences[currentEpochAttestations] = &reference{refs: 1}
|
|
}
|
|
b.lock.RUnlock()
|
|
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.CurrentEpochAttestations = append(atts, val)
|
|
b.markFieldAsDirty(currentEpochAttestations)
|
|
b.dirtyIndices[currentEpochAttestations] = append(b.dirtyIndices[currentEpochAttestations], uint64(len(b.state.CurrentEpochAttestations)-1))
|
|
return nil
|
|
}
|
|
|
|
// AppendPreviousEpochAttestations for the beacon state. This PR appends the new value
|
|
// to the the end of list.
|
|
func (b *BeaconState) AppendPreviousEpochAttestations(val *pbp2p.PendingAttestation) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.RLock()
|
|
atts := b.state.PreviousEpochAttestations
|
|
if b.sharedFieldReferences[previousEpochAttestations].refs > 1 {
|
|
atts = b.PreviousEpochAttestations()
|
|
b.sharedFieldReferences[previousEpochAttestations].MinusRef()
|
|
b.sharedFieldReferences[previousEpochAttestations] = &reference{refs: 1}
|
|
}
|
|
b.lock.RUnlock()
|
|
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.PreviousEpochAttestations = append(atts, val)
|
|
b.markFieldAsDirty(previousEpochAttestations)
|
|
b.AddDirtyIndices(previousEpochAttestations, []uint64{uint64(len(b.state.PreviousEpochAttestations) - 1)})
|
|
|
|
return nil
|
|
}
|
|
|
|
// AppendValidator for the beacon state. This PR appends the new value
|
|
// to the the end of list.
|
|
func (b *BeaconState) AppendValidator(val *ethpb.Validator) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.RLock()
|
|
vals := b.state.Validators
|
|
if b.sharedFieldReferences[validators].refs > 1 {
|
|
vals = b.Validators()
|
|
b.sharedFieldReferences[validators].MinusRef()
|
|
b.sharedFieldReferences[validators] = &reference{refs: 1}
|
|
}
|
|
b.lock.RUnlock()
|
|
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.Validators = append(vals, val)
|
|
b.markFieldAsDirty(validators)
|
|
b.AddDirtyIndices(validators, []uint64{uint64(len(b.state.Validators) - 1)})
|
|
b.valIdxMap = coreutils.ValidatorIndexMap(b.state.Validators)
|
|
return nil
|
|
}
|
|
|
|
// AppendBalance for the beacon state. This PR appends the new value
|
|
// to the the end of list.
|
|
func (b *BeaconState) AppendBalance(bal uint64) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.RLock()
|
|
|
|
bals := b.state.Balances
|
|
if b.sharedFieldReferences[balances].refs > 1 {
|
|
bals = b.Balances()
|
|
b.sharedFieldReferences[balances].MinusRef()
|
|
b.sharedFieldReferences[balances] = &reference{refs: 1}
|
|
}
|
|
b.lock.RUnlock()
|
|
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.Balances = append(bals, bal)
|
|
b.markFieldAsDirty(balances)
|
|
return nil
|
|
}
|
|
|
|
// SetJustificationBits for the beacon state.
|
|
func (b *BeaconState) SetJustificationBits(val bitfield.Bitvector4) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.JustificationBits = val
|
|
b.markFieldAsDirty(justificationBits)
|
|
return nil
|
|
}
|
|
|
|
// SetPreviousJustifiedCheckpoint for the beacon state.
|
|
func (b *BeaconState) SetPreviousJustifiedCheckpoint(val *ethpb.Checkpoint) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.PreviousJustifiedCheckpoint = val
|
|
b.markFieldAsDirty(previousJustifiedCheckpoint)
|
|
return nil
|
|
}
|
|
|
|
// SetCurrentJustifiedCheckpoint for the beacon state.
|
|
func (b *BeaconState) SetCurrentJustifiedCheckpoint(val *ethpb.Checkpoint) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.CurrentJustifiedCheckpoint = val
|
|
b.markFieldAsDirty(currentJustifiedCheckpoint)
|
|
return nil
|
|
}
|
|
|
|
// SetFinalizedCheckpoint for the beacon state.
|
|
func (b *BeaconState) SetFinalizedCheckpoint(val *ethpb.Checkpoint) error {
|
|
if !b.HasInnerState() {
|
|
return ErrNilInnerState
|
|
}
|
|
b.lock.Lock()
|
|
defer b.lock.Unlock()
|
|
|
|
b.state.FinalizedCheckpoint = val
|
|
b.markFieldAsDirty(finalizedCheckpoint)
|
|
return nil
|
|
}
|
|
|
|
// Recomputes the branch up the index in the Merkle trie representation
|
|
// of the beacon state. This method performs map reads and the caller MUST
|
|
// hold the lock before calling this method.
|
|
func (b *BeaconState) recomputeRoot(idx int) {
|
|
hashFunc := hashutil.CustomSHA256Hasher()
|
|
layers := b.merkleLayers
|
|
// The merkle tree structure looks as follows:
|
|
// [[r1, r2, r3, r4], [parent1, parent2], [root]]
|
|
// Using information about the index which changed, idx, we recompute
|
|
// only its branch up the tree.
|
|
currentIndex := idx
|
|
root := b.merkleLayers[0][idx]
|
|
for i := 0; i < len(layers)-1; i++ {
|
|
isLeft := currentIndex%2 == 0
|
|
neighborIdx := currentIndex ^ 1
|
|
|
|
neighbor := make([]byte, 32)
|
|
if layers[i] != nil && len(layers[i]) != 0 && neighborIdx < len(layers[i]) {
|
|
neighbor = layers[i][neighborIdx]
|
|
}
|
|
if isLeft {
|
|
parentHash := hashFunc(append(root, neighbor...))
|
|
root = parentHash[:]
|
|
} else {
|
|
parentHash := hashFunc(append(neighbor, root...))
|
|
root = parentHash[:]
|
|
}
|
|
parentIdx := currentIndex / 2
|
|
// Update the cached layers at the parent index.
|
|
layers[i+1][parentIdx] = root
|
|
currentIndex = parentIdx
|
|
}
|
|
b.merkleLayers = layers
|
|
}
|
|
|
|
func (b *BeaconState) markFieldAsDirty(field fieldIndex) {
|
|
_, ok := b.dirtyFields[field]
|
|
if !ok {
|
|
b.dirtyFields[field] = true
|
|
}
|
|
// do nothing if field already exists
|
|
}
|
|
|
|
// AddDirtyIndices adds the relevant dirty field indices, so that they
|
|
// can be recomputed.
|
|
func (b *BeaconState) AddDirtyIndices(index fieldIndex, indices []uint64) {
|
|
b.dirtyIndices[index] = append(b.dirtyIndices[index], indices...)
|
|
}
|