Commit Graph

319 Commits

Author SHA1 Message Date
Justin
a818575ca8 Minor cosmetic fixes 2018-11-24 15:15:19 +00:00
vbuterin
403253c879 Added 2/3/4 cycle finalization options
Suppose B1, B2, B3, B4 are consecutive blocks and we are now processing the end of the cycle containing B4.

* If B4 is justified using source B3, then B3 is finalized.
* If B4 is justified using source B2, and B3 has been justified, then B2 is finalized.
* If B3 is justified using source B1, and B1 has been justified, then B1 is finalized.
2018-11-24 09:41:25 -05:00
Hsiao-Wei Wang
252a24cff0 Minor fix: markdown grammar and typing hints 2018-11-24 01:38:57 +08:00
Hsiao-Wei Wang
e7852de0c2 Merge branch 'master' into vbuterin-patch-1 2018-11-23 20:06:43 +08:00
Hsiao-Wei Wang
f513e2022e Merge pull request #154 from terenc3t/patch-11
Typo in Vyper contract
2018-11-23 19:57:54 +08:00
Hsiao-Wei Wang
062f2069f7 Merge pull request #159 from 4000D/master
fix hyperlink
2018-11-23 19:31:50 +08:00
4000D
e2193b1324 fix hyperlink 2018-11-23 13:54:11 +09:00
Terence Tsao
925ac0ecc0 use convert function in Vyper 2018-11-22 06:32:15 -10:00
Hsiao-Wei Wang
f1b78cf01e ss: Add CC0 copyright declaration (#155) 2018-11-22 17:28:24 +09:00
terence tsao
fec46f9e09 Typo in Vyper contract 2018-11-21 18:37:14 -10:00
vbuterin
745524b762 Added whistleblower reward (#144)
* Added whistleblower reward

* Update 0_beacon-chain.md

* Fixed proposer.deposit += ...
2018-11-21 15:21:07 +09:00
vbuterin
b4dfdb5ed4 Partial edits.... 2018-11-20 16:49:43 -05:00
Hsiao-Wei Wang
98312f40b5 Merge pull request #140 from status-im/simplify-merkle-tree
simplify merkle tree chunking
2018-11-20 23:19:04 +09:00
Hsiao-Wei Wang
a217e9b32c tree_ssz: fix extra parens
Co-Authored-By: arnetheduck <arnetheduck@gmail.com>
2018-11-20 08:12:56 -06:00
Danny Ryan
addd345b36 Merge branch 'master' into vbuterin-patch-1 2018-11-20 17:41:18 +09:00
vbuterin
396d798500 Separated out proposer from attesters (#143)
* Separated out proposer from validators

* Update 0_beacon-chain.md

* Update specs/core/0_beacon-chain.md

Co-Authored-By: vbuterin <v@buterin.com>

* Update specs/core/0_beacon-chain.md

Co-Authored-By: vbuterin <v@buterin.com>

* get_proposer -> get_beacon_proposer, block -> slot

* Move proposer sig to the end of a block

* Update specs/core/0_beacon-chain.md

Co-Authored-By: vbuterin <v@buterin.com>

* sig -> signature

* add type hints for get_beacon_proposer
2018-11-20 16:40:04 +09:00
Hsiao-Wei Wang
00f7554ec4 Remove justified_streak 2018-11-20 11:18:58 +09:00
vbuterin
eb29b28dc5 Update 0_beacon-chain.md 2018-11-19 15:59:15 -05:00
vbuterin
331d456077 Merge pull request #150 from ethereum/vbuterin-patch-10
Replace single specials limit with per-type limit
2018-11-19 15:57:27 -05:00
vbuterin
1eaf15cf73 Replace single specials limit with per-type limit 2018-11-19 11:14:18 -05:00
vbuterin
2fead870ad Replace cycles with epochs
Also adjusted constants to keep interest rates and the quadratic leak period the same.

Also, did some simplifications of the cycle calculation procedure. Make the decision to remove automatic registration of a validator as a proposer when they join, because that can just happen on its own due to the reshuffling procedure.
2018-11-19 11:07:41 -05:00
vbuterin
21d120e771 Remove uint32 use. 2018-11-19 07:00:03 -05:00
Hsiao-Wei Wang
a274432889 Merge pull request #112 from ethereum/vitalik9
Implementation of alternate withdrawal mechanism (issue #91)
2018-11-19 12:51:57 +09:00
Hsiao-Wei Wang
54eeb49831 crystallized_state -> state 2018-11-19 12:48:12 +09:00
Hsiao-Wei Wang
c3e2c2a46d Clean up leftover of CrystallizedState 2018-11-19 12:17:50 +09:00
Danny Ryan
2a077fbecc init current_exit_seq in on_startup 2018-11-19 12:16:37 +09:00
Hsiao-Wei Wang
e5a9d4e547 Merge pull request #148 from ethereum/hww/remove_crystallized
Clean up leftover of CrystallizedState
2018-11-19 12:12:49 +09:00
Hsiao-Wei Wang
415ac7a3d7 Clean up leftover of CrystallizedState 2018-11-19 11:51:23 +09:00
Hsiao-Wei Wang
d7ead98ea4 Merge branch 'master' into vitalik9 and fix conflicts 2018-11-19 11:23:50 +09:00
Ben Edgington
c961b3dca8 Add ToDo for state_root specification (#137) 2018-11-19 11:05:53 +09:00
vbuterin
3bdd56b0f8 Fix bugs in #146 (#147)
* Fix bugs in #146

* Update 0_beacon-chain.md

* cleanup  deposit params
2018-11-19 11:02:26 +09:00
vbuterin
1f4aa90788 Merge pull request #107 from ethereum/vbuterin-patch-1
Chain initialization and main chain block inclusion
2018-11-18 07:10:17 -05:00
vbuterin
d889eec555 Oops, accidental duplication 2018-11-18 07:09:50 -05:00
vbuterin
5dc66c328c oops 2018-11-18 07:06:46 -05:00
vbuterin
ca4b670b11 Merge branch 'master' into vbuterin-patch-1 2018-11-18 07:06:01 -05:00
Hsiao-Wei Wang
9e0d38713e Merge pull request #138 from ethereum/vbuterin-patch-3
Move specials into block processing, and clean up specification
2018-11-18 08:02:56 +09:00
Jacek Sieka
ea7ad28298 simplify merkle tree chunking
* pack small items tightly to fit more items in single chunk, decreasing
the number of hash operations needed
* remove chunk padding - hash algorithm will pad to its own block size
anyway
* express data length in number of items instead of binary bytes at leaf
level (equivalent)
2018-11-17 07:59:11 -06:00
vbuterin
10c375244b Cleaned up LOGOUT 2018-11-17 07:51:25 -05:00
Danny Ryan
06cf704e83 fix typo in slashing special 2018-11-17 13:52:49 +09:00
vbuterin
1664414852 Fixed as per hww's comments 2018-11-16 19:41:09 -05:00
vbuterin
eb24f9482d int128 -> int64 2018-11-16 12:20:59 -05:00
vbuterin
57c2deefbb Added description of genesis block 2018-11-16 11:41:59 -05:00
vbuterin
c9c85e8645 Added max specials count. 2018-11-16 10:48:57 -05:00
vbuterin
65dc333549 Move specials into block processing, and clean up specification
Moves the procedure for handling specials into the per-block processing loop. Cleans up the specification for handling them to be more unambiguous, and changes the formats to be more readable and simpler to implement.
2018-11-16 07:54:03 -05:00
Danny Ryan
ac207e4cc8 minor var fix (#136) 2018-11-16 08:23:28 +09:00
Danny Ryan
9825cc98fe Update 0_beacon-chain.md 2018-11-16 08:16:35 +09:00
Danny Ryan
024852c024 Merge branch 'master' into vbuterin-patch-1 2018-11-16 08:13:33 +09:00
Danny Ryan
0f6ec916c7 add design goals and links to phases in readme (#132)
* add design goals and links to phases in readme

* Update README.md
2018-11-16 07:52:06 +09:00
Chih Cheng Liang
2dfa7bc652 Fix a broken markdown table (#134) 2018-11-16 07:51:32 +09:00
vbuterin
5ed4392b54 Minimal replacement of active/crystallized state with single state (#122)
* Minimal replacement of active/crystallized state with single state

* Update specs/beacon-chain.md

Co-Authored-By: vbuterin <v@buterin.com>

* Update specs/beacon-chain.md

Co-Authored-By: vbuterin <v@buterin.com>

* State -> BeaconState

* Update beacon-chain.md

* Update 0_beacon-chain.md
2018-11-15 13:20:25 +00:00