mirror of
https://gitlab.com/pulsechaincom/prysm-pulse.git
synced 2024-12-25 21:07:18 +00:00
4fbcedf541
* 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 commit df9a534826
.
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>
* STarting
* Release DiscoveryV5 for Testnet Restart (#5357)
* release discv5
* fix build
* Fix Overflow in Status Check (#5361)
* fix overflow
* Apply suggestions from code review
* Update assignments
* Genesis short circuit
* Fixed tests
* Merge branch 'master' of github.com:prysmaticlabs/prysm into v0.11
* fix after merge
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Merge refs/heads/master into v0.11
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* 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>
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* 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>
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* 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 refs/heads/v0.11 into fix-list-validator-assignments
* Merge branch 'master' into v0.11
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Merge refs/heads/master into v0.11
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Amend Faucet to Offer 32.5 ETH for v0.11 (#5378)
* deposit amount in faucet
* fix eth amount
* gas cost
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* unskip exec transition test
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Revert "Enable NOISE Handshake by Default v0.11 (#5272)" (#5381)
This reverts commit a8d32d504a8f923cdf7fa9dfc2684f8804fbab92.
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Merge refs/heads/master into v0.11
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* use string for deposit flag
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update Bootnode to v0.11 (#5387)
* fix bootnode
* add changes
* gaz
* fix docker
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Fixed conflict
* Merge branch 'master' of github.com:prysmaticlabs/prysm into v0.11
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* build fix
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* fix flaky test
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Merge refs/heads/master into v0.11
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Merge branch 'v0.11' of github.com:prysmaticlabs/prysm into fix-list-validator-assignments
* Fixed more conflicts
* Merge branch 'fix-list-validator-assignments' of github.com:prysmaticlabs/prysm into fix-list-validator-assignments
* 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 refs/heads/v0.11 into fix-list-validator-assignments
* Merge branch 'master' of https://github.com/prysmaticlabs/prysm into v0.11
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Merge refs/heads/master into v0.11
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Merge branch 'master' of github.com:prysmaticlabs/prysm into v0.11
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update beacon-chain/p2p/broadcaster_test.go
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Merge branch 'v0.11' of github.com:prysmaticlabs/prysm into fix-list-validator-assignments
* Fixed test
* Merge branch 'fix-list-validator-assignments' of github.com:prysmaticlabs/prysm into fix-list-validator-assignments
* Merge refs/heads/master into v0.11
* Update GetValidatorActiveSetChanges
* Fixed tests
* Merge branch 'v0.11' into fix-list-validator-assignments
* Pass E2E Tests for v0.11 and Enable Attestation Subnets By Default (#5407)
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update README.md
Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com>
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Apply suggestions from code review
Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com>
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update beacon-chain/p2p/config.go
Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com>
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update shared/keystore/deposit_input.go
Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com>
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update tools/faucet/server.go
Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com>
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update beacon-chain/p2p/service.go
Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com>
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update shared/benchutil/pregen_test.go
Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com>
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update shared/benchutil/pregen_test.go
Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com>
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update proto/beacon/p2p/v1/BUILD.bazel
Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com>
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update shared/benchutil/pregen_test.go
Co-Authored-By: Preston Van Loon <preston@prysmaticlabs.com>
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update shared/bls/spectest/aggregate_verify_test.go
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Addressed feedback. All test passing
* Merge branch 'v0.11' of github.com:prysmaticlabs/prysm into v0.11
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update beacon-chain/core/blocks/block_operations_fuzz_test.go
Co-Authored-By: Ivan Martinez <ivanthegreatdev@gmail.com>
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update beacon-chain/core/blocks/block_operations_test.go
Co-Authored-By: Ivan Martinez <ivanthegreatdev@gmail.com>
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update shared/testutil/helpers.go
Co-Authored-By: Ivan Martinez <ivanthegreatdev@gmail.com>
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update beacon-chain/core/helpers/signing_root.go
Co-Authored-By: Ivan Martinez <ivanthegreatdev@gmail.com>
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Resolve Misc v0.11 Items (Raul) (#5414)
* address all comments
* set faucet
* nishant feedback
* Update beacon-chain/p2p/service.go
Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Revert keymanager changes (#5416)
* Revert "Updates for remote keymanager (#5260)"
This reverts commit bbcd895db50ce5e7c0ecb64210471cf56f63b373.
* Revert "Remove keystore keymanager from validator (#5236)"
This reverts commit 46008770c162e741251e13772fd7356b43a9af87.
* Revert "Update eth2 wallet keymanager (#4984)"
This reverts commit 7f7ef43f218598a671aaeb327342d7e5130fe8b1.
Co-authored-by: prylabs-bulldozer[bot] <58059840+prylabs-bulldozer[bot]@users.noreply.github.com>
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update BLS and limit visibility (#5415)
* remove duplicated BLS, add golang.org/x/mod
* Update BLS and restrict visibility
* fix build
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Fix eth1data test and fix order of ops (#5413)
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* use multiaddr builder (#5419)
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Unskip benchutil and minor v0.11 fixes (#5417)
* Unskip benchutil tests
* Remove protos and gaz
* Fixes
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Networking Fixes (#5421)
* check
* fix test
* fix size
* fix test
* more fixes
* fix test again
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Update ethereum APIs with latest master
* Merge refs/heads/v0.11 into fix-active-set-changes
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Error handling for v0.11 tests (#5428)
* Proper err handling for tests
* Lint
* Fixed rest of the tests
* Gaz
* Fixed old master tests
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Sync with master
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Rm old aggregate_test.go
* Merge refs/heads/v0.11 into fix-list-validator-assignments
* Merge branch 'master' into fix-list-validator-assignments
* Fixed conflicts
* Sync with v0.11
* Sync with master
* Merge refs/heads/master into fix-active-set-changes
* Merge refs/heads/master into fix-active-set-changes
* Merge refs/heads/master into fix-active-set-changes
* Merge refs/heads/master into fix-active-set-changes
* Merge refs/heads/master into fix-active-set-changes
* Merge branch 'master' into fix-active-set-changes
* Gaz
* Merge branch 'fix-list-validator-assignments' into deprecate-archival-service
* Rm archival service
* Rm flags
* Fixed flags
* Merge refs/heads/master into deprecate-archival-service
* Gaz
* Merge branch 'deprecate-archival-service' of github.com:prysmaticlabs/prysm into deprecate-archival-service
* Merge refs/heads/master into deprecate-archival-service
* Gaz
* Merge branch 'deprecate-archival-service' of github.com:prysmaticlabs/prysm into deprecate-archival-service
* Merge refs/heads/master into deprecate-archival-service
* Merge refs/heads/master into deprecate-archival-service
370 lines
13 KiB
Go
370 lines
13 KiB
Go
package blockchain
|
|
|
|
import (
|
|
"context"
|
|
"encoding/hex"
|
|
"fmt"
|
|
|
|
"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/core/state"
|
|
stateTrie "github.com/prysmaticlabs/prysm/beacon-chain/state"
|
|
"github.com/prysmaticlabs/prysm/beacon-chain/state/stateutil"
|
|
"github.com/prysmaticlabs/prysm/shared/attestationutil"
|
|
"github.com/prysmaticlabs/prysm/shared/bytesutil"
|
|
"github.com/prysmaticlabs/prysm/shared/featureconfig"
|
|
"github.com/prysmaticlabs/prysm/shared/params"
|
|
"github.com/sirupsen/logrus"
|
|
"go.opencensus.io/trace"
|
|
)
|
|
|
|
// This defines size of the upper bound for initial sync block cache.
|
|
var initialSyncBlockCacheSize = 2 * params.BeaconConfig().SlotsPerEpoch
|
|
|
|
// onBlock is called when a gossip block is received. It runs regular state transition on the block.
|
|
//
|
|
// Spec pseudocode definition:
|
|
// def on_block(store: Store, block: BeaconBlock) -> None:
|
|
// # Make a copy of the state to avoid mutability issues
|
|
// assert block.parent_root in store.block_states
|
|
// pre_state = store.block_states[block.parent_root].copy()
|
|
// # Blocks cannot be in the future. If they are, their consideration must be delayed until the are in the past.
|
|
// assert store.time >= pre_state.genesis_time + block.slot * SECONDS_PER_SLOT
|
|
// # Add new block to the store
|
|
// store.blocks[signing_root(block)] = block
|
|
// # Check block is a descendant of the finalized block
|
|
// assert (
|
|
// get_ancestor(store, signing_root(block), store.blocks[store.finalized_checkpoint.root].slot) ==
|
|
// store.finalized_checkpoint.root
|
|
// )
|
|
// # Check that block is later than the finalized epoch slot
|
|
// assert block.slot > compute_start_slot_of_epoch(store.finalized_checkpoint.epoch)
|
|
// # Check the block is valid and compute the post-state
|
|
// state = state_transition(pre_state, block)
|
|
// # Add new state for this block to the store
|
|
// store.block_states[signing_root(block)] = state
|
|
//
|
|
// # Update justified checkpoint
|
|
// if state.current_justified_checkpoint.epoch > store.justified_checkpoint.epoch:
|
|
// if state.current_justified_checkpoint.epoch > store.best_justified_checkpoint.epoch:
|
|
// store.best_justified_checkpoint = state.current_justified_checkpoint
|
|
//
|
|
// # Update finalized checkpoint
|
|
// if state.finalized_checkpoint.epoch > store.finalized_checkpoint.epoch:
|
|
// store.finalized_checkpoint = state.finalized_checkpoint
|
|
func (s *Service) onBlock(ctx context.Context, signed *ethpb.SignedBeaconBlock) (*stateTrie.BeaconState, error) {
|
|
ctx, span := trace.StartSpan(ctx, "blockchain.onBlock")
|
|
defer span.End()
|
|
|
|
if signed == nil || signed.Block == nil {
|
|
return nil, errors.New("nil block")
|
|
}
|
|
|
|
b := signed.Block
|
|
|
|
// Retrieve incoming block's pre state.
|
|
preState, err := s.getBlockPreState(ctx, b)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
root, err := stateutil.BlockRoot(b)
|
|
if err != nil {
|
|
return nil, errors.Wrapf(err, "could not get signing root of block %d", b.Slot)
|
|
}
|
|
log.WithFields(logrus.Fields{
|
|
"slot": b.Slot,
|
|
"root": fmt.Sprintf("0x%s...", hex.EncodeToString(root[:])[:8]),
|
|
}).Info("Executing state transition on block")
|
|
|
|
postState, err := state.ExecuteStateTransition(ctx, preState, signed)
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "could not execute state transition")
|
|
}
|
|
|
|
if err := s.beaconDB.SaveBlock(ctx, signed); err != nil {
|
|
return nil, errors.Wrapf(err, "could not save block from slot %d", b.Slot)
|
|
}
|
|
|
|
if err := s.insertBlockToForkChoiceStore(ctx, b, root, postState); err != nil {
|
|
return nil, errors.Wrapf(err, "could not insert block %d to fork choice store", b.Slot)
|
|
}
|
|
|
|
if !featureconfig.Get().DisableNewStateMgmt {
|
|
if err := s.stateGen.SaveState(ctx, root, postState); err != nil {
|
|
return nil, errors.Wrap(err, "could not save state")
|
|
}
|
|
} else {
|
|
if err := s.beaconDB.SaveState(ctx, postState, root); err != nil {
|
|
return nil, errors.Wrap(err, "could not save state")
|
|
}
|
|
}
|
|
|
|
// Update justified check point.
|
|
if postState.CurrentJustifiedCheckpoint().Epoch > s.justifiedCheckpt.Epoch {
|
|
if err := s.updateJustified(ctx, postState); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
// Update finalized check point. Prune the block cache and helper caches on every new finalized epoch.
|
|
if postState.FinalizedCheckpointEpoch() > s.finalizedCheckpt.Epoch {
|
|
if !featureconfig.Get().NoInitSyncBatchSaveBlocks {
|
|
if err := s.beaconDB.SaveBlocks(ctx, s.getInitSyncBlocks()); err != nil {
|
|
return nil, err
|
|
}
|
|
s.clearInitSyncBlocks()
|
|
}
|
|
|
|
if err := s.beaconDB.SaveFinalizedCheckpoint(ctx, postState.FinalizedCheckpoint()); err != nil {
|
|
return nil, errors.Wrap(err, "could not save finalized checkpoint")
|
|
}
|
|
|
|
if featureconfig.Get().DisableNewStateMgmt {
|
|
startSlot := helpers.StartSlot(s.prevFinalizedCheckpt.Epoch)
|
|
endSlot := helpers.StartSlot(s.finalizedCheckpt.Epoch)
|
|
if endSlot > startSlot {
|
|
if err := s.rmStatesOlderThanLastFinalized(ctx, startSlot, endSlot); err != nil {
|
|
return nil, errors.Wrapf(err, "could not delete states prior to finalized check point, range: %d, %d",
|
|
startSlot, endSlot)
|
|
}
|
|
}
|
|
}
|
|
fRoot := bytesutil.ToBytes32(postState.FinalizedCheckpoint().Root)
|
|
|
|
// Prune proto array fork choice nodes, all nodes before finalized check point will
|
|
// be pruned.
|
|
if err := s.forkChoiceStore.Prune(ctx, fRoot); err != nil {
|
|
return nil, errors.Wrap(err, "could not prune proto array fork choice nodes")
|
|
}
|
|
|
|
s.prevFinalizedCheckpt = s.finalizedCheckpt
|
|
s.finalizedCheckpt = postState.FinalizedCheckpoint()
|
|
|
|
if err := s.finalizedImpliesNewJustified(ctx, postState); err != nil {
|
|
return nil, errors.Wrap(err, "could not save new justified")
|
|
}
|
|
|
|
if !featureconfig.Get().DisableNewStateMgmt {
|
|
fRoot := bytesutil.ToBytes32(postState.FinalizedCheckpoint().Root)
|
|
fBlock, err := s.beaconDB.Block(ctx, fRoot)
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "could not get finalized block to migrate")
|
|
}
|
|
if err := s.stateGen.MigrateToCold(ctx, fBlock.Block.Slot, fRoot); err != nil {
|
|
return nil, errors.Wrap(err, "could not migrate to cold")
|
|
}
|
|
}
|
|
}
|
|
|
|
// Epoch boundary bookkeeping such as logging epoch summaries.
|
|
if postState.Slot() >= s.nextEpochBoundarySlot {
|
|
logEpochData(postState)
|
|
reportEpochMetrics(postState)
|
|
|
|
// Update committees cache at epoch boundary slot.
|
|
if err := helpers.UpdateCommitteeCache(postState, helpers.CurrentEpoch(postState)); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := helpers.UpdateProposerIndicesInCache(postState, helpers.CurrentEpoch(postState)); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
s.nextEpochBoundarySlot = helpers.StartSlot(helpers.NextEpoch(postState))
|
|
}
|
|
|
|
// Delete the processed block attestations from attestation pool.
|
|
if err := s.deletePoolAtts(b.Body.Attestations); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// Delete the processed block attester slashings from slashings pool.
|
|
for i := 0; i < len(b.Body.AttesterSlashings); i++ {
|
|
s.slashingPool.MarkIncludedAttesterSlashing(b.Body.AttesterSlashings[i])
|
|
}
|
|
|
|
return postState, nil
|
|
}
|
|
|
|
// onBlockInitialSyncStateTransition is called when an initial sync block is received.
|
|
// It runs state transition on the block and without any BLS verification. The excluded BLS verification
|
|
// includes attestation's aggregated signature. It also does not save attestations.
|
|
func (s *Service) onBlockInitialSyncStateTransition(ctx context.Context, signed *ethpb.SignedBeaconBlock) error {
|
|
ctx, span := trace.StartSpan(ctx, "blockchain.onBlock")
|
|
defer span.End()
|
|
|
|
if signed == nil || signed.Block == nil {
|
|
return errors.New("nil block")
|
|
}
|
|
|
|
b := signed.Block
|
|
|
|
// Retrieve incoming block's pre state.
|
|
preState, err := s.verifyBlkPreState(ctx, b)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Exit early if the pre state slot is higher than incoming block's slot.
|
|
if preState.Slot() >= signed.Block.Slot {
|
|
return nil
|
|
}
|
|
|
|
postState, err := state.ExecuteStateTransitionNoVerifyAttSigs(ctx, preState, signed)
|
|
if err != nil {
|
|
return errors.Wrap(err, "could not execute state transition")
|
|
}
|
|
|
|
root, err := stateutil.BlockRoot(b)
|
|
if err != nil {
|
|
return errors.Wrapf(err, "could not get signing root of block %d", b.Slot)
|
|
}
|
|
if !featureconfig.Get().NoInitSyncBatchSaveBlocks {
|
|
s.saveInitSyncBlock(root, signed)
|
|
} else {
|
|
if err := s.beaconDB.SaveBlock(ctx, signed); err != nil {
|
|
return errors.Wrapf(err, "could not save block from slot %d", b.Slot)
|
|
}
|
|
}
|
|
|
|
if err := s.insertBlockToForkChoiceStore(ctx, b, root, postState); err != nil {
|
|
return errors.Wrapf(err, "could not insert block %d to fork choice store", b.Slot)
|
|
}
|
|
|
|
if !featureconfig.Get().DisableNewStateMgmt {
|
|
if err := s.stateGen.SaveState(ctx, root, postState); err != nil {
|
|
return errors.Wrap(err, "could not save state")
|
|
}
|
|
} else {
|
|
s.initSyncStateLock.Lock()
|
|
defer s.initSyncStateLock.Unlock()
|
|
s.initSyncState[root] = postState.Copy()
|
|
s.filterBoundaryCandidates(ctx, root, postState)
|
|
}
|
|
|
|
// Update justified check point.
|
|
if postState.CurrentJustifiedCheckpoint().Epoch > s.justifiedCheckpt.Epoch {
|
|
if err := s.updateJustified(ctx, postState); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
|
|
// Rate limit how many blocks (2 epochs worth of blocks) a node keeps in the memory.
|
|
if len(s.getInitSyncBlocks()) > int(initialSyncBlockCacheSize) {
|
|
if err := s.beaconDB.SaveBlocks(ctx, s.getInitSyncBlocks()); err != nil {
|
|
return err
|
|
}
|
|
s.clearInitSyncBlocks()
|
|
}
|
|
|
|
// Update finalized check point. Prune the block cache and helper caches on every new finalized epoch.
|
|
if postState.FinalizedCheckpointEpoch() > s.finalizedCheckpt.Epoch {
|
|
if featureconfig.Get().DisableNewStateMgmt {
|
|
startSlot := helpers.StartSlot(s.prevFinalizedCheckpt.Epoch)
|
|
endSlot := helpers.StartSlot(s.finalizedCheckpt.Epoch)
|
|
if endSlot > startSlot {
|
|
if err := s.rmStatesOlderThanLastFinalized(ctx, startSlot, endSlot); err != nil {
|
|
return errors.Wrapf(err, "could not delete states prior to finalized check point, range: %d, %d",
|
|
startSlot, endSlot)
|
|
}
|
|
}
|
|
|
|
if err := s.saveInitState(ctx, postState); err != nil {
|
|
return errors.Wrap(err, "could not save init sync finalized state")
|
|
}
|
|
}
|
|
|
|
if !featureconfig.Get().NoInitSyncBatchSaveBlocks {
|
|
if err := s.beaconDB.SaveBlocks(ctx, s.getInitSyncBlocks()); err != nil {
|
|
return err
|
|
}
|
|
s.clearInitSyncBlocks()
|
|
}
|
|
|
|
if err := s.beaconDB.SaveFinalizedCheckpoint(ctx, postState.FinalizedCheckpoint()); err != nil {
|
|
return errors.Wrap(err, "could not save finalized checkpoint")
|
|
}
|
|
|
|
s.prevFinalizedCheckpt = s.finalizedCheckpt
|
|
s.finalizedCheckpt = postState.FinalizedCheckpoint()
|
|
|
|
if err := s.finalizedImpliesNewJustified(ctx, postState); err != nil {
|
|
return errors.Wrap(err, "could not save new justified")
|
|
}
|
|
|
|
if !featureconfig.Get().DisableNewStateMgmt {
|
|
fRoot := bytesutil.ToBytes32(postState.FinalizedCheckpoint().Root)
|
|
fBlock, err := s.beaconDB.Block(ctx, fRoot)
|
|
if err != nil {
|
|
return errors.Wrap(err, "could not get finalized block to migrate")
|
|
}
|
|
if err := s.stateGen.MigrateToCold(ctx, fBlock.Block.Slot, fRoot); err != nil {
|
|
return errors.Wrap(err, "could not migrate to cold")
|
|
}
|
|
}
|
|
}
|
|
|
|
if featureconfig.Get().DisableNewStateMgmt {
|
|
numOfStates := len(s.boundaryRoots)
|
|
if numOfStates > initialSyncCacheSize {
|
|
if err = s.persistCachedStates(ctx, numOfStates); err != nil {
|
|
return err
|
|
}
|
|
}
|
|
if len(s.initSyncState) > maxCacheSize {
|
|
s.pruneOldNonFinalizedStates()
|
|
}
|
|
}
|
|
|
|
// Epoch boundary bookkeeping such as logging epoch summaries.
|
|
if postState.Slot() >= s.nextEpochBoundarySlot {
|
|
reportEpochMetrics(postState)
|
|
s.nextEpochBoundarySlot = helpers.StartSlot(helpers.NextEpoch(postState))
|
|
|
|
// Update committees cache at epoch boundary slot.
|
|
if err := helpers.UpdateCommitteeCache(postState, helpers.CurrentEpoch(postState)); err != nil {
|
|
return err
|
|
}
|
|
if err := helpers.UpdateProposerIndicesInCache(postState, helpers.CurrentEpoch(postState)); err != nil {
|
|
return err
|
|
}
|
|
|
|
if featureconfig.Get().DisableNewStateMgmt && helpers.IsEpochStart(postState.Slot()) {
|
|
if err := s.beaconDB.SaveState(ctx, postState, root); err != nil {
|
|
return errors.Wrap(err, "could not save state")
|
|
}
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// This feeds in the block and block's attestations to fork choice store. It's allows fork choice store
|
|
// to gain information on the most current chain.
|
|
func (s *Service) insertBlockToForkChoiceStore(ctx context.Context, blk *ethpb.BeaconBlock, root [32]byte, state *stateTrie.BeaconState) error {
|
|
if err := s.fillInForkChoiceMissingBlocks(ctx, blk, state); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Feed in block to fork choice store.
|
|
if err := s.forkChoiceStore.ProcessBlock(ctx,
|
|
blk.Slot, root, bytesutil.ToBytes32(blk.ParentRoot),
|
|
state.CurrentJustifiedCheckpoint().Epoch,
|
|
state.FinalizedCheckpointEpoch()); err != nil {
|
|
return errors.Wrap(err, "could not process block for proto array fork choice")
|
|
}
|
|
|
|
// Feed in block's attestations to fork choice store.
|
|
for _, a := range blk.Body.Attestations {
|
|
committee, err := helpers.BeaconCommitteeFromState(state, a.Data.Slot, a.Data.CommitteeIndex)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
indices := attestationutil.AttestingIndices(a.AggregationBits, committee)
|
|
s.forkChoiceStore.ProcessAttestation(ctx, indices, bytesutil.ToBytes32(a.Data.BeaconBlockRoot), a.Data.Target.Epoch)
|
|
}
|
|
|
|
return nil
|
|
}
|