1430 Commits

Author	SHA1	Message	Date
Justin Drake	06f475a844	Fixes	2019-04-20 16:32:41 +10:00
Justin Drake	d700ea4406	Fixes	2019-04-20 16:10:25 +10:00
Justin Drake	f07b94e77c	Fixes	2019-04-20 15:37:12 +10:00
Justin Drake	356ef15166	Merge branch 'JustinDrake-patch-14' of github.com:ethereum/eth2.0-specs into JustinDrake-patch-14	2019-04-20 15:31:19 +10:00
Justin Drake	4d26ae255a	Bug fix	2019-04-20 15:31:15 +10:00
Justin	d067a9fcf2	Merge branch 'dev' into JustinDrake-patch-14	2019-04-20 15:19:21 +10:00
Justin Drake	f908c8d3e0	Revamped balances and incentivisation	2019-04-20 15:17:33 +10:00
Justin	39d0822602	Sane SSZ object default values (#963)	2019-04-19 18:26:54 +10:00
Justin	fad9b4672a	Disallow transfers ... As discussed in yesterday's call, temporarily disable transfers until the network is deemed stable enough. We can consider doing a "test-run hard fork" changing this constant prior to the phase 1 hard fork.	2019-04-19 18:09:29 +10:00
Hsiao-Wei Wang	408ef7e6eb	Merge branch 'dev' into carl-patch-1	2019-04-19 14:50:48 +08:00
Danny Ryan	523800819b	Merge branch 'dev' into vbuterin-patch-2	2019-04-18 21:17:29 -06:00
Hsiao-Wei Wang	7a435d2e1a	Merge branch 'dev' into JustinDrake-patch-14	2019-04-19 09:37:11 +08:00
Carl Beekhuizen	26afa077fd	Resolves conflicts and merges in dev	2019-04-18 23:17:53 +02:00
Danny Ryan	faa6a46f15	Merge branch 'dev' into JustinDrake-patch-11	2019-04-18 11:45:45 -06: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	fb641bc05f	Merge branch 'dev' into JustinDrake-patch-14	2019-04-18 19:51:17 +10: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
Justin	91921d8e86	Update 0_beacon-chain.md	2019-04-18 11:52:14 +10:00
Justin	71e1a598d2	Update 0_beacon-chain.md	2019-04-18 11:09:30 +10:00
Justin	3f9a65f1c8	Update 0_beacon-chain.md	2019-04-18 10:59:15 +10:00
Justin	0f8b1c5f3a	Update 0_beacon-chain.md	2019-04-18 10:56:15 +10: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