Commit Graph

690 Commits

Author SHA1 Message Date
dankrad ab156f31b1
Merge pull request #1283 from ethereum/n_zero
Clarify the illegal SSZ types
2019-07-29 17:40:38 +01:00
vbuterin de9b4f2d6d
Attestation changes + persistent committee changes (#1294)
* Minimal attestation simplification

* minor fix

* Make the tests pass

* Decrease `PLACEHOLDER`, Use `compute_epoch_of_shard_slot`

* Fix proposer signature name and use get_seed() to calculate current_shuffling_seed

* Fix linter error

* Add the WIP `test_is_valid_shard_block`

* Add `get_shard_block_attester_committee`

* Simplified committee selection

* Added some helpers and simplified

* Update specs/core/1_shard-data-chains.md

* Update 1_shard-data-chains.md

* Simplified switchover epochs, changed block structure, changed crosslink structure

* Update 1_shard-data-chains.md

* Moved balance dependency to proposer selection

* Update specs/core/1_shard-data-chains.md

Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>

* Update specs/core/1_shard-data-chains.md

Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>

* Update specs/core/1_shard-data-chains.md

Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>

* Update specs/core/1_shard-data-chains.md

Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>

* Update specs/core/1_shard-data-chains.md

Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>

* Update specs/core/1_shard-data-chains.md

Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>

* Update specs/core/1_shard-data-chains.md

Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>

* Update specs/core/1_shard-data-chains.md

* Fixed shard header flattening

* Update specs/core/1_shard-data-chains.md

* Minor fixes

* Update specs/core/1_shard-data-chains.md

* Update specs/core/1_shard-data-chains.md

Co-Authored-By: Hsiao-Wei Wang <hwwang156@gmail.com>

* cleanup testing and lint

* return none if not active validators in persistent committee

* only allow active validators as shard proposer
2019-07-29 09:47:35 -04:00
protolambda adb6bff365
make random value generator respect byte list type limit 2019-07-27 23:57:57 +02:00
protolambda c628c8187b
SSZ static format updated to per-case outputs 2019-07-27 13:34:19 +02:00
protolambda d7728e60c9
handle meta tags passed from inner testgen decorator 2019-07-27 00:26:05 +02:00
protolambda 8a83fce3ab
fixes to decorator order, and make functions fully yield, with pytest compat. 2019-07-26 23:53:03 +02:00
protolambda e8b3f9985b
update testgen, make epoch proc work 2019-07-26 22:40:49 +02:00
protolambda 69052ac750
Update testgen code, and if force is not on, test generation won't run if it already exists. 2019-07-26 19:19:36 +02:00
protolambda b73625fbf1
update test generation code (work in progress), improve the simplicity of configuration in context of forks, and update docs 2019-07-25 23:13:33 +02:00
Diederik Loerakker d791e9f7e8
Merge pull request #1319 from ethereum/compact_committees-shard
Fix start shard for compact committees root
2019-07-25 21:40:06 +02:00
Hsiao-Wei Wang f1db318acb
Merge pull request #1289 from ethereum/update_ssz_fuzzing
Bump `py-ssz` to `0.1.3` and update the fuzzing tests
2019-07-26 03:34:04 +08:00
Danny Ryan 1ec20f6c1f
do not reset start_shard until after processing compact root 2019-07-25 12:59:38 -06:00
Danny Ryan bd69dc7e3c
add tests for bit lengths 2019-07-25 12:28:29 -06:00
Hsiao-Wei Wang 62772c9e79
Refactor 2019-07-25 19:41:12 +08:00
Hsiao-Wei Wang 47714cbf64
Add hash_tree_root tests against py-ssz 2019-07-25 19:38:03 +08:00
Hsiao-Wei Wang f336e7ffb3
Rename `is_empty` to `is_zero` 2019-07-25 17:32:27 +08:00
Hsiao-Wei Wang 82e2c559ca
ssz==0.1.3 2019-07-25 00:16:29 +08:00
Hsiao-Wei Wang db9091f507
Add `AttestationDataAndCustodyBit` back 2019-07-23 16:47:52 +08:00
Hsiao-Wei Wang b08ecb018a
Apply suggestions from code review
Co-Authored-By: Diederik Loerakker <proto@protolambda.com>
2019-07-23 16:47:52 +08:00
Hsiao-Wei Wang f229d21faa
Bump `py-ssz` to `0.1.0a11` and update the fuzzing tests 2019-07-23 16:47:49 +08:00
Hsiao-Wei Wang bfd5010f26
Bump `py_ecc==1.7.1` 2019-07-16 14:27:34 +08:00
Danny Ryan 77f007cab5
Merge pull request #1267 from ethereum/dankrad-patch-9
Define Bitlist/Bitvector serialization using bytes, not bigints
2019-07-14 17:20:12 -06:00
protolambda b98679957b
use as_bytes function to reduce code duplication, and for later usage 2019-07-12 22:11:33 +02:00
protolambda 5a13684c7f
make exceeding limit raise an error 2019-07-12 21:23:45 +02:00
protolambda 65b0311582
more explicit about merkleization limit/pad 2019-07-12 20:39:55 +02:00
protolambda b2c8570606
fix merkleization with 0-limit case, and enforce padding limit 2019-07-12 19:09:33 +02:00
Danny Ryan 6dc306700b avoid overflow in slashing penalty calculation (#1286)
Change presentation to avoid uint64 overflow in slashing penalty calculation. (Factor out `EFFECTIVE_BALANCE_INCREMENT` from `validator.effective_balance`.)
2019-07-11 09:53:51 +01:00
dankrad 619b2a3573
Update test_libs/pyspec/eth2spec/utils/ssz/ssz_impl.py
Co-Authored-By: Diederik Loerakker <proto@protolambda.com>
2019-07-03 15:10:37 +01:00
Dankrad Feist 6422acdcdd
Cosmetic change: Define Bitlist/Bitvector serialization using bytes, not bigints 2019-07-03 13:31:03 +01:00
Danny Ryan 17b0bc35d8
add json encoding for bitlist and vector 2019-06-30 22:04:47 -06:00
Danny Ryan e1030843d6
Merge branch 'dev' into last-minute-cleanups-2 2019-06-30 22:11:48 -05:00
Danny Ryan 350b9d79ae
Merge pull request #1250 from ethereum/fork_choice_rule_test
Fix `justified_checkpoint` update
2019-06-30 22:03:27 -05:00
Hsiao-Wei Wang 83a68feac6
Merge branch 'dev' into last-minute-cleanups-2 2019-07-01 09:36:13 +08:00
Hsiao-Wei Wang 8b65127c68
fix 2019-07-01 09:33:28 +08:00
Danny Ryan af5719031c
Merge branch 'dev' into fix-bls-domain-type 2019-06-30 20:28:18 -05:00
Hsiao-Wei Wang 9e5117aff7
Merge branch 'dev' into fork_choice_rule_test 2019-07-01 09:27:55 +08:00
Hsiao-Wei Wang b29c751cb7
Merge branch 'dev' into last-minute-cleanups-2 2019-07-01 09:25:06 +08:00
Danny Ryan 2ab55bf1e4
Merge pull request #1247 from ethereum/add-active-index-roots-back
add back in active_index_roots
2019-06-30 19:23:15 -06:00
Hsiao-Wei Wang 5b2b3cfe33
class DomainType would be added in build_spec 2019-07-01 09:03:35 +08:00
Hsiao-Wei Wang 1869cfed2e
test finalized_checkpoint update 2019-07-01 07:48:20 +08:00
Justin Drake aeba6ee8fb compute_domain for consistency with get_domain 2019-07-01 00:35:09 +01:00
protolambda ab2001e237
Merge branch 'dev' into last-minute-cleanups 2019-07-01 01:17:18 +02:00
protolambda b7e8733812
fix usage of bls withdrawal byte in tests 2019-07-01 00:36:24 +02:00
Hsiao-Wei Wang 84d8ca740c
Improve fork choice rule test coverage 2019-07-01 06:33:10 +08:00
protolambda bde73b59fc
fix bls_verify_multiple 2019-07-01 00:00:54 +02:00
Carl Beekhuizen 6e5f43c033
merge in `dev` and resolve conflicts 2019-06-30 23:37:56 +02:00
Carl Beekhuizen 918192cdab
`compute_slot_epoch`->`compute_epoch_of_slot` 2019-06-30 23:35:07 +02:00
Carl Beekhuizen fe68a8d1f0
Minor python style tweaks 2019-06-30 22:59:12 +02:00
Danny Ryan c42b26b0c4
add back in active_index_roots 2019-06-30 15:19:52 -05:00
protolambda e53063c08d
type BLS domain and domain type 2019-06-30 22:12:49 +02:00
Carl Beekhuizen cb71409114
Merge in `dev` 2019-06-30 22:03:19 +02:00
Justin Drake 9b5e18b61c Last minute cleanups 2019-06-30 20:51:10 +01:00
Danny Ryan 83e961d5cc
Merge branch 'dev' into update-generators 2019-06-30 14:48:12 -05:00
Carl Beekhuizen 0fd1d38417
`Misc` function rename 2019-06-30 20:58:02 +02:00
Danny Ryan 4aa676bae7
fix mainnet attestation test 2019-06-30 13:52:35 -05:00
Danny Ryan 6d5e4da3e0
PR feedback 2019-06-30 12:42:24 -05:00
protolambda 8415e6c79d
mark incompatible mainnet tests 2019-06-30 18:42:54 +02:00
protolambda cb01f3ccd9
speed up remaining attestation tests by mocking slots 2019-06-30 18:40:43 +02:00
protolambda 4b93f5d921
disable some super-long tests, and fix a few attestation signatures 2019-06-30 18:15:36 +02:00
Justin Drake 0be2b8e620 Cleanup 2019-06-30 16:10:22 +01:00
protolambda bf618f8d28
fix encoder to also encode bytes nicely 2019-06-30 15:37:59 +02:00
protolambda b38802ced0
accept yielded lists, encode per item 2019-06-30 15:27:31 +02:00
protolambda c1317640c4
genesis tests generator 2019-06-30 15:26:54 +02:00
Justin Drake 94404a5856 A few more cleanups 2019-06-30 14:11:46 +01:00
protolambda 64b02ebecc
fix genesis tests 2019-06-30 15:01:30 +02:00
protolambda da090b67f6
document genesis test vector format, fix missing label and assertion in tests 2019-06-30 14:58:53 +02:00
Justin Drake e8532ced79 WIP 2019-06-30 10:56:14 +01:00
Justin Drake 369c457d76 WIP2 2019-06-30 10:11:23 +01:00
Justin Drake d0acd81157 WIP 2019-06-30 10:02:18 +01:00
Danny Ryan 2f43f9c339
Merge pull request #1202 from ethereum/test_genesis
Add `test_genesis.py` and fix `is_genesis_trigger`
2019-06-29 23:31:32 -05:00
Danny Ryan f1749df587
minor typo 2019-06-29 22:25:51 -06:00
protolambda 4d5d5971e2
fix genesis tests; sign deposit-datas, and lower min validator count for testing 2019-06-30 02:10:18 +02:00
Hsiao-Wei Wang 47cdae4292
Refactor
1. Rename the current `get_genesis_beacon_state(...)` to `initialize_beacon_state_from_eth1(...)`
2. Extract `is_valid_genesis_state(state: BeaconState) -> bool` from `initialize_beacon_state_from_eth1(...)`
2019-06-30 06:38:30 +08:00
Danny Ryan 34ad123a46
Merge pull request #1206 from ethereum/cov-hunt
Test coverage improvements
2019-06-29 16:09:52 -05:00
Hsiao-Wei Wang 03a243e96c
fix basic test 2019-06-30 05:06:17 +08:00
Justin Drake a356fc9fc8 Fixes 2019-06-29 21:53:04 +01:00
Justin Drake 3a5872f8e4 Cleanups and fixes 2019-06-29 21:29:10 +01:00
protolambda 36dd977b85
fix finalize on double justification in 123 rule 2019-06-29 22:27:05 +02:00
protolambda afb33ddc5b
fix typo in justification wording 2019-06-29 21:39:10 +02:00
protolambda 302b3afe2a
rename/fix roots in justification tests for consistency 2019-06-29 21:37:54 +02:00
Hsiao-Wei Wang 56caa48314
Should use Sequence 2019-06-30 03:27:25 +08:00
Hsiao-Wei Wang 125660c5af
Update input `deposits` type from `Sequence[Deposit]` to `List[Deposit, 2**DEPOSIT_CONTRACT_TREE_DEPTH` and fix tests 2019-06-30 03:20:11 +08:00
protolambda ff185c3486
fix deposit state mocking for tests 2019-06-29 20:40:25 +02:00
protolambda fb165dc14e
fixes a few tests, not all 2019-06-29 20:33:11 +02:00
protolambda e4eebef3a4
fix broken deposits test, now same error as others 2019-06-29 20:09:43 +02:00
Hsiao-Wei Wang 354cd1c1e1
Clean up leftover and linter 2019-06-30 02:02:05 +08:00
Hsiao-Wei Wang 1b66323806
head to 1229 2019-06-30 01:44:17 +08:00
Hsiao-Wei Wang d4755653ff
Merge branch 'deposit-root' into test_genesis 2019-06-30 01:33:29 +08:00
Danny Ryan 2857324016
Merge branch 'dev' into committee-roots 2019-06-29 11:21:13 -06:00
Hsiao-Wei Wang d0009b0980
Pass `genesis_eth1_block_hash` instead of `genesis_eth1_data` 2019-06-30 01:12:25 +08:00
Justin Drake f0a8e39243 WIP 2019-06-29 17:29:21 +01:00
protolambda 5d633bfdf3
bugfix attestation creation so that it works on mainnet with multiple committees per slot, and improve bitfield index descriptions 2019-06-29 18:14:17 +02:00
Carl Beekhuizen 0c29c5125f
Finnish refactor 2019-06-29 17:10:12 +02:00
Carl Beekhuizen 4ed7af7bac
mock attestation refactor 2019-06-29 15:48:39 +02:00
Carl Beekhuizen 0680d8cc53
Makes justification ratios more marginal 2019-06-29 14:35:07 +02:00
Carl Beekhuizen 2eca6ef09d
Corrects justification comments 2019-06-29 13:10:09 +02:00
Carl Beekhuizen f9ca7c97c9
Fix 123 finalisation 2019-06-29 13:01:59 +02:00
Carl Beekhuizen b05bebf45c
Fix list slicing 2019-06-29 12:23:03 +02:00
Danny Ryan 129fd6297e
add shard to mock crosslink to separate attestations from eachother 2019-06-29 00:03:06 -06:00
Danny Ryan 022f1e7108
fix source/target 2019-06-28 23:59:20 -06:00
Danny Ryan bc5e947efc
aggregation_bitfield - bits 2019-06-28 23:38:14 -06:00
Danny Ryan 1885e285e3
fix source/target epochs in test_12 2019-06-28 23:28:36 -06:00
Danny Ryan f484b1e98c
some fixes to finality_12 2019-06-28 23:21:25 -06:00
protolambda cfbdee709b
finalization testing 2019-06-29 05:04:25 +02:00
protolambda afb34c71e6
fix broken block test for checkpoint use 2019-06-29 03:22:14 +02:00
protolambda efd9d173d7
update attester slashings processing tests 2019-06-29 03:19:57 +02:00
protolambda 518db42de7
fix attestation tests to work with checkpoints 2019-06-29 03:19:30 +02:00
protolambda d31f1b2353
Merge branch 'dev' into cov-hunt 2019-06-29 02:30:53 +02:00
protolambda 3a60f64b92
refactor finalization test helper func 2019-06-29 01:22:29 +02:00
dankrad be04eb2673
Change copy style, and remove deepcopy import
Update test_libs/pyspec/eth2spec/test/phase_0/block_processing/test_process_attestation.py

Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
2019-06-28 22:13:59 +02:00
dankrad 4dcb47e393
Update test_libs/pyspec/eth2spec/test/phase_0/block_processing/test_process_attestation.py
Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
2019-06-28 20:52:06 +01:00
Hsiao-Wei Wang 7bc6a46eaa
Fix `build_deposit` 2019-06-29 02:51:24 +08:00
Hsiao-Wei Wang cb2bfd67dc
Apply Proto's feedback of list(map(...)) 2019-06-29 02:27:48 +08:00
Hsiao-Wei Wang 4dc526fbb7
In the end, `get_merkle_root` is back 2019-06-29 02:16:49 +08:00
Danny Ryan b88ab250fa
Merge branch 'dev' into committee-roots 2019-06-28 12:07:50 -06:00
protolambda 5f0e58364f
resolved merge conflicts, take attesters seq->set change from dev, take bits rework from bitlistvector PR 2019-06-28 18:17:13 +02:00
protolambda 128bbbc665
fix slicing, and support partial slice bounds 2019-06-28 17:27:59 +02:00
vbuterin c764202a57 Slashing penalty calculation change (#1217)
If the exit queue is very long, then a validator may take many months to exit. With the code as currently written, however, self-slashing is a potentially lucrative route to get one's money out faster, because one can exit in 36 days.

This PR changes it so that slashing can only extend your withdrawal time, not contract it. Also, instead of the slashed balances used to calculate one's slashing penalty being those in `[withdrawal - 54 days ... withdrawal - 18 days]`, we now run the penalization algorithm once every 36 days that a validator is slashed but not withdrawn, so that it covers the 36-day period where the validator was actually slashed.  It also moves the minimum slashing penalty to the `slash_validator` function so that it is only applied once.

We also simplify the `slashed_balances` logic to be per-epoch.
2019-06-28 14:35:26 +01:00
Justin Drake 196ac42025 Cleanup naming 2019-06-28 12:23:22 +01:00
Carl Beekhuizen 0ba933e088
Merge pull request #1209 from ethereum/early_secret_test
Resolves issue in early_secret_reveal() testing
2019-06-28 11:58:40 +02:00
Dankrad Feist 2622548ba7
Merge remote-tracking branch 'origin/dev' into dankrad-patch-8
# Conflicts:
#	specs/core/0_beacon-chain.md
2019-06-28 08:36:45 +01:00
Danny Ryan 140c69f2ec
Merge branch 'dev' into checkpoints 2019-06-27 21:02:48 -06:00
Hsiao-Wei Wang 2252142e01
padding version normal merkle tree 2019-06-28 10:24:16 +08:00
Dankrad Feist 2677d233a8
Some more (shorter) Bitvector and Bitlist tests 2019-06-28 00:31:37 +01:00
Dankrad Feist 237b41df5b
Slice notation for justification_bitfield shift 2019-06-28 00:18:54 +01:00
protolambda 384fa8854a
justification/finalization testing groundwork 2019-06-28 00:19:55 +02:00
Dankrad Feist 7adf07ea5f
A few more tests for Bitvector/Bitlist 2019-06-27 22:58:44 +01:00
Carl Beekhuizen 543729cad4
Merge pull request #1198 from ethereum/fork-choice-epoch
modify fork choice to utilize epochs properly
2019-06-27 19:14:19 +02:00
Dankrad Feist afd86f71de
Fixes in ssz impl 2019-06-27 16:31:33 +01:00
Dankrad Feist 2cb23d35ea
Merge remote-tracking branch 'origin/bitfield-suggestion' into dankrad-patch-8 2019-06-27 16:30:41 +01:00
Dankrad Feist 8ed638bb84
Linter fixes 2019-06-27 15:21:04 +01:00
Dankrad Feist b574a58109
Remove not working py-ssz decoder tests 2019-06-27 14:45:17 +01:00
protolambda a5154da1ff
suggestion to implement bitfield like 2019-06-27 15:40:40 +02:00
Dankrad Feist becb7a032a
justification_bitfield -> Bitvector[4] 2019-06-27 12:15:31 +01:00
Dankrad Feist 67c50cb197
Changed attestation and custody bitfields 2019-06-27 12:15:29 +01:00
Dankrad Feist 494984f7d3
Fix linting errors 2019-06-27 10:42:14 +01:00
Dankrad Feist 23c743570e
Add some tests and fix pack 2019-06-27 10:26:45 +01:00
Dankrad Feist 02f6ba36f0
Add Bitvector and Bitlist
Bool, Bit -> boolean, bit
Fix simple-serialize.md
2019-06-27 09:51:06 +01:00
Justin Drake bcfe383e25 WIP 2019-06-27 08:44:44 +01:00
protolambda e49519a53b
wrong end epoch test 2019-06-27 02:50:49 +02:00
protolambda a0c2f5c6b5
fix genesis testing code, add missing constant temporarily, fix py Generator/map/list problems 2019-06-27 01:57:30 +02:00
protolambda aecaed7a66
move genesis tests, structure properly, add yield keys for future test-vec generator 2019-06-27 01:56:52 +02:00
protolambda a62d0261ca
merge with dev, fixed now 2019-06-27 01:31:10 +02:00
protolambda 235c3d6841
re-enable test_empty_epoch_transition_not_finalizing for minimal config 2019-06-27 00:58:25 +02:00
protolambda f7b3c87715
check invalid state root 2019-06-27 00:43:50 +02:00
protolambda 8445d1d90c
fix formatting for lint 2019-06-27 00:37:32 +02:00
protolambda ff2d711d51
test block application on same and on previous slot state 2019-06-27 00:37:20 +02:00
protolambda 7a418ed682
test messed up indices in attester slashings 2019-06-26 23:40:56 +02:00
protolambda 24aa0646c0
new process-slashings tests, and epoch processing bugfix with transition-to-excl not working when not yielded from 2019-06-26 22:22:21 +02:00
protolambda 46dc3f39bb
detach crosslink tests from extra block 2019-06-26 22:22:21 +02:00