Commit Graph

1590 Commits

Author SHA1 Message Date
Carl Beekhuizen 2e41f2da3b
Merge pull request #1235 from ethereum/JustinDrake-patch-20
Minor copyedit
2019-06-30 11:17:35 +02:00
Justin ae888e148c
Minor copyedit
Can the linter catch non-capitalised comments?
2019-06-30 08:13:07 +01:00
Justin 6cfd3b5047
Fix typo
Thanks @NIC619 https://github.com/ethereum/eth2.0-specs/pull/1219#discussion_r298818138
2019-06-30 08:10:23 +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
protolambda 8d2cbc9722
add comments to make variations in genesis initialization clear, and about the mix-in in verification 2019-06-30 02:08:34 +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
Justin 2a2bd72425
Update 0_beacon-chain.md 2019-06-29 22:52:01 +01:00
Danny Ryan f0e65709c2
Merge branch 'dev' into ralexstokes-patch-3 2019-06-29 15:50:29 -06:00
Danny Ryan ded936ebad
quick comment on avoiding underflow 2019-06-29 15:49:11 -06:00
Hsiao-Wei Wang 03a243e96c
fix basic test 2019-06-30 05:06:17 +08:00
Justin Drake 6d45513605 Make timestamp a uint64 2019-06-29 21:56:07 +01:00
Justin Drake a356fc9fc8 Fixes 2019-06-29 21:53:04 +01:00
Justin Drake 43beb743e6 typo 2019-06-29 21:39:55 +01:00
Justin Drake ada3cb2ae1 Fix genesis balance bug (git add -u) 2019-06-29 21:36:27 +01:00
Justin Drake 3a5872f8e4 Cleanups and fixes 2019-06-29 21:29:10 +01:00
Justin Drake d00b5b9ea0 Merge is_genesis_trigger into get_genesis_state 2019-06-29 21:18:18 +01:00
Justin Drake 22476420f3 Cleanups; think about merging is_genesis_trigger into get_genesis_state 2019-06-29 21:03:15 +01:00
Hsiao-Wei Wang 12dff5349d
Renames:
1. `Deposit` log -> `DepositEvent` log
2. `get_deposit_root` -> `get_hash_tree_root`
2019-06-30 03:42:00 +08: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
Hsiao-Wei Wang 354cd1c1e1
Clean up leftover and linter 2019-06-30 02:02:05 +08:00
Hsiao-Wei Wang c8dc30eec2
Recover from auto-merge 2019-06-30 01:56:10 +08:00
Justin 6b81e747b2
Fix comment 2019-06-29 18:50:23 +01: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
Hsiao-Wei Wang 7fdf59d012
`active_validator_count >= GENESIS_ACTIVE_VALIDATOR_COUNT`: per Eth1 block 2019-06-29 18:09:05 +08: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 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
Danny Ryan 9993a28796
lint 2019-06-28 11:26:05 -06:00
Danny Ryan b40e2284a0
use active index root for generate seed mix in 2019-06-28 11:20:24 -06:00
Danny Ryan 5a8f3e495a
set committees root for next epoch rather tahn ACTIVaTION_EXIT_DELAY in the future 2019-06-28 11:10:17 -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 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
Justin 05842f8371
Update 0_beacon-chain.md 2019-06-28 15:26:02 +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
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
Dankrad Feist 237b41df5b
Slice notation for justification_bitfield shift 2019-06-28 00:18:54 +01:00
Danny Ryan 990cc55db7
fix committee typing error 2019-06-27 16:32:10 -06:00
Justin Drake 853f5fc3f0 Apply Danny's suggestions 2019-06-27 19:05:27 +01:00