Justin
1e2bb08a74
Cosmetic fix for consistency
2019-06-23 11:09:09 +02:00
protolambda
1408a1ee0d
undo tuple wrapping
2019-06-23 00:17:54 +02:00
Justin Drake
a3f8f50bee
Initialise deposit root properly
2019-06-22 23:34:09 +02:00
Justin Drake
2342c787c9
Cleanup
2019-06-22 22:54:07 +02:00
Justin Drake
98692bf9d6
Fix ToC
2019-06-22 22:52:37 +02:00
Justin Drake
e6e90c7736
Minor reorg
2019-06-22 22:51:04 +02:00
Justin Drake
181a2a876a
Cleanups
2019-06-22 22:49:53 +02:00
Danny Ryan
8a732fbbcf
pass on checkpoints working in testing
2019-06-22 12:00:26 -06:00
protolambda
f95e7315b4
fix get_active_validator_indices typing usage
2019-06-22 18:34:33 +02:00
protolambda
00aae07d46
type annotation clean up
2019-06-22 18:12:42 +02:00
Diederik Loerakker
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
protolambda
16093eb8ce
Merge branch 'dev' into list-rework
2019-06-22 17:11:59 +02:00
Diederik Loerakker
c86108de00
Merge pull request #1207 from ethereum/fix_make_lint
...
Fix `make lint`
2019-06-22 17:07:00 +02:00
Carl Beekhuizen
a5b22e13b8
Resolves make masker sign mask
2019-06-22 16:56:16 +02:00
Justin Drake
1e1a3e5311
Avoid substraction in comparison
2019-06-22 07:34:02 +02:00
Justin Drake
613380bff4
Shorter in-line comments
2019-06-22 07:29:25 +02:00
Hsiao-Wei Wang
183fa3c776
Make linter happy
2019-06-21 23:09:11 -06:00
Hsiao-Wei Wang
6aef6c5634
Clean up
2019-06-21 22:26:15 -06:00
Hsiao-Wei Wang
b51011568a
Merge branch 'dev' into test_genesis
2019-06-21 22:13:46 -06:00
Hsiao-Wei Wang
5f09212777
yield for `is_genesis_trigger`
2019-06-21 22:09:09 -06:00
Hsiao-Wei Wang
47b29c8456
Loose condition of effective genesis deposit
2019-06-21 21:49:13 -06:00
Hsiao-Wei Wang
8828dad786
minor updates
2019-06-21 17:07:44 -06:00
Danny Ryan
de5b9cc823
convert _root/_epoch tuples to Checkpoint obj in beacon spec
2019-06-21 16:33:43 -06:00
Hsiao-Wei Wang
ac34221f55
Fix `is_genesis_trigger` and add test case
2019-06-21 16:30:31 -06:00
Hsiao-Wei Wang
b36ffd5c41
default value of `deposit_index`
2019-06-21 16:10:19 -06:00
Hsiao-Wei Wang
7a16db144c
Add test_genesis
2019-06-21 15:59:18 -06:00
protolambda
0b0e9a51d7
Merge branch 'dev' into list-rework
2019-06-21 23:44:01 +02:00
Hsiao-Wei Wang
f55499c0ba
Fix Gwei value table ( #1203 )
2019-06-21 14:30:22 -06:00
protolambda
80c40f5e09
merge dev, resolve minor merge conflicts
2019-06-21 21:22:23 +02:00
Danny Ryan
1b66a1a2bd
rework forkchoice to use Checkpoints
2019-06-21 12:55:55 -06:00
Danny Ryan
74eeb87936
Merge branch 'dev' into fork-choice-epoch
2019-06-21 11:43:01 -06:00
Danny Ryan
acbccbc2a8
minor typo
2019-06-21 11:18:24 -06:00
Justin Drake
b46e047baa
Minor simplification from #1198
2019-06-21 12:57:30 +01:00
Carl Beekhuizen
0e59c6676a
Stop yielding from fork-choie tests
2019-06-21 13:00:42 +02:00
Carl Beekhuizen
f90469ea25
Move block timing assertion 1st
2019-06-21 12:19:08 +02:00
Carl Beekhuizen
e88a96c45e
Apply suggestions from @drjtwo's code review
...
Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
2019-06-21 12:13:22 +02:00
Hsiao-Wei Wang
e99c864ed1
Deltas = NewType('Deltas', TypingList[Gwei])
2019-06-20 17:17:12 -06:00
protolambda
3d8466fd6e
make Bit check not use "is", and remove duplicate line
2019-06-20 23:04:19 +02:00
Danny Ryan
fb9a5f0bc5
one more rootslot fix
2019-06-20 14:57:53 -06:00
Danny Ryan
c5143ccefa
modify fork choice to utilize epochs as first class citizens
2019-06-20 14:48:10 -06:00
protolambda
2d67717079
fix linting issues + make spec builder remove comments in container re-initialization part
2019-06-20 21:42:55 +02:00
Carl Beekhuizen
c26fffc154
Moves copy into SSZ container
2019-06-20 20:55:28 +02:00
Carl Beekhuizen
5f8edd6b55
Genesis block store uses genesis time
...
Co-Authored-By: Hsiao-Wei Wang <hwwang156@gmail.com>
2019-06-20 20:50:17 +02:00
protolambda
f157745248
resolve some remaining list-rework rebase details
2019-06-20 20:42:19 +02:00
protolambda
4e747fb887
fixes for class based ssz typing
2019-06-20 20:25:22 +02:00
protolambda
5048b9e87a
temporary fix for phase-1 spec typing
2019-06-20 20:20:45 +02:00
protolambda
4b4bf87e47
update shard doc, use new types, avoid List
2019-06-20 20:15:56 +02:00
protolambda
8344d50ae5
update beacon chain doc, use new types, avoid List
2019-06-20 20:15:48 +02:00
protolambda
4aefc078e9
list-rework type fixes
2019-06-20 20:11:39 +02:00
vbuterin
4c2adcc5e6
Update 0_beacon-chain.md
2019-06-20 20:05:57 +02:00
protolambda
b89183ae69
Update spec for new SSZ with list max length
2019-06-20 20:05:34 +02:00
protolambda
97025c51ac
start updating virtual sizes of lists
2019-06-20 20:03:11 +02:00
Justin Drake
d73aa31ef6
Cleanups
2019-06-20 11:58:05 +01:00
Carl Beekhuizen
e0d814df32
Merge branch 'dev' into executable_fork_choice
...
* dev:
Increase historical length and cleanups (#1196 )
2019-06-19 22:43:14 +02:00
Danny Ryan
29dbe1b880
Increase historical length and cleanups ( #1196 )
...
* increase historical length and a few cleanups
2019-06-19 20:59:44 +01:00
Carl Beekhuizen
3418c3506f
Merge dev and resolve conflicts (please let the CI tests pass with the new dev)
2019-06-19 20:27:54 +02:00
Carl Beekhuizen
61a51417ed
Unbreak things again
2019-06-18 23:00:30 +02:00
protolambda
060041945c
remove unnecessary cast
2019-06-18 22:00:22 +02:00
protolambda
346e61dfeb
make epoch pattern similar to exit-epoch loop
2019-06-18 21:59:16 +02:00
Carl Beekhuizen
7a71919c53
Test removing all the Bytes objects
2019-06-18 21:55:41 +02:00
Carl Beekhuizen
d804cb307b
Removes defaults from Store to try get CI to pass
2019-06-18 21:50:40 +02:00
Carl Beekhuizen
3bcddf5e49
Removes defaults from Store to try get CI to pass
2019-06-18 20:59:17 +02:00
Hsiao-Wei Wang
dd79a0edb5
Merge branch 'dev' into mypy
2019-06-18 08:24:23 -06:00
Carl Beekhuizen
28a3e54db0
Actually resolve some merge conflicts
2019-06-18 15:13:04 +02:00
Carl Beekhuizen
31a4700223
Merge conflicts on `dev`
2019-06-17 22:09:43 -04:00
Danny Ryan
02954e84fe
Merge branch 'dev' into JustinDrake-patch-14
2019-06-17 16:33:59 -06:00
Danny Ryan
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
Danny Ryan
7298b3e290
Merge pull request #1191 from ethereum/constats-config
...
split constants vs configuration
2019-06-17 16:18:34 -06:00
Danny Ryan
89d9d80b1c
move BASE_REWARDS_PER_EPOCH to constants
2019-06-17 16:12:47 -06:00
Hsiao-Wei Wang
01e9f18713
Merge branch 'dev' into mypy
2019-06-17 17:51:46 -04:00
Hsiao-Wei Wang
9af9bbf42b
Merge branch 'dev' into mypy
2019-06-17 17:51:00 -04:00
Hsiao-Wei Wang
18ebd2aa90
Bytes32 -> Hash
2019-06-17 17:21:45 -04:00
Danny Ryan
207eb808a0
split constants vs configuration
2019-06-17 15:19:44 -06:00
terence tsao
d911236fbb
Update slots.md
2019-06-17 14:19:17 -07:00
Carl Beekhuizen
2ea6cede3e
Moves fork-choice objects away from SSZ
2019-06-17 10:48:33 -04:00
Carl Beekhuizen
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
Carl Beekhuizen
9f2d06b2e7
Somehow I had indented with 5 spaces everywhere.
2019-06-16 16:02:56 -04:00
Carl Beekhuizen
f421850dc9
Fixes tests! Thanks @hwwhww!
2019-06-16 15:53:42 -04:00
Carl Beekhuizen
4deb311b71
Debugging 1st test
2019-06-16 12:17:31 -04:00
Carl Beekhuizen
5d10cd63c7
SSZ (partially) handles Dicts
2019-06-16 09:52:52 -04:00
Carl Beekhuizen
11edda64ed
Adds fork-choice to spec builder
2019-06-15 18:42:03 -04:00
Hsiao-Wei Wang
e93ba51ef8
More clean up
2019-06-15 18:25:37 -04:00
Hsiao-Wei Wang
9b77ec11f8
Version: Bytes4
2019-06-15 17:32:52 -04:00
Hsiao-Wei Wang
b772b03847
Handle `BLSPubkey` and `BLSSignature`
2019-06-15 17:23:44 -04:00
Hsiao-Wei Wang
00a68e28b5
Define Custom Types via function_puller
2019-06-15 16:57:50 -04:00
protolambda
75b469281e
fix linting issue
2019-06-15 18:05:01 +02:00
Justin Drake
7cd7659a4b
Add comments to non-obvious container fields
2019-06-15 15:51:17 +01:00
Justin Drake
ed748a7d76
Address Danny's comments
2019-06-15 15:09:50 +01:00
Danny Ryan
a6230425b8
Merge branch 'dev' into container-cleanup
2019-06-14 10:36:41 -06:00
Justin
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
protolambda
aabd2b08ad
attestations: check shard, and check epoch earlier
2019-06-13 15:51:22 +02:00
Alex Stokes
f095ab43bb
Update 0_beacon-chain.md ( #1170 )
...
minor typo fix
2019-06-13 10:40:02 +01:00
Hsiao-Wei Wang
48e8164e28
Add phase1 type hinting checks and fix many bugs
2019-06-12 20:08:19 -04:00
Hsiao-Wei Wang
7a366828ba
Make phase0 pass
2019-06-12 14:54:00 -04:00
Danny Ryan
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
Justin Drake
6a83205420
Minor copy edit
2019-06-11 15:29:34 +01:00
Hsiao-Wei Wang
6f526add79
flake8 length
2019-06-11 00:45:00 -04:00
Hsiao-Wei Wang
9f454185f8
WIP!
...
1. Use custom types in SSZ declaration
2. Casting
2019-06-11 00:44:54 -04:00
Danny Ryan
b56539a47d
add missing colon to v-guide
2019-06-10 15:14:42 -06:00
Justin Drake
05f1a44a38
Fix tests
2019-06-10 21:20:45 +01:00
Justin Drake
dc56d87eef
Revert a couple of renamings
2019-06-10 21:16:51 +01:00
Justin Drake
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
Justin Drake
ef91ee5698
Address Danny's comments
2019-06-10 15:55:08 +01:00
Justin
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
Justin
9bb0f25f18
Update specs/core/0_beacon-chain.md
...
Co-Authored-By: NIC Lin <twedusuck@gmail.com>
2019-06-10 13:41:28 +01:00
Justin
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
Justin Drake
565f61dfaa
Cleanup containers
2019-06-09 20:41:21 +01:00
terence tsao
8b54c90fd6
Update 0_beacon-chain-validator.md
2019-06-09 12:09:54 -07:00
Justin Drake
4ee00c9cbd
Address HW's comments
2019-06-09 11:03:38 +01:00
Hsiao-Wei Wang
11f2cd189a
Fix the Vyper contract link ( #1154 )
2019-06-08 23:48:34 +01:00
Justin Drake
d1e589f11f
Remove eth2 genesis in favour of genesis trigger
2019-06-08 19:00:50 +01:00
Carl Beekhuizen
68fc0bf87d
Merge branch 'dev' into dankrad-patch-7
...
* dev:
Update simple-serialize.md
2019-06-06 23:31:36 +02:00
terence tsao
84ce28a71d
Update simple-serialize.md
2019-06-06 09:45:20 -04:00
Carl Beekhuizen
35c03c5f3e
Adds review suggestions I missed
2019-06-06 11:45:22 +02:00
Carl Beekhuizen
58a137e81c
Merge branch 'dev' into dankrad-patch-7
...
* dev:
Update 0_beacon-chain-validator.md
2019-06-06 10:43:13 +02:00
Carl Beekhuizen
60d9dc68c4
Apply suggestions from @djrtwo's code review
2019-06-05 21:49:30 +02:00
Carl Beekhuizen
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
terence tsao
eefd306253
Update 0_beacon-chain-validator.md
2019-06-05 13:07:10 -04:00
Danny Ryan
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
Danny Ryan
853c34eb60
add beaconblockheader back to toc
2019-06-05 09:50:15 -06:00
Carl Beekhuizen
d761b6f041
Implements new SSZ types
2019-06-05 15:29:26 +02:00
Ivan Martinez
c250296d8a
Move crosslink above attestation data
2019-06-05 15:07:50 +09:00
Ivan Martinez
65d2a50219
Change data structure to match beacon state order
2019-06-05 14:57:54 +09:00
Ivan Martinez
e83500cef8
Reorganize data structures to mirror beacon state order
2019-06-05 14:52:09 +09:00
Danny Ryan
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
protolambda
9bdb18245e
remove tautological type definition
2019-06-04 18:22:42 +02:00
Diederik Loerakker
fe9c708d83
Fix whitespace
...
Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
2019-06-04 15:31:20 +02:00
Ivan Martinez
1b5370f8e2
Update 0beacon-chain-validator.md
2019-06-04 18:20:16 +09:00
Carl Beekhuizen
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
Ivan Martinez
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
terence tsao
2246f1b934
Update 0_beacon-chain.md
2019-06-02 13:13:52 -07:00
protolambda
e044305457
Merge branch 'dev' into ssz-impl-rework
2019-06-01 01:34:49 +02:00
Carl Beekhuizen
5155bc6c4f
Makes everything pass around
2019-05-30 22:57:18 +02:00
Danny Ryan
f0314bec52
Merge branch 'dev' into JustinDrake-patch-13
2019-05-29 20:15:17 -06:00
Danny Ryan
2aea4b93d0
Merge pull request #1123 from ethereum/JustinDrake-patch-14
...
Avoid divisions by zero
2019-05-29 20:14:23 -06:00
Danny Ryan
f4afb7c1b4
Merge pull request #1134 from terencechain/patch-75
...
Fix Test Formats Broken Links
2019-05-29 20:13:13 -06:00
Hsiao-Wei Wang
6ec59867ef
Fix linter errors
2019-05-30 09:53:46 +08:00
Justin
1c416541e1
Update 0_beacon-chain.md
2019-05-29 23:40:46 +03:00
terence tsao
12a7e26453
Update README.md
2019-05-28 20:57:18 -07:00
Danny Ryan
6286fb3fb5
Merge branch 'dev' into JustinDrake-patch-13
2019-05-28 18:15:33 -06:00
Danny Ryan
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
Danny Ryan
4183d8440b
Merge pull request #1069 from sigp/bn-vc-api-rfc
...
Beacon Node API for Validator
2019-05-28 16:07:51 -06:00
protolambda
6e8fb529d2
Merge branch 'ssz_static_format' into v06x-to-dev
2019-05-28 18:32:38 +02:00
protolambda
3781614f20
SSZ format update, to facilitate more efficient parsing
2019-05-28 18:28:37 +02:00
protolambda
25cc393180
Merge in fix of bls-setting doc, rm old comments
2019-05-28 18:04:16 +02:00
protolambda
d036b5a87a
Remove some old comments about BLS setting. Description is shared in main readme now.
2019-05-28 18:02:09 +02:00
protolambda
8737984e19
introduce back assert, modified to allow valid but non-effective calls
2019-05-28 16:05:25 +02:00
protolambda
401dba3230
Merge branch 'bls-setting' into v06x-to-dev
2019-05-28 15:38:08 +02:00
protolambda
6ffd41650b
suggestion from hww, reduce into one bls_setting key
2019-05-28 15:35:00 +02:00
Carl Beekhuizen
bfa45e06f0
merge dev -> d-p-7
2019-05-28 11:15:17 +02:00