Commit Graph

5982 Commits

Author SHA1 Message Date
Diederik Loerakker 54279f9e3b
Merge pull request #2281 from ethereum/the-merge
Merge `the-merge` into `dev`
2021-03-26 22:27:41 +01:00
Danny Ryan 9f8e627a57
Merge pull request #2257 from mkalinin/consensus-upgrade
Pure consensus upgrade version of the merge
2021-03-26 14:25:34 -06:00
Danny Ryan 223aba3e78
byte-list for opaque transaction payload 2021-03-26 13:50:46 -06:00
Danny Ryan 41a087a78d
minor edits from code review
Co-authored-by: terence tsao <terence@prysmaticlabs.com>
2021-03-26 13:12:53 -06:00
Alex Stokes ccfbf5c70a
Fix use of block root in Altair validator guide 2021-03-26 11:59:01 -07:00
Alex Stokes 875aac4c43
Fix aggregation bits example in Altair validator guide
The sub-index calculation was incorrect when demonstrating how to map a validator in the sync committee to a particular bit in the `aggregation_bits` in the sync committee aggregation scheme. The correct index is given in this commit.
2021-03-26 11:50:48 -07:00
Alex Stokes f9ba7f616e
Fix typo from earlier edit to field name
The field name `aggregation_bits` was changed from `aggregate_bits` to reflect the same usage under the attestation scheme. This PR cleans up left-over references to the old field name in the section header and TOC.
2021-03-26 11:38:47 -07:00
Danny Ryan d773c6ae9e
lint from pr 2021-03-26 08:28:34 -06:00
Barnabé Monnot d1c9b8bade Fix variable name 2021-03-26 19:03:12 +08:00
Barnabé Monnot 582965fd0b Deprecate PROPOSER_REWARD_QUOTIENT from tests 2021-03-26 18:57:02 +08:00
Justin 0481e920f0
Deprecate the use of PROPOSER_REWARD_QUOTIENT 2021-03-26 10:51:29 +00:00
Barnabé Monnot 71d03a411c Scale up weights; use existing constants and new PROPOSER_WEIGHT 2021-03-26 18:36:49 +08:00
Barnabé Monnot 59134fb0ae Modify incentives to preserve invariant 2021-03-26 12:18:51 +08:00
Alex Vlasov 020895e35d
Typing problems fixes (#2271)
* Typing problem fixed: `process_block_header` passes `Bytes32()` to `state_root` of `BeaconBlockHeader`, which type is `Root`

* Typing problem fixed in `initialize_beacon_state_from_eth1`: `len` returns an `int` value, while `deposit_count=uint64` of `Eth1Data` has type `uint64`

* Typing problem fixed in `process_rewards_and_penalties`: `numerator` of type `int` passed to `weight` parameter of `get_flag_index_deltas`, which has type `uint64`

* Typing problem fixed in `process_attestation`; `False` passes as `crosslink_success` parameter of `PendingAttestation`, which has type `boolean`. `False` is an instance of `(python.)bool` and is not an instance of `(ssz.)boolean`

* Typing problem fixed: `shard_data_roots` of `ShardTransition` has type `List[Bytes32]`, but its elements are used as if they were `Root` values, e.g. in `process_chunk_challenge` method: passed to `data_root` of `CustodyChunkChallengeRecord` which has type `Root`

* Typing problem fixed in `process_custody_final_updates`: `index` has type `int`, while `validator_indices_in_records` has type `Set[ValidatorIndex]`, so tesing whether `index in validator_indices_in_records` can be risky, depending on implementation details. `ValidatorIndex(index) in validator_indices_in_records` is a safer variant.

* Typing problem fixed: `slashed` parameter of `pack_compact_validator` has type `(python.)bool`, however in `committee_to_compact_committee` a value of `(ssz.)boolean` is passed as a value of the parameter

* Typing problem fixed: `inactivity_scores` is a `List[uint64,...]`, while it is intialized/appended with values of `(python.)int` type

* fixed according to @protolambda suggestions

* changed types of _WEIGHT constants and appropriate variables/parameters, according to @protolambda suggestions

* revert code formatting back

* Introduced ZERO_ROOT according to @protolambda 's suggestion

* Reverted back to , according to @protolambda comments
2021-03-25 22:03:21 +01:00
Mikhail Kalinin 81a2c2c2b5 Use ByteList[N] and ByteVector[N] types 2021-03-25 18:41:00 +06:00
Mikhail Kalinin 260a0a5273 Polish merge/fork-choice.md 2021-03-25 17:53:15 +06:00
Mikhail Kalinin a23bde347b Bytes1 to byte in ApplicationPayload.logs_bloom 2021-03-25 17:51:32 +06:00
Mikhail Kalinin ee5ecf8e2b Address a new portion of comments and fixes 2021-03-25 17:49:13 +06:00
Hsiao-Wei Wang e095090cf4
Merge pull request #2272 from ethereum/fix-filter-test
patch test_filtered_block_tree test generator
2021-03-25 16:18:00 +08:00
Danny Ryan 6c0a0ab3f2
patch test_filtered_block_tree test generator based on @ajsutton report 2021-03-24 12:57:14 -06:00
Mikhail Kalinin 63ae9f2bdb Standardise PowBlock between fork-choice and validator 2021-03-24 20:58:31 +06:00
Mikhail Kalinin ea5f606bd0 Address various cleanups and formatting suggestions 2021-03-24 16:30:29 +06:00
Danny Ryan 5e83e60a59
Merge pull request #2266 from ethereum/update-altair-aggregation-config
Update Altair config files: add signature domains
2021-03-23 09:35:10 -06:00
Hsiao-Wei Wang ae258bc335
Update config files, add `DOMAIN_SYNC_COMMITTEE_SELECTION_PROOF` and `DOMAIN_CONTRIBUTION_AND_PROOF` 2021-03-23 20:52:03 +08:00
Hsiao-Wei Wang 399d28bfb9
Merge pull request #2263 from terencechain/patch-112
Fix spelling
2021-03-23 18:02:07 +08:00
terence tsao d0b1ac1934
Update beacon-chain.md 2021-03-22 16:28:45 -07:00
Danny Ryan d49cddc1d8
Merge pull request #2255 from ralexstokes/update-subcommittee-name
Use different name for constant for sync committee aggregates
2021-03-22 11:34:32 -06:00
Danny Ryan 3a5f0e994a
Merge pull request #2253 from ethereum/master
backport generator fixes to dev
2021-03-22 11:11:10 -06:00
Danny Ryan 3374784bd3
Merge pull request #2261 from ethereum/altair-test-format-fix
Altair tests - fix mixed up formats
2021-03-22 11:10:56 -06:00
Danny Ryan 69937849f9
Merge pull request #2259 from ethereum/fix-minimal-fork-versions
Altair testing fork version fixes
2021-03-22 11:04:21 -06:00
Danny Ryan 4407c594bf
Merge pull request #2258 from ethereum/justification-altair
reduce justification and finalization Altair diff
2021-03-22 11:03:32 -06:00
Danny Ryan bb85ef5a57
pr cleanup 2021-03-22 10:53:26 -06:00
Mikhail Kalinin 96de910b22 Distinguish invalid and not processed transition block 2021-03-22 21:55:35 +06:00
Mikhail Kalinin 7e6ac4e7f7 Boolean -> boolean 2021-03-22 21:20:05 +06:00
Mikhail Kalinin 83453d212e Simplify merge.BeaconState definition 2021-03-22 21:14:31 +06:00
Mikhail Kalinin 38a455c79f Verify that ApplicationPayload is zeroed before the transition 2021-03-22 20:58:34 +06:00
Mikhail Kalinin 24dc8a277f
Fix block_body variable in is_transition_block
Co-authored-by: terence tsao <terence@prysmaticlabs.com>
2021-03-22 20:54:44 +06:00
protolambda 4dd855667a
fix mixed up formats. Output slots as ints, output genesis eth1 init data as yaml dict 2021-03-22 02:50:05 +01:00
protolambda 4a82a375ae
avoid altair fork version collision, update test prep, fix genesis state creator bug 2021-03-21 22:07:28 +01:00
protolambda 493dd17cc4
reduce justification and finalization Altair diff 2021-03-21 04:22:45 +01:00
Mikhail Kalinin 3420e51a0f Verify transition block to be assembled correctly 2021-03-20 21:46:20 +06:00
Mikhail Kalinin 46fc8a196d Strip down the merge to the pure consensus upgrade 2021-03-20 19:21:11 +06:00
Hsiao-Wei Wang a69ad6c2db
Merge pull request #2256 from ethereum/altair-validator-executable 2021-03-20 08:12:01 +08:00
Hsiao-Wei Wang 2ce389216d
Executable Altair validator guide 2021-03-19 23:38:59 +08:00
Alex Stokes 484fae3c2b
update constant name 2021-03-19 07:59:49 -06:00
Justin 053661ad20
Update beacon-chain.md 2021-03-19 10:04:46 +00:00
Alex Stokes 208a658305
Use different name for constant for sync committee aggregates 2021-03-18 15:53:57 -06:00
Danny Ryan 2f99d0b444
Merge pull request #2251 from ralexstokes/hoist-container-defns
Organize phase 0 validator guide type definitions
2021-03-17 12:50:25 -06:00
Danny Ryan 409cf0fb59
Merge pull request #2252 from ethereum/fix-gens
fix v1.1.0-alpha.1 test generators
2021-03-17 10:53:28 -06:00
Mikhail Kalinin bf151641a7 Add rebase-to-Altair warning 2021-03-17 22:42:29 +06:00