88d8f80957
Fix two bugs (and some cleanups)
...
Fix two bugs:
1) The participant reward (previously known as "inclusion reward") should not be proportional to `effective_balance` because a sync committee member is already chosen with probability proportional to the effective balance. Credit to @vbuterin.
2) The participant reward (previously known as "inclusion reward") was too large by a factor of `len(participant_indices)`, not taking into account the `for` loop.
Fixing these two bugs actually makes the code significantly simpler and cleaner :)
@barnabemonnot: Could you check the logic? :) If confirmed happy to update the tests.
2021-04-02 14:52:32 +01:00
2def461298
Merge branch 'dev' into altair_incentives
2021-03-31 00:53:58 +08:00
a465f21deb
Merge pull request #2289 from ethereum/phase1-rebased-patch
...
Minor docs fix for #2254
2021-03-30 15:35:56 +02:00
ed6358a719
Merge pull request #2248 from hukkinj1/dev
...
Fix list indentation
2021-03-30 07:32:35 -06:00
51db49988a
Merge pull request #2254 from ethereum/phase1-rebased
...
Modularize Phase1 into post-Merge features: Sharding, Custody Game, Data Availability Sampling
2021-03-30 07:24:26 -06:00
3391f991ac
Minor wording fixes
2021-03-30 13:48:40 +08:00
7344442618
update merge and sharding configs to reflect fork slot placeholder, as in #2287
2021-03-30 01:53:36 +02:00
07b7774241
misc. phase1 modules refactor updates
2021-03-30 01:46:02 +02:00
9420c29899
custody game doc naming updates
2021-03-30 01:39:01 +02:00
430627f290
Apply suggestions from @djrtwo
...
Co-authored-by: Danny Ryan <dannyjryan@gmail.com>
2021-03-30 01:33:17 +02:00
0170245ff1
Merge pull request #2288 from terencechain/fix-merge-toc
...
Fix merge beacon chain's toc
2021-03-29 13:13:28 -06:00
eca6bd7d62
Fix merge beacon chain spec's toc
2021-03-29 11:56:43 -07:00
41c5f1c4d6
Merge pull request #2279 from ethereum/ralexstokes-patch-2
...
Fix aggregation bits example in Altair validator guide
2021-03-29 12:37:47 -06:00
6f07448883
Merge pull request #2282 from benjaminion/altair-1
...
Make if condition more precise
2021-03-29 07:59:19 -06:00
48d619d299
Merge pull request #2277 from ralexstokes/fix-altair-val-guide
...
Fix use of block root in Altair validator guide
2021-03-29 07:59:02 -06:00
ef4a5af645
Merge pull request #2278 from ethereum/ralexstokes-patch-1
...
Fix typo from earlier edit to field name
2021-03-29 07:55:09 -06:00
a51c5ee4c2
Apply suggestions from code review
...
Co-authored-by: Hsiao-Wei Wang <hsiaowei.eth@gmail.com>
2021-03-29 07:51:49 -06:00
d28cac0e8f
clean up test phase 1 testgen references
2021-03-29 15:38:43 +02:00
0ab3660ed6
Merge pull request #2284 from terencechain/patch-113
...
Fix spelling: negotiatied -> negotiated
2021-03-29 14:22:02 +02:00
f73aa2f98d
Fix spelling: negotiatied -> negotiated
2021-03-28 17:06:12 -07:00
b02aed93a3
Fix another list's indent
2021-03-29 01:17:29 +03:00
b23b16c7b7
Fix list indentation
2021-03-29 01:10:36 +03:00
64fc912ce7
Make if condition more precise
2021-03-27 16:13:46 +00:00
2bc3e814b0
rename to custody game
2021-03-27 01:58:39 +01:00
5e186fc136
update sharding spec to extend Merge types
2021-03-27 01:28:52 +01:00
d067237e30
list new Merge specs, update features descriptions
2021-03-27 01:10:13 +01:00
29f78a7f06
proof of custody full name
2021-03-27 00:53:25 +01:00
379ba98eb7
move static sharding configuration into constants
2021-03-27 00:47:10 +01:00
c225813f7d
split phase1 configs into feature configs
2021-03-27 00:46:04 +01:00
0c94be4204
clean up more phase1 test references
2021-03-27 00:14:32 +01:00
a6c01f8212
no phase1 in tests, per-feature testing now, executable specs will be re-enabled per feature
2021-03-26 23:21:36 +01:00
906cde0610
preserve proof of custody tests
2021-03-26 23:10:56 +01:00
14cb996613
split phase1 tests into proof-of-custody and sharding tests, drop old shard-transition specific tests
2021-03-26 23:01:24 +01:00
112056fa80
add custom types to TOC
2021-03-26 22:38:52 +01:00
65dbf6a5c4
toc
2021-03-26 22:37:33 +01:00
b627f708b9
fix body type
2021-03-26 22:37:33 +01:00
4e4d0eb24a
update custody doc wording
2021-03-26 22:37:33 +01:00
d4c057a0bd
bls point type back to sharding spec
2021-03-26 22:37:33 +01:00
f618f3c59d
move custody-specific operations to custody spec
2021-03-26 22:37:32 +01:00
8542d349bf
update sharding p2p doc
2021-03-26 22:37:32 +01:00
0b8e3aee44
move shard blob types from das to sharding spec
2021-03-26 22:37:32 +01:00
306fc95c60
Update doc names and sharding readme section
2021-03-26 22:37:32 +01:00
1acb1d6f70
disable phase1 pyspec build
2021-03-26 22:37:32 +01:00
c748c1d7d5
cleanup sharding docs
2021-03-26 22:37:32 +01:00
6d2d8cb982
toc updates
2021-03-26 22:37:32 +01:00
882aa81ee9
cleanup
2021-03-26 22:37:31 +01:00
4068a887c5
split phase1 features
2021-03-26 22:37:31 +01:00
3f97cca531
remove light-client-sync. Altair implements this. Shard-specific part can be implemented later.
2021-03-26 22:37:31 +01:00
2696968f24
cleanup validator doc; lightclient was moved to altair, shards are data-heavy, no transitions for now
2021-03-26 22:37:31 +01:00
b3c5e65698
cleanup old docs about transition-full sharding
2021-03-26 22:37:31 +01:00
Justin
Hsiao-Wei Wang
Diederik Loerakker
Danny Ryan
terence tsao
Taneli Hukkinen
Ben Edgington