866d3f30cc
Merge pull request #1299 from ethereum/master
...
backport v0.8.1 to dev
2019-07-15 19:34:51 +02:00
ef659144b4
make zero hash representation clear, fixes #1282
2019-07-15 02:05:16 +02:00
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
07a0e7b7dd
Merge pull request #1292 from ethereum/correct-merkle
...
Correct merkleization
2019-07-14 17:19:39 -06:00
d9fd1d3a2a
improve type wording based on PR 1292 feedback
2019-07-15 00:13:00 +02:00
8970b71ca4
ensure min_seed_lookahead functions properly
2019-07-14 16:05:51 -06:00
9401383317
Merge pull request #1275 from ethereum/minor-cosmetics
...
Minor cosmetic fixes
2019-07-14 15:36:24 -06:00
ac6d019870
bits serialization clear now, directly to bytes
2019-07-12 22:20:07 +02:00
a8dc9157b8
clean up merkleization text in SSZ spec
2019-07-12 21:15:28 +02:00
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
4def681a4e
Remove another unnecessary list materialization
2019-07-10 17:05:49 -07:00
b80d6e0495
Avoid unnecessary materialization of list
...
There is a realization of a `list` in the `get_unslashed_attesting_indices` helper that is unnecessary.
The functionality in this PR is the same so this change should only really be cosmetic wrt the spec.
2019-07-10 17:00:11 -07:00
57c0eee197
Merge pull request #1285 from decanus/patch-24
...
Update 0_beacon-chain.md
2019-07-10 12:34:53 -06:00
0eadf61631
Update 0_beacon-chain.md
2019-07-10 13:11:34 -04:00
25ec084cc5
To fit in `MAX_TRANSFERS=0` case
2019-07-10 17:20:50 +08:00
1644ae6125
Clarify the illegal types
2019-07-10 16:46:59 +08:00
591f9658d3
Copy edit
2019-07-05 15:04:57 +01:00
c8c810c0e1
Minor fixes
2019-07-05 15:03:37 +01:00
d04d81038a
Merge pull request #1271 from ethereum/hwwhww/ssz-clarify
...
Cosmetic SSZ spec + add `pack()` in `Bitvector` and `Bitlist` Merkleization
2019-07-05 15:27:40 +08:00
21535fe901
Fix indent
2019-07-04 21:38:08 +08:00
f37aa1acde
Add `pack()` for `Bitvector` and `Bitlist` Merkleization
2019-07-04 21:35:55 +08:00
d483a3b573
Set default `pad_for=1`
2019-07-04 21:17:21 +08:00
733653f169
Update some missing type hinting of phase 1
2019-07-04 20:52:58 +08:00
bc39f39d5d
Move `SECONDS_PER_SLOT` back to 0_beacon_chain spec so that the "duration" notes make more sense
2019-07-04 20:41:00 +08:00
b3d65368a1
`PERSISTENT_COMMITTEE_PERIOD` has been defined in phase 0
2019-07-04 20:38:18 +08:00
88892028dc
update test formats list in readme
2019-07-02 12:35:26 -06:00
f8fa6f0046
Update 0_beacon-chain.md
2019-07-02 05:43:17 +02:00
ea2f577a8d
Update 0_beacon-chain.md
2019-07-02 05:31:49 +02:00
4ea79ee13b
Merge pull request #1257 from ethereum/scale-inclusion-reward
...
scale inclusion reward properly
2019-06-30 23:08:05 -05:00
de95f54c4f
Merge pull request #1256 from ethereum/misc_fix
...
[meta] Fix ToC of SSZ spec and Use relative inner repo link
2019-06-30 22:49:31 -05:00
126591b2f9
scale inclusion reward properly
2019-06-30 22:34:35 -05:00
ac741c096d
Fix ToC of SSZ spec
2019-07-01 11:29:10 +08:00
63d4653453
remove unnecessary casting
2019-06-30 22:29:02 -05:00
82d3c4f606
Merge pull request #1251 from ethereum/last-minute-cleanups-2
...
#1244 without "5 slots is a `Slot`"
2019-06-30 22:22:23 -05:00
93fc81e761
Use relative inner repo link
2019-07-01 11:22:18 +08:00
476dbdb153
add time param back tp units
2019-06-30 22:14:53 -05:00
e1030843d6
Merge branch 'dev' into last-minute-cleanups-2
2019-06-30 22:11:48 -05:00
200da4de93
Merge branch 'dev' into v_guide_checkpoint
2019-06-30 22:08:23 -05:00
2855e43551
Merge pull request #1236 from ethereum/exec_v_spec
...
Executable Validator Guide
2019-06-30 22:05:45 -05:00
350b9d79ae
Merge pull request #1250 from ethereum/fork_choice_rule_test
...
Fix `justified_checkpoint` update
2019-06-30 22:03:27 -05:00
2539406324
Merge branch 'dev' into exec_v_spec
2019-06-30 22:00:18 -05:00
4f360a58e2
Fix outdated `fork.slot` and `attestation_data.slot`
2019-07-01 10:58:09 +08:00
f7ed186447
Use `Checkpoint`
2019-07-01 10:46:22 +08:00
f4907d67ee
clean up commitee assignment typing
2019-06-30 20:44:02 -05:00
83a68feac6
Merge branch 'dev' into last-minute-cleanups-2
2019-07-01 09:36:13 +08:00
af5719031c
Merge branch 'dev' into fix-bls-domain-type
2019-06-30 20:28:18 -05:00
9e5117aff7
Merge branch 'dev' into fork_choice_rule_test
2019-07-01 09:27:55 +08:00
b29c751cb7
Merge branch 'dev' into last-minute-cleanups-2
2019-07-01 09:25:06 +08:00
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
155158f461
Merge pull request #1241 from ethereum/rename_misc
...
Renaming of functions in the `Misc` section
2019-06-30 19:21:10 -06:00
e061972eee
Revert State list lengths
2019-07-01 09:17:03 +08:00
b08d1d8d73
fix associtivity in conditional
2019-06-30 20:13:27 -05:00
8da447f607
Revert "5 slots is a `Slot`"
2019-07-01 09:07:33 +08:00
1698263621
BLS domain => domain
2019-07-01 00:36:19 +01:00
aeba6ee8fb
compute_domain for consistency with get_domain
2019-07-01 00:35:09 +01:00
4f47e30144
separates out `domain`
2019-07-01 01:22:58 +02:00
ab2001e237
Merge branch 'dev' into last-minute-cleanups
2019-07-01 01:17:18 +02:00
7ef98f7478
Compact `get_domain` calls
2019-07-01 01:06:27 +02:00
c79f93fe99
Merge pull request #1248 from ethereum/fix-effective-balance
...
Fix genesis effective balance
2019-07-01 01:03:51 +02:00
b582afed84
Add back effective balance initialisation
2019-06-30 23:49:53 +01:00
6a799903a9
Simplify
2019-06-30 23:36:26 +01:00
84d8ca740c
Improve fork choice rule test coverage
2019-07-01 06:33:10 +08:00
ca731d32cf
Merge in `dev` and resolve conflicts
2019-07-01 00:27:27 +02:00
393c583d06
move endianness to be a constant
2019-07-01 00:21:19 +02:00
41897e779a
validate_indexed_attestation -> is_valid_indexed_attestation`
2019-07-01 00:10:28 +02:00
7f2eb813cb
minor BLS domain type related improvements
2019-07-01 00:05:40 +02:00
9df17f5494
Explitcit zero byte
2019-06-30 22:58:02 +01:00
cf59c303f0
Remove index_count
2019-06-30 22:50:01 +01:00
6e5f43c033
merge in `dev` and resolve conflicts
2019-06-30 23:37:56 +02:00
918192cdab
`compute_slot_epoch`->`compute_epoch_of_slot`
2019-06-30 23:35:07 +02:00
db8bd07eeb
Merge pull request #1249 from ethereum/format_binary_operations
...
Minor python style tweaks
2019-06-30 16:18:34 -05:00
8b10ed598e
Adds a lone space
2019-06-30 23:14:16 +02:00
fe68a8d1f0
Minor python style tweaks
2019-06-30 22:59:12 +02:00
67b0b4ad33
Update other spec files
2019-07-01 04:57:42 +08:00
d329e90aa5
Fix effective balance
2019-06-30 21:27:01 +01:00
c42b26b0c4
add back in active_index_roots
2019-06-30 15:19:52 -05:00
d45b73389e
update BLS test generator and format to reflect spec change in BLS
2019-06-30 22:18:52 +02:00
e53063c08d
type BLS domain and domain type
2019-06-30 22:12:49 +02:00
fb598bc70c
Update ToC
2019-07-01 04:11:17 +08:00
cb71409114
Merge in `dev`
2019-06-30 22:03:19 +02:00
3d2eaa22cb
Merge pull request #1238 from ethereum/update-generators
...
Update test vector generators
2019-06-30 14:57:13 -05:00
f1931c030f
Fix
2019-06-30 20:56:55 +01:00
361732f409
merge in dev and resolve conflicts
2019-06-30 21:54:30 +02:00
e4a225ba68
BLS_WITHDRAWAL_PREFIX a Bytes1
2019-06-30 20:51:44 +01:00
9b5e18b61c
Last minute cleanups
2019-06-30 20:51:10 +01:00
c2a4838f5a
Implments suggestions from review
2019-06-30 21:49:29 +02:00
83e961d5cc
Merge branch 'dev' into update-generators
2019-06-30 14:48:12 -05:00
e0a0f6e156
Makes markdown comply with linter
2019-06-30 21:25:58 +02:00
1ba955b5f0
Update specs/test_formats/epoch_processing/README.md
...
Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
2019-06-30 21:19:19 +02:00
9deb4090b0
Merge branch 'dev' into exec_v_spec
...
* dev:
delayed_activation_exit_epoch -> compute_activation_exit_epoch
remove 'int' types from spec typehints. replace with uint64
'beacon state getters' -> ' beacon state accessors'
PR feedback
Cleanup
Fix bug
ready for review
A few more cleanups
Push draft
WIP
WIP2
WIP
2019-06-30 21:03:27 +02:00
0fd1d38417
`Misc` function rename
2019-06-30 20:58:02 +02:00
6be1404b66
delayed_activation_exit_epoch -> compute_activation_exit_epoch
2019-06-30 13:16:56 -05:00
d1bc2f03ac
remove 'int' types from spec typehints. replace with uint64
2019-06-30 13:00:22 -05:00
3ae077a09b
'beacon state getters' -> ' beacon state accessors'
2019-06-30 12:51:13 -05:00
6d5e4da3e0
PR feedback
2019-06-30 12:42:24 -05:00
0be2b8e620
Cleanup
2019-06-30 16:10:22 +01:00
91f55f55b5
make BLS test format and output consistent with spec
2019-06-30 16:07:54 +02:00
423d6dcb29
Fix bug
2019-06-30 14:45:36 +01:00
e873bb6e59
ready for review
2019-06-30 14:32:50 +01:00
94404a5856
A few more cleanups
2019-06-30 14:11:46 +01:00
83d91f81db
update sanity slots description to match new transition naming
2019-06-30 15:03:50 +02:00
da090b67f6
document genesis test vector format, fix missing label and assertion in tests
2019-06-30 14:58:53 +02:00
992a51b587
add note to block operatiosn test format
2019-06-30 14:35:07 +02:00
abdcbc4972
update epoch processing tests generation and format
2019-06-30 14:32:38 +02:00
58c864ddf4
Push draft
2019-06-30 11:01:54 +01:00
e8532ced79
WIP
2019-06-30 10:56:14 +01:00
fa7f80157d
Merge branch 'dev' into exec_v_spec
...
* dev: (112 commits)
Minor copyedit
Fix typo
minor typo
fix genesis tests; sign deposit-datas, and lower min validator count for testing
add comments to make variations in genesis initialization clear, and about the mix-in in verification
Refactor
Update 0_beacon-chain.md
quick comment on avoiding underflow
fix basic test
Make timestamp a uint64
Fixes
typo
Fix genesis balance bug (git add -u)
Cleanups and fixes
fix finalize on double justification in 123 rule
Merge is_genesis_trigger into get_genesis_state
Cleanups; think about merging is_genesis_trigger into get_genesis_state
Renames:
fix typo in justification wording
rename/fix roots in justification tests for consistency
...
2019-06-30 11:19:21 +02:00
f6322e199b
Fixes typing and Makefile
2019-06-30 11:18:36 +02:00
2e41f2da3b
Merge pull request #1235 from ethereum/JustinDrake-patch-20
...
Minor copyedit
2019-06-30 11:17:35 +02:00
369c457d76
WIP2
2019-06-30 10:11:23 +01:00
d0acd81157
WIP
2019-06-30 10:02:18 +01:00
1d9fe90d97
Makes v-guide executable
2019-06-30 10:58:04 +02:00
ae888e148c
Minor copyedit
...
Can the linter catch non-capitalised comments?
2019-06-30 08:13:07 +01:00
6cfd3b5047
Fix typo
...
Thanks @NIC619 https://github.com/ethereum/eth2.0-specs/pull/1219#discussion_r298818138
2019-06-30 08:10:23 +01:00
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
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
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
2a2bd72425
Update 0_beacon-chain.md
2019-06-29 22:52:01 +01:00
f0e65709c2
Merge branch 'dev' into ralexstokes-patch-3
2019-06-29 15:50:29 -06:00
ded936ebad
quick comment on avoiding underflow
2019-06-29 15:49:11 -06:00
03a243e96c
fix basic test
2019-06-30 05:06:17 +08:00
6d45513605
Make timestamp a uint64
2019-06-29 21:56:07 +01:00
a356fc9fc8
Fixes
2019-06-29 21:53:04 +01:00
43beb743e6
typo
2019-06-29 21:39:55 +01:00
ada3cb2ae1
Fix genesis balance bug (git add -u)
2019-06-29 21:36:27 +01:00
3a5872f8e4
Cleanups and fixes
2019-06-29 21:29:10 +01:00
d00b5b9ea0
Merge is_genesis_trigger into get_genesis_state
2019-06-29 21:18:18 +01:00
22476420f3
Cleanups; think about merging is_genesis_trigger into get_genesis_state
2019-06-29 21:03:15 +01:00
12dff5349d
Renames:
...
1. `Deposit` log -> `DepositEvent` log
2. `get_deposit_root` -> `get_hash_tree_root`
2019-06-30 03:42:00 +08:00
56caa48314
Should use Sequence
2019-06-30 03:27:25 +08:00
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
354cd1c1e1
Clean up leftover and linter
2019-06-30 02:02:05 +08:00
c8dc30eec2
Recover from auto-merge
2019-06-30 01:56:10 +08:00
6b81e747b2
Fix comment
2019-06-29 18:50:23 +01:00
1b66323806
head to 1229
2019-06-30 01:44:17 +08:00
d4755653ff
Merge branch 'deposit-root' into test_genesis
2019-06-30 01:33:29 +08:00
2857324016
Merge branch 'dev' into committee-roots
2019-06-29 11:21:13 -06:00
d0009b0980
Pass `genesis_eth1_block_hash` instead of `genesis_eth1_data`
2019-06-30 01:12:25 +08:00
bc8df3cba3
minor typo
...
Co-Authored-By: Alex Stokes <r.alex.stokes@gmail.com>
2019-06-29 12:04:56 -05:00
f0a8e39243
WIP
2019-06-29 17:29:21 +01:00
7fdf59d012
`active_validator_count >= GENESIS_ACTIVE_VALIDATOR_COUNT`: per Eth1 block
2019-06-29 18:09:05 +08:00
4f31207b7f
reword merkleize with limit / length
2019-06-28 22:45:20 +02:00
6a2d2c84a8
Bitlist for attestation doc
2019-06-28 20:49:57 +01:00
fa84c49659
Update specs/core/0_beacon-chain.md
...
Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
2019-06-28 20:23:34 +01:00
cb2bfd67dc
Apply Proto's feedback of list(map(...))
2019-06-29 02:27:48 +08:00
4dc526fbb7
In the end, `get_merkle_root` is back
2019-06-29 02:16:49 +08:00
b88ab250fa
Merge branch 'dev' into committee-roots
2019-06-28 12:07:50 -06:00
9993a28796
lint
2019-06-28 11:26:05 -06:00
b40e2284a0
use active index root for generate seed mix in
2019-06-28 11:20:24 -06:00
5a8f3e495a
set committees root for next epoch rather tahn ACTIVaTION_EXIT_DELAY in the future
2019-06-28 11:10:17 -06:00
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
25db397550
fix line length lint problem in checkpoint
2019-06-28 17:34:31 +02:00
128bbbc665
fix slicing, and support partial slice bounds
2019-06-28 17:27:59 +02:00
dcb0244a4f
get_attesting_indices set instead of sorted ( #1225 )
2019-06-28 16:19:59 +01:00
5ff13dd81a
be explicit about limiting for HTR and chunk padding
2019-06-28 17:07:36 +02:00
05842f8371
Update 0_beacon-chain.md
2019-06-28 15:26:02 +01:00
2739767a71
Hardened Eth 1.0 voting strategy ( #1218 )
2019-06-28 14:43:44 +01:00
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
e36593b155
Add comment
2019-06-28 12:35:50 +01:00
6f9d37485d
Cleanups
2019-06-28 12:34:01 +01:00
196ac42025
Cleanup naming
2019-06-28 12:23:22 +01:00
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
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
140c69f2ec
Merge branch 'dev' into checkpoints
2019-06-27 21:02:48 -06:00
237b41df5b
Slice notation for justification_bitfield shift
2019-06-28 00:18:54 +01:00
990cc55db7
fix committee typing error
2019-06-27 16:32:10 -06:00
853f5fc3f0
Apply Danny's suggestions
2019-06-27 19:05:27 +01:00
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
93ce168862
More linting fixes
2019-06-27 16:47:48 +01:00
f57387cc83
Justification bitvector length to constant
2019-06-27 13:09:48 +01:00
80c680e614
Phase 1 to Bitvector/Bitlist
2019-06-27 12:41:22 +01:00
becb7a032a
justification_bitfield -> Bitvector[4]
2019-06-27 12:15:31 +01:00
67c50cb197
Changed attestation and custody bitfields
2019-06-27 12:15:29 +01:00
d641e94151
Cleanups
2019-06-27 11:44:33 +01:00
ee712ecdde
Make HW happy :)
2019-06-27 11:21:45 +01:00
02f6ba36f0
Add Bitvector and Bitlist
...
Bool, Bit -> boolean, bit
Fix simple-serialize.md
2019-06-27 09:51:06 +01:00
bcfe383e25
WIP
2019-06-27 08:44:44 +01:00
a0c2f5c6b5
fix genesis testing code, add missing constant temporarily, fix py Generator/map/list problems
2019-06-27 01:57:30 +02:00
dbb697dadd
Small update to typing in BLS spec file
...
[uint384] -> Tuple[uint384, uint384]
2019-06-26 19:40:11 -04:00
a62d0261ca
merge with dev, fixed now
2019-06-27 01:31:10 +02:00
23909ca727
Fix line lengths
2019-06-26 17:06:34 -06:00
10e257490f
Clarify `get_randao_mix` accessor
...
We avoid a genesis underflow by taking the randao epoch in `generate_seed` to be `+ EPOCHS_PER_HISTORICAL_VECTOR`.
This conflicts with the expected epoch bounds noted in `get_randao_mix` and this PR attempts to clarify the situation by leaving a note.
2019-06-26 16:33:23 -06:00
d587c4fe61
Critical fix: introduce back total-value check ( #1220 )
...
This was dropped in a376b6607fbe86f966f8
2019-06-26 20:21:17 +01:00
ccda508254
Fix deposit root, add min_genesis_time, per-block processing
2019-06-26 15:34:54 +01:00
8c34aa8c5f
Initial draft
2019-06-26 13:20:04 +01:00
0827fbd7d5
Merge branch 'fork-choice-epoch' into checkpoints
2019-06-25 15:00:04 -06:00
c64289677f
fix gethead tests
2019-06-25 14:47:46 -06:00
228195d89d
get head tests
2019-06-25 11:48:55 -06:00
4986311d5b
Update 0_beacon-chain.md
...
fix typo w/ refactor
2019-06-25 10:24:14 -06:00
f29b693a9c
Merge dev -> early_spec_test
2019-06-25 17:11:04 +02:00
df2a9e1b54
Merge pull request #1180 from ethereum/list-rework
...
pyspec-SSZ: lists-rework (enable static generalized indices) + fully python class based now.
2019-06-25 07:38:50 -06:00
20602bc92b
phase 0 doc standardization b4 spec freeze ( #1212 )
2019-06-25 14:32:56 +01:00
37b1872634
Remove duplicate custom type definitions ( #1214 )
...
Seems to be an accidental duplication of the type defs
2019-06-25 14:30:59 +01:00
b8c0985e60
merge in fork choice. tests pass
2019-06-24 22:12:55 -06:00
bacd4b1e89
Merge branch 'fork-choice-epoch' into checkpoints
2019-06-24 21:26:28 -06:00
d9b97578c0
lint
2019-06-24 21:23:24 -06:00
751738f411
enhance fork choice testing
2019-06-24 21:01:15 -06:00
054a157953
get rid of TypingList, add MutableSequence
2019-06-25 02:58:10 +02:00
45dbf5a107
Remove old Deltas reference
...
Co-Authored-By: Hsiao-Wei Wang <hwwang156@gmail.com>
2019-06-25 02:41:02 +02:00
0e362d36b1
pr feedback
2019-06-24 17:18:22 -06:00
d54be2b45f
Merge branch 'dev' into fork-choice-epoch
2019-06-24 16:52:31 -06:00
82167ff0a3
Clarify comment on phase 0 transfers
...
The comment seems to imply conjunction over each case, but the code implies disjunction; at the very least it is ambiguous.
This PR makes the comment less ambiguous.
2019-06-24 15:40:37 -07:00
9fb5806764
be explicit about input for balance sum
2019-06-25 00:24:13 +02:00
8b88c3f43c
Merge remote-tracking branch 'origin' into list-rework
2019-06-24 23:58:00 +02:00
5989e5cd23
use Bool as base name, make Bit an alias
2019-06-24 23:56:26 +02:00
82ae180490
clean up list limit constants
2019-06-24 23:38:36 +02:00
bb0a492fea
Cleanups
2019-06-23 11:18:24 +02:00
1e2bb08a74
Cosmetic fix for consistency
2019-06-23 11:09:09 +02:00
7e3318318d
Updated to newer SSZ
2019-06-23 00:29:45 -04:00
1408a1ee0d
undo tuple wrapping
2019-06-23 00:17:54 +02:00
a3f8f50bee
Initialise deposit root properly
2019-06-22 23:34:09 +02:00
2342c787c9
Cleanup
2019-06-22 22:54:07 +02:00
98692bf9d6
Fix ToC
2019-06-22 22:52:37 +02:00
e6e90c7736
Minor reorg
2019-06-22 22:51:04 +02:00
181a2a876a
Cleanups
2019-06-22 22:49:53 +02:00
8a732fbbcf
pass on checkpoints working in testing
2019-06-22 12:00:26 -06:00
f95e7315b4
fix get_active_validator_indices typing usage
2019-06-22 18:34:33 +02:00
00aae07d46
type annotation clean up
2019-06-22 18:12:42 +02:00
b007d5aa92
Add note on default zero-values, and be explicit with state-root ( #1208 )
...
* Add note on default zero-values, and be explicit with state-root
2019-06-22 17:38:30 +02:00
16093eb8ce
Merge branch 'dev' into list-rework
2019-06-22 17:11:59 +02:00
c86108de00
Merge pull request #1207 from ethereum/fix_make_lint
...
Fix `make lint`
2019-06-22 17:07:00 +02:00
a5b22e13b8
Resolves make masker sign mask
2019-06-22 16:56:16 +02:00
1e1a3e5311
Avoid substraction in comparison
2019-06-22 07:34:02 +02:00
613380bff4
Shorter in-line comments
2019-06-22 07:29:25 +02:00
183fa3c776
Make linter happy
2019-06-21 23:09:11 -06:00
6aef6c5634
Clean up
2019-06-21 22:26:15 -06:00
b51011568a
Merge branch 'dev' into test_genesis
2019-06-21 22:13:46 -06:00
5f09212777
yield for `is_genesis_trigger`
2019-06-21 22:09:09 -06:00
47b29c8456
Loose condition of effective genesis deposit
2019-06-21 21:49:13 -06:00
8828dad786
minor updates
2019-06-21 17:07:44 -06:00
de5b9cc823
convert _root/_epoch tuples to Checkpoint obj in beacon spec
2019-06-21 16:33:43 -06:00
ac34221f55
Fix `is_genesis_trigger` and add test case
2019-06-21 16:30:31 -06:00
b36ffd5c41
default value of `deposit_index`
2019-06-21 16:10:19 -06:00
7a16db144c
Add test_genesis
2019-06-21 15:59:18 -06:00
0b0e9a51d7
Merge branch 'dev' into list-rework
2019-06-21 23:44:01 +02:00
f55499c0ba
Fix Gwei value table ( #1203 )
2019-06-21 14:30:22 -06:00
80c40f5e09
merge dev, resolve minor merge conflicts
2019-06-21 21:22:23 +02:00
1b66a1a2bd
rework forkchoice to use Checkpoints
2019-06-21 12:55:55 -06:00
74eeb87936
Merge branch 'dev' into fork-choice-epoch
2019-06-21 11:43:01 -06:00
acbccbc2a8
minor typo
2019-06-21 11:18:24 -06:00
b46e047baa
Minor simplification from #1198
2019-06-21 12:57:30 +01:00
0e59c6676a
Stop yielding from fork-choie tests
2019-06-21 13:00:42 +02:00
f90469ea25
Move block timing assertion 1st
2019-06-21 12:19:08 +02:00
e88a96c45e
Apply suggestions from @drjtwo's code review
...
Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
2019-06-21 12:13:22 +02:00
e99c864ed1
Deltas = NewType('Deltas', TypingList[Gwei])
2019-06-20 17:17:12 -06:00
3d8466fd6e
make Bit check not use "is", and remove duplicate line
2019-06-20 23:04:19 +02:00
fb9a5f0bc5
one more rootslot fix
2019-06-20 14:57:53 -06:00
c5143ccefa
modify fork choice to utilize epochs as first class citizens
2019-06-20 14:48:10 -06:00
2d67717079
fix linting issues + make spec builder remove comments in container re-initialization part
2019-06-20 21:42:55 +02:00
c26fffc154
Moves copy into SSZ container
2019-06-20 20:55:28 +02:00
5f8edd6b55
Genesis block store uses genesis time
...
Co-Authored-By: Hsiao-Wei Wang <hwwang156@gmail.com>
2019-06-20 20:50:17 +02:00
f157745248
resolve some remaining list-rework rebase details
2019-06-20 20:42:19 +02:00
4e747fb887
fixes for class based ssz typing
2019-06-20 20:25:22 +02:00
5048b9e87a
temporary fix for phase-1 spec typing
2019-06-20 20:20:45 +02:00
4b4bf87e47
update shard doc, use new types, avoid List
2019-06-20 20:15:56 +02:00
8344d50ae5
update beacon chain doc, use new types, avoid List
2019-06-20 20:15:48 +02:00
4aefc078e9
list-rework type fixes
2019-06-20 20:11:39 +02:00
4c2adcc5e6
Update 0_beacon-chain.md
2019-06-20 20:05:57 +02:00
b89183ae69
Update spec for new SSZ with list max length
2019-06-20 20:05:34 +02:00
97025c51ac
start updating virtual sizes of lists
2019-06-20 20:03:11 +02:00
d73aa31ef6
Cleanups
2019-06-20 11:58:05 +01:00
e0d814df32
Merge branch 'dev' into executable_fork_choice
...
* dev:
Increase historical length and cleanups (#1196 )
2019-06-19 22:43:14 +02:00
29dbe1b880
Increase historical length and cleanups ( #1196 )
...
* increase historical length and a few cleanups
2019-06-19 20:59:44 +01:00
3418c3506f
Merge dev and resolve conflicts (please let the CI tests pass with the new dev)
2019-06-19 20:27:54 +02:00
61a51417ed
Unbreak things again
2019-06-18 23:00:30 +02:00
060041945c
remove unnecessary cast
2019-06-18 22:00:22 +02:00
346e61dfeb
make epoch pattern similar to exit-epoch loop
2019-06-18 21:59:16 +02:00
7a71919c53
Test removing all the Bytes objects
2019-06-18 21:55:41 +02:00
d804cb307b
Removes defaults from Store to try get CI to pass
2019-06-18 21:50:40 +02:00
3bcddf5e49
Removes defaults from Store to try get CI to pass
2019-06-18 20:59:17 +02:00
dd79a0edb5
Merge branch 'dev' into mypy
2019-06-18 08:24:23 -06:00
28a3e54db0
Actually resolve some merge conflicts
2019-06-18 15:13:04 +02:00
31a4700223
Merge conflicts on `dev`
2019-06-17 22:09:43 -04:00
02954e84fe
Merge branch 'dev' into JustinDrake-patch-14
2019-06-17 16:33:59 -06:00
e80d363eed
Merge pull request #1157 from ethereum/JustinDrake-patch-13
...
Set MIN_ATTESTATION_INCLUSION_DELAY to 1
2019-06-17 16:29:55 -06:00
7298b3e290
Merge pull request #1191 from ethereum/constats-config
...
split constants vs configuration
2019-06-17 16:18:34 -06:00
89d9d80b1c
move BASE_REWARDS_PER_EPOCH to constants
2019-06-17 16:12:47 -06:00
01e9f18713
Merge branch 'dev' into mypy
2019-06-17 17:51:46 -04:00
9af9bbf42b
Merge branch 'dev' into mypy
2019-06-17 17:51:00 -04:00
18ebd2aa90
Bytes32 -> Hash
2019-06-17 17:21:45 -04:00
207eb808a0
split constants vs configuration
2019-06-17 15:19:44 -06:00
d911236fbb
Update slots.md
2019-06-17 14:19:17 -07:00
2605dfba08
Updates to SSZ partials
2019-06-17 11:16:00 -04:00
2ea6cede3e
Moves fork-choice objects away from SSZ
2019-06-17 10:48:33 -04:00
20d8156f46
Merge branch 'dev' into executable_fork_choice
...
* dev:
Fix #1173
attestations: check shard, and check epoch earlier
2019-06-16 16:03:37 -04:00
9f2d06b2e7
Somehow I had indented with 5 spaces everywhere.
2019-06-16 16:02:56 -04:00
f421850dc9
Fixes tests! Thanks @hwwhww!
2019-06-16 15:53:42 -04:00
4deb311b71
Debugging 1st test
2019-06-16 12:17:31 -04:00
5d10cd63c7
SSZ (partially) handles Dicts
2019-06-16 09:52:52 -04:00
11edda64ed
Adds fork-choice to spec builder
2019-06-15 18:42:03 -04:00
e93ba51ef8
More clean up
2019-06-15 18:25:37 -04:00
9b77ec11f8
Version: Bytes4
2019-06-15 17:32:52 -04:00
b772b03847
Handle `BLSPubkey` and `BLSSignature`
2019-06-15 17:23:44 -04:00
00a68e28b5
Define Custom Types via function_puller
2019-06-15 16:57:50 -04:00
75b469281e
fix linting issue
2019-06-15 18:05:01 +02:00
7cd7659a4b
Add comments to non-obvious container fields
2019-06-15 15:51:17 +01:00
ed748a7d76
Address Danny's comments
2019-06-15 15:09:50 +01:00
a6230425b8
Merge branch 'dev' into container-cleanup
2019-06-14 10:36:41 -06:00
67d2585ec0
Fix #1173
...
The bug is that it's possible to include a participating validator which has custody bit one *without* specifying that validator in `attestation.aggregation_bitfield`. In other words, we want to check that every bit in `custody_bitfield` is zero whenever the corresponding bit in `aggregation_bitfield` is zero. Well spotted @protolambda
2019-06-13 21:01:10 +01:00
aabd2b08ad
attestations: check shard, and check epoch earlier
2019-06-13 15:51:22 +02:00
f095ab43bb
Update 0_beacon-chain.md ( #1170 )
...
minor typo fix
2019-06-13 10:40:02 +01:00
48e8164e28
Add phase1 type hinting checks and fix many bugs
2019-06-12 20:08:19 -04:00
7a366828ba
Make phase0 pass
2019-06-12 14:54:00 -04:00
12293a91b4
Merge pull request #1152 from ethereum/deposit-contract-justin
...
Custom genesis trigger, and deposit contract cleanups
2019-06-12 10:54:11 -06:00
6a83205420
Minor copy edit
2019-06-11 15:29:34 +01:00
6f526add79
flake8 length
2019-06-11 00:45:00 -04:00
9f454185f8
WIP!
...
1. Use custom types in SSZ declaration
2. Casting
2019-06-11 00:44:54 -04:00
b56539a47d
add missing colon to v-guide
2019-06-10 15:14:42 -06:00
05f1a44a38
Fix tests
2019-06-10 21:20:45 +01:00
dc56d87eef
Revert a couple of renamings
2019-06-10 21:16:51 +01:00
b60314e892
Merge branch 'deposit-contract-justin' of github.com:ethereum/eth2.0-specs into deposit-contract-justin
2019-06-10 16:03:08 +01:00
ef91ee5698
Address Danny's comments
2019-06-10 15:55:08 +01:00
05a35c7228
Tweak inclusion delay rewards and set BASE_REWARD_FACTOR
...
Substantive changes:
1) Split the inclusion delay reward between attester and proposer to add up to at most one base reward. This is analogous to the reward logic in `slash_validator`, and makes the `BASE_REWARDS_PER_EPOCH` constant include proposer rewards.
2) Double `BASE_REWARD_FACTOR` to 2^6 (addressing item 4 in #1054 ). When the total effective balance is 2^17 ETH then maximum annual issuance is a bit below 2^21 ETH. Maximum annual issuance happens when a) all validators make perfect attestations (matching source, target, head, as well as consistent crosslink data), b) all attestations are included as fast as possible (in particular, no skip blocks), and c) there are no slashings.
```python
BASE_REWARD_FACTOR = 2**6
SLOTS_PER_EPOCH = 2**6
SECONDS_PER_SLOT = 6
BASE_REWARDS_PER_EPOCH = 5
GWEI_PER_ETH = 10**9
MAX_TOTAL_EFFECTIVE_BALANCE = 2**27 * GWEI_PER_ETH
TARGET_MAX_ISSUANCE = 2**21 * GWEI_PER_ETH
def integer_squareroot(n: int) -> int:
"""
The largest integer ``x`` such that ``x**2`` is less than or equal to ``n``.
"""
assert n >= 0
x = n
y = (x + 1) // 2
while y < x:
x = y
y = (x + n // x) // 2
return x
MAX_REWARDS_PER_EPOCH = MAX_TOTAL_EFFECTIVE_BALANCE * BASE_REWARD_FACTOR // integer_squareroot(MAX_TOTAL_EFFECTIVE_BALANCE) // BASE_REWARDS_PER_EPOCH
EPOCHS_PER_YEAR = 365.25*24*60*60 / (SECONDS_PER_SLOT * SLOTS_PER_EPOCH)
MAX_REWARDS_PER_YEAR = EPOCHS_PER_YEAR * MAX_REWARDS_PER_EPOCH * BASE_REWARDS_PER_EPOCH
print(MAX_REWARDS_PER_YEAR / TARGET_MAX_ISSUANCE)
```
2019-06-10 15:14:32 +01:00
9bb0f25f18
Update specs/core/0_beacon-chain.md
...
Co-Authored-By: NIC Lin <twedusuck@gmail.com>
2019-06-10 13:41:28 +01:00
36a6c1bf1f
Set MIN_ATTESTATION_INCLUSION_DELAY to 1
...
See item 7 of #1054 . We should consider increasing the slot duration as well.
2019-06-09 21:30:42 +01:00
565f61dfaa
Cleanup containers
2019-06-09 20:41:21 +01:00
8b54c90fd6
Update 0_beacon-chain-validator.md
2019-06-09 12:09:54 -07:00
4ee00c9cbd
Address HW's comments
2019-06-09 11:03:38 +01:00
11f2cd189a
Fix the Vyper contract link ( #1154 )
2019-06-08 23:48:34 +01:00
d1e589f11f
Remove eth2 genesis in favour of genesis trigger
2019-06-08 19:00:50 +01:00
68fc0bf87d
Merge branch 'dev' into dankrad-patch-7
...
* dev:
Update simple-serialize.md
2019-06-06 23:31:36 +02:00
84ce28a71d
Update simple-serialize.md
2019-06-06 09:45:20 -04:00
35c03c5f3e
Adds review suggestions I missed
2019-06-06 11:45:22 +02:00
58a137e81c
Merge branch 'dev' into dankrad-patch-7
...
* dev:
Update 0_beacon-chain-validator.md
2019-06-06 10:43:13 +02:00
60d9dc68c4
Apply suggestions from @djrtwo's code review
2019-06-05 21:49:30 +02:00
38414c2e4e
Merge branch 'dev' into dankrad-patch-7
...
* dev:
add beaconblockheader back to toc
Move crosslink above attestation data
Change data structure to match beacon state order
Reorganize data structures to mirror beacon state order
Update 0_beacon-chain.md
2019-06-05 20:28:14 +02:00
eefd306253
Update 0_beacon-chain-validator.md
2019-06-05 13:07:10 -04:00
1daff359ba
Merge pull request #1139 from terencechain/patch-76
...
Use get_total_balance for get_attestation_deltas
2019-06-05 10:14:28 -06:00
853c34eb60
add beaconblockheader back to toc
2019-06-05 09:50:15 -06:00
d761b6f041
Implements new SSZ types
2019-06-05 15:29:26 +02:00
c250296d8a
Move crosslink above attestation data
2019-06-05 15:07:50 +09:00
65d2a50219
Change data structure to match beacon state order
2019-06-05 14:57:54 +09:00
e83500cef8
Reorganize data structures to mirror beacon state order
2019-06-05 14:52:09 +09:00
e8b4c4c57f
Merge pull request #1077 from ethereum/ssz-impl-rework
...
SSZ implementation for exec. spec - Support for Python 3 typing.
2019-06-04 14:52:28 -06:00
9bdb18245e
remove tautological type definition
2019-06-04 18:22:42 +02:00
fe9c708d83
Fix whitespace
...
Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
2019-06-04 15:31:20 +02:00
1b5370f8e2
Update 0beacon-chain-validator.md
2019-06-04 18:20:16 +09:00
d5f2f63b4a
Merge branch 'dev' into dankrad-patch-7
...
* dev:
Update link to Prysmatic Labs implementation of SSZ (#1138 )
2019-06-03 11:12:03 +02:00
e578c95837
Update link to Prysmatic Labs implementation of SSZ ( #1138 )
...
* Update link to go SSZ implementation
We have changed our SSZ implementation to it's own repo so this updates the link on the spec.
* Update simple-serialize.md
2019-06-03 13:33:59 +08:00
2246f1b934
Update 0_beacon-chain.md
2019-06-02 13:13:52 -07:00
e044305457
Merge branch 'dev' into ssz-impl-rework
2019-06-01 01:34:49 +02:00
5155bc6c4f
Makes everything pass around
2019-05-30 22:57:18 +02:00
f0314bec52
Merge branch 'dev' into JustinDrake-patch-13
2019-05-29 20:15:17 -06:00
2aea4b93d0
Merge pull request #1123 from ethereum/JustinDrake-patch-14
...
Avoid divisions by zero
2019-05-29 20:14:23 -06:00
f4afb7c1b4
Merge pull request #1134 from terencechain/patch-75
...
Fix Test Formats Broken Links
2019-05-29 20:13:13 -06:00
6ec59867ef
Fix linter errors
2019-05-30 09:53:46 +08:00
1c416541e1
Update 0_beacon-chain.md
2019-05-29 23:40:46 +03:00
12a7e26453
Update README.md
2019-05-28 20:57:18 -07:00
6286fb3fb5
Merge branch 'dev' into JustinDrake-patch-13
2019-05-28 18:15:33 -06:00
c2f0f7e4d8
Merge pull request #1108 from ethereum/eth1_error
...
minor fix to how eth1 data is counted in validator guide
2019-05-28 16:09:04 -06:00
Diederik Loerakker
Danny Ryan
Alex Stokes
Dean Eigenmann
Hsiao-Wei Wang
Justin Drake
Carl Beekhuizen
Carl Beekhuizen
Dankrad Feist
dankrad
vbuterin
JSON
terence tsao
Ivan Martinez