Commit Graph

1372 Commits

Author SHA1 Message Date
Danny Ryan b69423f29b
Merge pull request #996 from ethereum/return_tuple
`_deltas` functions should return `Tuple` instead of `List`
2019-04-26 08:44:51 -06:00
Danny Ryan 48bdfd8642
Merge branch 'master' into hwwhww/clean_up 2019-04-26 08:40:50 -06:00
Hsiao-Wei Wang 649dbfdf6c
bugfix: missing validator 2019-04-26 14:43:05 +08:00
Hsiao-Wei Wang fc7d57eec6
PEP8-ish clean up 2019-04-25 16:03:02 +08:00
Hsiao-Wei Wang 6a92267527
`_deltas` functions should return tuple instead of list 2019-04-25 15:37:05 +08:00
Danny Ryan 777590434b
Merge branch 'dev' into JustinDrake-patch-20 2019-04-24 13:37:50 -06:00
Danny Ryan 2b999a6c7e
fix off by one error for eth1 data voting 2019-04-24 13:15:06 -06:00
Danny Ryan 20d65e040b
pr feedback 2019-04-24 11:31:24 -06:00
Justin b1e1510e21
Update 0_beacon-chain.md 2019-04-24 20:57:31 +10:00
Justin Drake 4734b22883 simplify 2019-04-24 15:32:43 +10:00
Justin Drake b361fdb385 bug 2019-04-24 15:29:46 +10:00
Justin Drake c37789dc5d Tests fixed 2019-04-24 15:27:47 +10:00
Justin Drake 55f042aa71 More fixes 2019-04-24 15:17:25 +10:00
Justin Drake df64eeefa0 Start fixing tests 2019-04-24 14:46:28 +10:00
Justin de01ffd38d
Merge branch 'dev' into JustinDrake-patch-14 2019-04-24 14:35:02 +10:00
Justin f2d885f0d8
Address Danny's comments 2019-04-24 14:23:51 +10:00
Danny Ryan 7b7b867e7d
Merge pull request #936 from ethereum/carl-patch-1
Enables transfers of balance proportions > 32 ETH
2019-04-23 12:24:13 -06:00
JSON cf1c78b241
Update 0_beacon-chain.md 2019-04-23 12:55:15 -05:00
Alex Stokes e26112af37
Update 0_beacon-chain.md
typo fix
2019-04-23 08:36:40 -07:00
Danny Ryan 5619e7df9c
Update 0_beacon-chain.md 2019-04-23 09:21:30 -06:00
terence tsao 2650a2c061
Update 0_beacon-chain.md 2019-04-23 07:16:52 -07:00
Carl Beekhuizen fe01b6f231
Merges dev into carl-patch-1 2019-04-23 13:39:19 +02:00
Danny Ryan 59de05e3e3
Merge pull request #977 from ethereum/JustinDrake-patch-19
Fix activation queue bug
2019-04-22 11:29:42 -06:00
Danny Ryan d9b3021827
Merge pull request #971 from ethereum/vbuterin-patch-2
Signal non-final status of base reward and desired issuance goal
2019-04-22 11:15:10 -06:00
Danny Ryan 706191403c
Merge branch 'dev' into JustinDrake-patch-18 2019-04-22 09:48:43 -06:00
Danny Ryan 0079c635b6
Merge pull request #924 from ethereum/JustinDrake-patch-11
Remove serialization from consensus
2019-04-22 09:41:30 -06:00
Danny Ryan d648b091b5
lint 2019-04-22 09:33:46 -06:00
Danny Ryan 5744fef808
clean up some notes on deposits 2019-04-22 09:18:20 -06:00
Justin Drake 0bdd8e778b Add 0_deposit-contract.md 2019-04-22 23:29:19 +10:00
Justin 9404949015
Split off fork choice in a separate document 2019-04-22 23:18:17 +10:00
Hsiao-Wei Wang 1c5cc1299a
Update specs/core/0_beacon-chain.md
Co-Authored-By: JustinDrake <drakefjustin@gmail.com>
2019-04-22 20:49:07 +10:00
Justin 81ee59bca8
Update 0_beacon-chain.md 2019-04-22 16:34:50 +10:00
Justin 6903f2eec7
Update 0_beacon-chain.md 2019-04-22 16:17:14 +10:00
Justin Drake c123fb1b97 Single effective balance per review by Vitalik—significant simplification 2019-04-22 16:13:46 +10:00
Justin dc275f024d
Update 0_beacon-chain.md 2019-04-22 15:16:34 +10:00
Justin 0da60ba90d
Fix activation queue bug
Fix bug [flagged by @NIC619 and @hwwhww](https://github.com/ethereum/eth2.0-specs/pull/850#issuecomment-485275575) whereby the `activation_epoch` of validators dequeued since the finalized epoch was overwritten.

Cosmetic changes:

1) Remove `activate_validator` (there is no overlap between genesis and non-genesis activations)
2) Improve comments related to activation queue
2019-04-22 15:12:30 +10:00
terence tsao 08d921a6c9 Make crosslink_data_root comment more explicit (#973) 2019-04-21 15:48:02 +10:00
Diederik Loerakker 75fae6f311 Change sorted[-1] to max() (#972) 2019-04-20 18:13:45 +10:00
Justin Drake d6644edcc9 Fix test 2019-04-20 17:12:40 +10:00
vbuterin a2a737b728
Signal non-final status of base reward and desired issuance goal 2019-04-20 01:45:18 -05:00
Justin Drake 7642abf114 Fix| 2019-04-20 16:36:34 +10:00
Justin Drake e184f0b3fe Fix 2019-04-20 16:35:02 +10:00
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
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
Justin cc92ee9f67
Update 0_beacon-chain.md 2019-04-17 15:53:24 +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
Justin 6f56c379d6
Simplify get_justification_and_finalization_deltas
Cosmetic changes related to `get_justification_and_finalization_deltas`:

* Review naming of misc helper functions and variables
* Abstract away common logic and rework for readability
* Add `MAX_FINALITY_LOOKBACK` and `BASE_REWARDS_PER_EPOCH` constants
* Rescale `INACTIVITY_PENALTY_QUOTIENT`

Substantive changes:

* Make logic relative to `previous_epoch` throughout (as opposed to mixing `current_epoch` and `previous_epoch`)
* Replace inclusion delay bonus by an inclusion delay penalty
2019-04-17 14:06:28 +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