Commit Graph

3243 Commits

Author SHA1 Message Date
Hsiao-Wei Wang c8dc30eec2
Recover from auto-merge 2019-06-30 01:56:10 +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
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 b162a8ff8a
simplify list creation 2019-06-29 16:57:24 +02:00
Hsiao-Wei Wang 7fdf59d012
`active_validator_count >= GENESIS_ACTIVE_VALIDATOR_COUNT`: per Eth1 block 2019-06-29 18:09:05 +08:00
Justin Drake a7ceec1e8a Uncomment tests 2019-06-29 09:28:46 +01:00
Justin Drake d5d3e49c5f Tests pass 2019-06-29 09:25:19 +01:00
Justin Drake 34b8d8ab33 Start modifying test 2019-06-29 09:13:42 +01:00
Justin Drake d820dbd7b1 Compile contract 2019-06-29 09:01:05 +01:00
Justin Drake ad943bbd06 Make deposit root the root of an SSZ vector 2019-06-29 08:39:27 +01:00
Diederik Loerakker b21c9cc71b
Merge pull request #1224 from ethereum/dankrad-patch-8
Add Bitlist and Bitvector
2019-06-29 01:40:56 +02:00
protolambda 4f31207b7f
reword merkleize with limit / length 2019-06-28 22:45:20 +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
Dankrad Feist 6a2d2c84a8
Bitlist for attestation doc 2019-06-28 20:49:57 +01:00
dankrad fa84c49659
Update specs/core/0_beacon-chain.md
Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
2019-06-28 20:23:34 +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
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 25db397550
fix line length lint problem in checkpoint 2019-06-28 17:34:31 +02:00
protolambda 128bbbc665
fix slicing, and support partial slice bounds 2019-06-28 17:27:59 +02:00
Danny Ryan dcb0244a4f get_attesting_indices set instead of sorted (#1225) 2019-06-28 16:19:59 +01:00
protolambda 5ff13dd81a
be explicit about limiting for HTR and chunk padding 2019-06-28 17:07:36 +02:00
Justin 05842f8371
Update 0_beacon-chain.md 2019-06-28 15:26:02 +01:00
Justin 2739767a71
Hardened Eth 1.0 voting strategy (#1218) 2019-06-28 14:43:44 +01: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 e36593b155 Add comment 2019-06-28 12:35:50 +01:00
Justin Drake 6f9d37485d Cleanups 2019-06-28 12:34:01 +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 1a5de80047
Merge pull request #1210 from ethereum/checkpoints
Checkpoints in beacon spec
2019-06-27 21:26:22 -06: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
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 93ce168862
More linting fixes 2019-06-27 16:47:48 +01: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 f57387cc83
Justification bitvector length to constant 2019-06-27 13:09:48 +01:00
Dankrad Feist 80c680e614
Phase 1 to Bitvector/Bitlist 2019-06-27 12:41:22 +01:00
Dankrad Feist becb7a032a
justification_bitfield -> Bitvector[4] 2019-06-27 12:15:31 +01:00