Carl Beekhuizen
26afa077fd
Resolves conflicts and merges in dev
2019-04-18 23:17:53 +02:00
Danny Ryan
741a74a02c
re-add crosslink tests and ensure pass
2019-04-18 11:16:50 -06:00
Carl Beekhuizen
d6e616d4fe
Merge branch 'dev' into carl-patch-1
...
* dev:
Cleanup per-epoch processing presentation (#959 )
2019-04-18 12:02:10 +02:00
Justin Drake
7a016489c1
Moar
2019-04-18 19:33:38 +10:00
Justin
857d9b2ed9
Merge branch 'dev' into prev-cur-crosslinks
2019-04-18 19:09:41 +10:00
Justin
d4ce0d20a0
Cleanup per-epoch processing presentation ( #959 )
2019-04-18 19:08:34 +10:00
Justin Drake
172e106b48
merge
2019-04-18 18:59:44 +10:00
Justin Drake
4244db92ad
More cleanups
2019-04-18 18:53:22 +10:00
Hsiao-Wei Wang
743193aa7d
nitpicks
2019-04-18 16:53:02 +08:00
Justin Drake
cae5c22718
Simplify get_crosslink_committee_for_attestation and move to test helpers
2019-04-18 18:15:20 +10:00
Justin
6975288254
Merge branch 'dev' into carl-patch-1
2019-04-18 17:52:56 +10:00
Justin
72f4e2d3b6
Update 0_beacon-chain.md
2019-04-18 17:51:50 +10:00
Justin
40a898f125
Update 0_beacon-chain.md
2019-04-18 17:46:31 +10:00
Justin
d9afb67e29
Update 0_beacon-chain.md
2019-04-18 17:45:28 +10:00
Alex Stokes
4bca7f984d
Add the prefix `state` when accessing the latest deposit count ( #961 )
2019-04-18 17:43:22 +10:00
Justin Drake
40b55cf433
More fixes
2019-04-18 14:43:24 +10:00
Justin
9ecafb2a1c
Update 0_beacon-chain.md
2019-04-18 14:33:45 +10:00
Justin
fbaf771b1a
Update 0_beacon-chain.md
2019-04-18 14:20:34 +10:00
Justin
443786017f
Further decouple justification and finalisation ( #958 )
...
Addresses @djrtwo's comment [here](https://github.com/ethereum/eth2.0-specs/pull/925#issuecomment-484123950 ).
2019-04-18 13:31:19 +10:00
Danny Ryan
8c5f7a571d
Merge branch 'dev' into prev-cur-crosslinks
2019-04-17 20:27:25 -06:00
Danny Ryan
e2e39d63a5
Merge pull request #895 from ethereum/hwwhww/minor_fix_light_client
...
Clean up light client spec
2019-04-17 19:34:58 -06:00
Justin
71e1a598d2
Update 0_beacon-chain.md
2019-04-18 11:09:30 +10:00
Danny Ryan
0a1517c9de
Update specs/light_client/merkle_proofs.md
...
Co-Authored-By: hwwhww <hwwang156@gmail.com>
2019-04-18 08:56:46 +08:00
Hsiao-Wei Wang
5f9e625774
Merge branch 'dev' into start-at-zero
2019-04-18 08:50:50 +08:00
Hsiao-Wei Wang
02cbb35c8a
Merge pull request #957 from ethereum/finality-bug
...
fix finalization bug
2019-04-18 08:49:08 +08:00
Justin
9c14900c77
Update 0_beacon-chain.md
2019-04-18 10:45:22 +10:00
Danny Ryan
00a40d037d
Merge pull request #955 from ethereum/JustinDrake-patch-15
...
Remove custody_bitfield from PendingAttestation
2019-04-17 16:25:39 -06:00
Danny Ryan
ca8bc77f96
Merge pull request #858 from ralexstokes/update-get-block-root-text
...
Update the descriptive text to refer to the correct type of root
2019-04-18 04:56:16 +10:00
Danny Ryan
c783cdb2f4
fix bug and add transfer tests
2019-04-17 12:31:00 -06:00
Danny Ryan
d118eb03c9
Merge branch 'dev' into carl-patch-1
2019-04-17 11:18:29 -06:00
Danny Ryan
5531adcdd1
remove old assertion in get_beacon_proposer_index
2019-04-17 09:41:23 -06:00
Danny Ryan
af4d06c8bf
only run justification/finalization after 2 epochs
2019-04-17 09:38:10 -06:00
Danny Ryan
73bd821417
bug fix
2019-04-17 09:26:23 -06:00
Danny Ryan
4bffa87646
fix finalization bug
2019-04-17 08:57:23 -06:00
Danny Ryan
2cb8f1c520
Merge branch 'dev' into start-at-zero
2019-04-17 08:39:25 -06:00
Danny Ryan
ef14396532
Merge branch 'dev' into prev-cur-crosslinks
2019-04-17 08:33:13 -06:00
Justin
a4d87d44fb
Remove custody_bitfield from PendingAttestation
...
I don't think we need it :)
2019-04-17 22:22:53 +10:00
Hsiao-Wei Wang
a93d34b8e4
Merge branch 'dev' into start-at-zero
2019-04-17 12:32:46 +08:00
Justin
57e5409383
Simplify Eth1Data voting ( #938 )
...
Remove `Eth1DataVote` object and simplify logic throughout.
2019-04-17 14:30:03 +10:00
Hsiao-Wei Wang
cc68df8346
Merge branch 'dev' into prev-cur-crosslinks
2019-04-17 12:01:40 +08:00
Hsiao-Wei Wang
587193076e
Minor adjustments ( #948 )
...
1. Rename `earliest_attestation` to `get_earliest_attestation` to
avoiding conflicting to variable name
2. Extract `proposer_index` out of
`process_proposer_attestation_rewards` loops
2019-04-17 13:35:37 +10:00
Danny Ryan
882937b537
attesation proposer rewards to block processing ( #920 )
2019-04-17 12:32:50 +10:00
JSON
eeedea2d8c
Update 1_shard-data-chains.md
2019-04-16 12:03:22 -05:00
Carl Beekhuizen
ae0afe389f
Cleaner assertion
2019-04-16 20:11:51 +10:00
Carl Beekhuizen
ed28515a95
Enables transferes of BAL > 32 ETH
2019-04-16 16:16:13 +10:00
Justin
f84818f19c
Decouple justification and finalization processing ( #925 )
2019-04-16 14:59:35 +10:00
Hsiao-Wei Wang
acd172f4d1
Merge pull request #929 from terenc3t/patch-62
...
Fix SimpleSerialize title
2019-04-16 14:17:24 +10:00
Hsiao-Wei Wang
441e21b6b4
Merge pull request #851 from protolambda/proto-merge-test-gen
...
Combine specs and test-generators
2019-04-16 13:51:10 +10:00
terence tsao
758696ba44
Update sync_protocol.md
2019-04-15 11:03:53 -07:00
terence tsao
d8d0aaecff
Update simple-serialize.md
2019-04-15 11:02:23 -07:00