dc56d87eef
Revert a couple of renamings
2019-06-10 21:16:51 +01:00
b60314e892
Merge branch 'deposit-contract-justin' of github.com:ethereum/eth2.0-specs into deposit-contract-justin
2019-06-10 16:03:08 +01:00
ef91ee5698
Address Danny's comments
2019-06-10 15:55:08 +01:00
05a35c7228
Tweak inclusion delay rewards and set BASE_REWARD_FACTOR
...
Substantive changes:
1) Split the inclusion delay reward between attester and proposer to add up to at most one base reward. This is analogous to the reward logic in `slash_validator`, and makes the `BASE_REWARDS_PER_EPOCH` constant include proposer rewards.
2) Double `BASE_REWARD_FACTOR` to 2^6 (addressing item 4 in #1054 ). When the total effective balance is 2^17 ETH then maximum annual issuance is a bit below 2^21 ETH. Maximum annual issuance happens when a) all validators make perfect attestations (matching source, target, head, as well as consistent crosslink data), b) all attestations are included as fast as possible (in particular, no skip blocks), and c) there are no slashings.
```python
BASE_REWARD_FACTOR = 2**6
SLOTS_PER_EPOCH = 2**6
SECONDS_PER_SLOT = 6
BASE_REWARDS_PER_EPOCH = 5
GWEI_PER_ETH = 10**9
MAX_TOTAL_EFFECTIVE_BALANCE = 2**27 * GWEI_PER_ETH
TARGET_MAX_ISSUANCE = 2**21 * GWEI_PER_ETH
def integer_squareroot(n: int) -> int:
"""
The largest integer ``x`` such that ``x**2`` is less than or equal to ``n``.
"""
assert n >= 0
x = n
y = (x + 1) // 2
while y < x:
x = y
y = (x + n // x) // 2
return x
MAX_REWARDS_PER_EPOCH = MAX_TOTAL_EFFECTIVE_BALANCE * BASE_REWARD_FACTOR // integer_squareroot(MAX_TOTAL_EFFECTIVE_BALANCE) // BASE_REWARDS_PER_EPOCH
EPOCHS_PER_YEAR = 365.25*24*60*60 / (SECONDS_PER_SLOT * SLOTS_PER_EPOCH)
MAX_REWARDS_PER_YEAR = EPOCHS_PER_YEAR * MAX_REWARDS_PER_EPOCH * BASE_REWARDS_PER_EPOCH
print(MAX_REWARDS_PER_YEAR / TARGET_MAX_ISSUANCE)
```
2019-06-10 15:14:32 +01:00
9bb0f25f18
Update specs/core/0_beacon-chain.md
...
Co-Authored-By: NIC Lin <twedusuck@gmail.com>
2019-06-10 13:41:28 +01:00
36a6c1bf1f
Set MIN_ATTESTATION_INCLUSION_DELAY to 1
...
See item 7 of #1054 . We should consider increasing the slot duration as well.
2019-06-09 21:30:42 +01:00
565f61dfaa
Cleanup containers
2019-06-09 20:41:21 +01:00
4ee00c9cbd
Address HW's comments
2019-06-09 11:03:38 +01:00
d1e589f11f
Remove eth2 genesis in favour of genesis trigger
2019-06-08 19:00:50 +01:00
60d9dc68c4
Apply suggestions from @djrtwo's code review
2019-06-05 21:49:30 +02:00
38414c2e4e
Merge branch 'dev' into dankrad-patch-7
...
* dev:
add beaconblockheader back to toc
Move crosslink above attestation data
Change data structure to match beacon state order
Reorganize data structures to mirror beacon state order
Update 0_beacon-chain.md
2019-06-05 20:28:14 +02:00
1daff359ba
Merge pull request #1139 from terencechain/patch-76
...
Use get_total_balance for get_attestation_deltas
2019-06-05 10:14:28 -06:00
853c34eb60
add beaconblockheader back to toc
2019-06-05 09:50:15 -06:00
d761b6f041
Implements new SSZ types
2019-06-05 15:29:26 +02:00
c250296d8a
Move crosslink above attestation data
2019-06-05 15:07:50 +09:00
65d2a50219
Change data structure to match beacon state order
2019-06-05 14:57:54 +09:00
e83500cef8
Reorganize data structures to mirror beacon state order
2019-06-05 14:52:09 +09:00
9bdb18245e
remove tautological type definition
2019-06-04 18:22:42 +02:00
fe9c708d83
Fix whitespace
...
Co-Authored-By: Danny Ryan <dannyjryan@gmail.com>
2019-06-04 15:31:20 +02:00
2246f1b934
Update 0_beacon-chain.md
2019-06-02 13:13:52 -07:00
e044305457
Merge branch 'dev' into ssz-impl-rework
2019-06-01 01:34:49 +02:00
5155bc6c4f
Makes everything pass around
2019-05-30 22:57:18 +02:00
f0314bec52
Merge branch 'dev' into JustinDrake-patch-13
2019-05-29 20:15:17 -06:00
2aea4b93d0
Merge pull request #1123 from ethereum/JustinDrake-patch-14
...
Avoid divisions by zero
2019-05-29 20:14:23 -06:00
6ec59867ef
Fix linter errors
2019-05-30 09:53:46 +08:00
1c416541e1
Update 0_beacon-chain.md
2019-05-29 23:40:46 +03:00
6286fb3fb5
Merge branch 'dev' into JustinDrake-patch-13
2019-05-28 18:15:33 -06:00
8737984e19
introduce back assert, modified to allow valid but non-effective calls
2019-05-28 16:05:25 +02:00
bfa45e06f0
merge dev -> d-p-7
2019-05-28 11:15:17 +02:00
0e9a047b1d
Merge branch 'dev' into ssz-impl-rework
2019-05-28 00:42:35 +02:00
f3088884b3
Minor adjustments + getting the beacon spec doc ready
2019-05-27 20:29:53 +02:00
d3d8b36365
Merge branch 'dev' into v06x-to-dev
2019-05-27 11:09:52 -06:00
a82a6f9a1a
Sort attester slashing indices to avoid arbitrary ordering
...
Closes #1125
2019-05-27 17:36:20 +10:00
cdfb886c22
Avoid divisions by zero
...
Possible fix to avoid four cases of divisions by zero:
* `return state.validator_registry[index].effective_balance // adjusted_quotient // BASE_REWARDS_PER_EPOCH`
* `rewards[index] += get_base_reward(state, index) * attesting_balance // total_balance`
* `validator.effective_balance * min(total_penalties * 3, total_balance) // total_balance`
* `rewards[index] += base_reward * attesting_balance // committee_balance`
See also #1107 .
2019-05-26 18:42:37 +03:00
3b4d9b7a85
Class-ified the type definitions
2019-05-25 16:14:52 -04:00
81cb4a23b3
update some common usage of SSZ types, as a start
2019-05-25 00:10:06 +02:00
d805fb5084
Simplify deposits
2019-05-25 00:35:17 +03:00
ac9564c2b7
Adds Insert-into-label functionality
2019-05-24 16:51:21 +02:00
c13421a9a7
type hinting for fork version
...
Co-Authored-By: Hsiao-Wei Wang <hwwang156@gmail.com>
2019-05-22 16:52:44 -04:00
6b5f4b44ea
avoid zero constant for deposits fork-version, just default to it
2019-05-22 01:39:20 +02:00
b919d08ab2
comment on the deposit signature being soft-rejected
2019-05-22 00:07:52 +02:00
b075a7a0ab
add bls_domain to toc
2019-05-21 11:33:52 -06:00
847fcf52cc
utilize bls_domain directly for deposits
2019-05-21 11:30:38 -06:00
7a9097ec23
Merge branch 'dev' into fix-deposit-forkv
2019-05-21 11:04:13 -06:00
14c4d63f2a
Merge pull request #1097 from ethereum/vbuterin-patch-3
...
Crosslinks store start and end epoch
2019-05-20 09:53:24 -04:00
83123a33da
Set genesis_state.latest_block_header with `body_root` of empty BeaconBlockBody ( #1098 )
2019-05-20 17:16:20 +08:00
85c1654456
Crosslinks store start and end epoch
...
Solves #1034
2019-05-19 09:33:01 -04:00
694b31b934
Update 0_beacon-chain.md
2019-05-17 06:11:39 -04:00
f19188816b
Update 0_beacon-chain.md
2019-05-17 06:07:38 -04:00
05f9dc7baa
Fix #1090
...
Avoid signed integer
2019-05-17 05:59:01 -04:00
c60635d2c9
Update 0_beacon-chain.md
2019-05-14 06:15:03 +01:00
5ba90d68e1
add flag for validate state root
2019-05-13 16:53:28 -04:00
a0a2aa90de
lint
2019-05-13 16:40:45 -04:00
27c8e41b32
Merge branch 'dev' into JustinDrake-patch-14
2019-05-13 16:29:29 -04:00
08faa86d70
POC ssz types spec build + update spec defs, typing still needs work
2019-05-12 23:56:53 +02:00
acf07892bb
Merge pull request #1065 from ethereum/linter
...
Add linter
2019-05-11 16:31:45 +02:00
ae19521ea8
Update the docstring of initiate_validator_exit ( #1072 )
2019-05-11 19:41:05 +08:00
a4ba283d67
Limit to 120 characters per line
...
Limit to 120 characters per line
2019-05-09 14:34:23 +08:00
c37157ead1
Revert exception handling
2019-05-08 19:15:23 +01:00
33e5b98f17
Merge branch 'dev' into JustinDrake-patch-10
2019-05-08 08:42:47 -06:00
af2bb7d6f6
Merge pull request #1044 from ethereum/JustinDrake-patch-21
...
Crosslink in AttestationData
2019-05-08 08:35:06 -06:00
62c44ffce3
Refactor to validate_indexed_attestation
2019-05-07 17:34:19 +01:00
ecc6429b9e
Address Danny's comment
2019-05-07 15:01:23 +01:00
22b06d581d
Update instances of int_to_bytes
2019-05-07 10:57:41 +01:00
b1520ea967
Update 0_beacon-chain.md
2019-05-07 10:33:51 +01:00
9eeca0cdbd
Merge branch 'dev' into JustinDrake-patch-14
2019-05-07 10:16:38 +01:00
50009ea85b
Implement HW's exception-handling suggestion
2019-05-07 10:12:33 +01:00
f371daeb20
Update specs/core/0_beacon-chain.md
...
Co-Authored-By: JustinDrake <drakefjustin@gmail.com>
2019-05-07 09:01:07 +01:00
964e55cd4a
block_body_root => body_root
2019-05-07 08:52:56 +01:00
3a309155aa
fix deposit domain: forks are ignored for deposit validity, deposits are always accepted, if coming from the correct contract(s).
2019-05-06 22:06:00 +02:00
ea60fb632c
More renaming
2019-05-06 20:49:46 +01:00
f4db9ebae0
Renamings triggered by HW comment
2019-05-06 18:26:14 +01:00
8b1a2edb7c
Fix genesis bug
2019-05-06 17:53:49 +01:00
7ba13aa4c5
Merge branch 'dev' into JustinDrake-patch-21
2019-05-06 17:48:09 +01:00
b15105e1cb
Address Danny's comment
2019-05-06 17:34:03 +01:00
5c2bca4a0d
Merge pull request #1051 from ethereum/JustinDrake-patch-22
...
Fix #1050
2019-05-06 10:12:13 -06:00
4367a9bb0d
Merge pull request #1049 from ethereum/JustinDrake-patch-20
...
Cosmetic genesis cleanups
2019-05-06 10:06:15 -06:00
d1c96c1e0d
Doc standardization ( #1039 )
2019-05-06 16:30:32 +01:00
2c3bbac803
Fix #1050
2019-05-05 19:30:55 +01:00
6aff277b1a
Update 0_beacon-chain.md
2019-05-05 17:20:25 +01:00
a3bbf20bf7
Update 0_beacon-chain.md
2019-05-05 17:17:18 +01:00
bf20031755
Cosmetic genesis cleanups
2019-05-05 17:15:05 +01:00
5fb32fd19b
Fix tests
2019-05-05 12:10:39 +01:00
a6e825d460
Update 0_beacon-chain.md
2019-05-05 12:04:34 +01:00
d5d2f7835a
Rearranging one >= statement to make it more non-underflow-friendly
2019-05-03 22:51:59 -05:00
f57d6fa28e
Merge pull request #1038 from ethereum/master
...
backport v0.6.1 into dev
2019-05-03 16:28:24 -06:00
4c1073fa2f
Update 0_beacon-chain.md
2019-05-03 22:22:19 +01:00
197a7200ef
Add HW and Danny comments
2019-05-03 21:21:42 +01:00
6318a21ca6
fix minor typo in attestation rewards
2019-05-03 10:37:39 -06:00
c24002bb1e
Merge pull request #1025 from terencechain/patch-70
...
Add comment for `get_churn_limit`
2019-05-03 09:16:39 -06:00
d15ca4c50c
replace asserts in get_active_index_root and get_randao_mix with comment
2019-05-02 18:11:11 -06:00
9f2cdd9c78
Update 0_beacon-chain.md
2019-05-02 11:07:25 +01:00
c761fbc318
Clean up verify_indexed_attestation
...
Cosmetic changes:
* Add 4 lines of comments (now every statement has a comment)
* Avoid unnecessary `assert` (the end goal for me is for `assert`s to be exclusive to the operation processing helpers).
* Merge `return`s into one (increase readability, reduce verbosity)
* Use shorter-named `bit_0_indices` and `bit_1_indices` helper variables
Substantive change:
* Remove the condition that `len(0_indices) + len(1_indices) > 0`. This condition is redundant in the context of `process_attester_slashing` because of `slashed_any`. It is largely artificial in `process_attestation` where validators are incentivised to maximise new attestations.
2019-05-02 09:24:24 +01:00
b169c42339
fix underflows in generate_seed, get_randao_mix, and get_active_index_roots
2019-05-01 17:44:34 -06:00
d28e5e4843
Update 0_beacon-chain.md
2019-05-01 16:26:18 -07:00
6242e54c0a
Merge branch 'JustinDrake-patch-11' of github.com:ethereum/eth2.0-specs into JustinDrake-patch-11
2019-05-01 17:06:23 -06:00
1bb9397b65
Merge pull request #1014 from ethereum/JustinDrake-patch-10
...
Add 32-byte graffiti
2019-05-01 16:30:02 -06:00
ef72b7ec20
Merge branch 'master' into vbuterin-patch-2
2019-05-01 16:19:21 -06:00
002e27973c
alter get_winning_crosslink.. to have same function signature as get_crosslink_committee
2019-05-01 15:51:43 -06:00
e85678ac15
restore compute_committee
2019-05-01 15:21:38 +01:00
7980cf3ef7
Fix
2019-05-01 15:07:55 +01:00
a25103cefd
Merge pull request #1013 from terencechain/patch-69
...
Generate seed once for get_beacon_proposer_index
2019-05-01 07:56:57 -06:00
9b24d06b2c
Cleanup
2019-05-01 14:16:55 +01:00
2e63a9b5a0
clean up
2019-05-01 13:29:03 +01:00
5df79d7565
Get rid of state_transition.py
2019-05-01 13:14:10 +01:00
591a2b47c8
Simplify state_transition.py
2019-05-01 12:08:15 +01:00
8b316c6db4
Start moving state_transition.py to state transitition spec
...
The state transition spec should be reasonably self-contained, limiting the amount of "magic" outside of it. This PR is a first step in this direction, specifically for operation processing.
2019-05-01 12:04:27 +01:00
f62126d5ee
Update 0_beacon-chain.md
2019-05-01 09:34:09 +01:00
407902763c
Update 0_beacon-chain.md
2019-05-01 09:33:22 +01:00
427a53cdae
Remove get_state_root from state transition doc
...
Remove `get_state_root` from the state transition function spec because it is not used by the state transition function.
2019-05-01 09:24:51 +01:00
bbcf5f0daa
Add 32-byte graffiti
...
Add 32-byte of arbitrary "graffiti" data in beacon blocks, in a similar vein to `extraData` in Eth1. To be used in wonderful and unpredictable ways (permissionless innovation by block proposers).
2019-05-01 09:19:54 +01:00
a0158c606e
Expose get_commitee
2019-05-01 09:09:24 +01:00
a6e76ef9c6
Fix
2019-05-01 08:45:29 +01:00
2e5ab130c1
Simplify presentation
2019-05-01 07:42:49 +01:00
b3373a2d71
fix up some PR feedback and testing for #1009
2019-04-30 12:55:14 -06:00
c5d6c045e6
Update 0_beacon-chain.md
2019-04-30 11:07:58 -07:00
a40f37b9a2
Update 0_beacon-chain.md
2019-04-30 12:31:11 +01:00
60888c0c48
Update 0_beacon-chain.md
2019-04-30 12:27:45 +01:00
a23c9f712d
Update 0_beacon-chain.md
2019-04-30 11:44:21 +01:00
adfa014a30
Update 0_beacon-chain.md
2019-04-30 11:38:11 +01:00
73603f4ed6
Update 0_beacon-chain.md
2019-04-30 11:34:57 +01:00
66403ad853
Update 0_beacon-chain.md
2019-04-30 11:00:23 +01:00
09ed9aea98
Update 0_beacon-chain.md
2019-04-30 10:55:09 +01:00
b19e7dbf0d
Update 0_beacon-chain.md
2019-04-30 10:44:29 +01:00
92140d199e
Update 0_beacon-chain.md
2019-04-30 10:41:09 +01:00
bcd7a83af4
Update 0_beacon-chain.md
2019-04-30 10:39:18 +01:00
59d7be60db
Fix `is_double_vote` and `is_surround_vote`
2019-04-30 15:19:11 +08:00
c13c4c5c7b
Calculate historical start shards from state
2019-04-30 02:09:52 -05:00
dc458bfd2b
Merge pull request #1004 from ethereum/JustinDrake-patch-10
...
Fix two effective_balance bugs
2019-04-29 12:06:27 -06:00
77d7aa7630
Attestation committee refactor
...
* Remove `get_crosslink_committees_at_slot` (that function's ugly man...)
* Make the "base" that everything works off instead be `get_crosslink_committee`
* Attestations store epoch, start shard and shard, no longer slot (slot can be calculated from the other three)
* Retaining start shard in attestations allows `get_attesting_indices` to peek much further back into the past, making it useful for slashings (Phase 1)
* Some two-layer-deep nested loops become one-layer-deep loops
2019-04-29 11:02:39 -05:00
9dd4b2110a
Fix two effective_balance bugs
...
* Initialisation bug: initial `effective_balance` be not greater than `MAX_EFFECTIVE_BALANCE`
* Hysteresis bug: do not prevent `effective_balance` to go from `MAX_EFFECTIVE_BALANCE - 1` to `MAX_EFFECTIVE_BALANCE`
2019-04-26 18:46:35 +04:00
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
48bdfd8642
Merge branch 'master' into hwwhww/clean_up
2019-04-26 08:40:50 -06:00
649dbfdf6c
bugfix: missing validator
2019-04-26 14:43:05 +08:00
fc7d57eec6
PEP8-ish clean up
2019-04-25 16:03:02 +08:00
6a92267527
`_deltas` functions should return tuple instead of list
2019-04-25 15:37:05 +08:00
777590434b
Merge branch 'dev' into JustinDrake-patch-20
2019-04-24 13:37:50 -06:00
2b999a6c7e
fix off by one error for eth1 data voting
2019-04-24 13:15:06 -06:00
20d65e040b
pr feedback
2019-04-24 11:31:24 -06:00
b1e1510e21
Update 0_beacon-chain.md
2019-04-24 20:57:31 +10:00
4734b22883
simplify
2019-04-24 15:32:43 +10:00
b361fdb385
bug
2019-04-24 15:29:46 +10:00
c37789dc5d
Tests fixed
2019-04-24 15:27:47 +10:00
55f042aa71
More fixes
2019-04-24 15:17:25 +10:00
df64eeefa0
Start fixing tests
2019-04-24 14:46:28 +10:00
de01ffd38d
Merge branch 'dev' into JustinDrake-patch-14
2019-04-24 14:35:02 +10:00
f2d885f0d8
Address Danny's comments
2019-04-24 14:23:51 +10:00
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
cf1c78b241
Update 0_beacon-chain.md
2019-04-23 12:55:15 -05:00
e26112af37
Update 0_beacon-chain.md
...
typo fix
2019-04-23 08:36:40 -07:00
5619e7df9c
Update 0_beacon-chain.md
2019-04-23 09:21:30 -06:00
2650a2c061
Update 0_beacon-chain.md
2019-04-23 07:16:52 -07:00
fe01b6f231
Merges dev into carl-patch-1
2019-04-23 13:39:19 +02:00
59de05e3e3
Merge pull request #977 from ethereum/JustinDrake-patch-19
...
Fix activation queue bug
2019-04-22 11:29:42 -06:00
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
706191403c
Merge branch 'dev' into JustinDrake-patch-18
2019-04-22 09:48:43 -06:00
0079c635b6
Merge pull request #924 from ethereum/JustinDrake-patch-11
...
Remove serialization from consensus
2019-04-22 09:41:30 -06:00
d648b091b5
lint
2019-04-22 09:33:46 -06:00
5744fef808
clean up some notes on deposits
2019-04-22 09:18:20 -06:00
0bdd8e778b
Add 0_deposit-contract.md
2019-04-22 23:29:19 +10:00
9404949015
Split off fork choice in a separate document
2019-04-22 23:18:17 +10:00
1c5cc1299a
Update specs/core/0_beacon-chain.md
...
Co-Authored-By: JustinDrake <drakefjustin@gmail.com>
2019-04-22 20:49:07 +10:00
81ee59bca8
Update 0_beacon-chain.md
2019-04-22 16:34:50 +10:00
6903f2eec7
Update 0_beacon-chain.md
2019-04-22 16:17:14 +10:00
c123fb1b97
Single effective balance per review by Vitalik—significant simplification
2019-04-22 16:13:46 +10:00
dc275f024d
Update 0_beacon-chain.md
2019-04-22 15:16:34 +10:00
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
08d921a6c9
Make crosslink_data_root comment more explicit ( #973 )
2019-04-21 15:48:02 +10:00
75fae6f311
Change sorted[-1] to max() ( #972 )
2019-04-20 18:13:45 +10:00
d6644edcc9
Fix test
2019-04-20 17:12:40 +10:00
a2a737b728
Signal non-final status of base reward and desired issuance goal
2019-04-20 01:45:18 -05:00
7642abf114
Fix|
2019-04-20 16:36:34 +10:00
e184f0b3fe
Fix
2019-04-20 16:35:02 +10:00
06f475a844
Fixes
2019-04-20 16:32:41 +10:00
d700ea4406
Fixes
2019-04-20 16:10:25 +10:00
f07b94e77c
Fixes
2019-04-20 15:37:12 +10:00
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
4d26ae255a
Bug fix
2019-04-20 15:31:15 +10:00
d067a9fcf2
Merge branch 'dev' into JustinDrake-patch-14
2019-04-20 15:19:21 +10:00
f908c8d3e0
Revamped balances and incentivisation
2019-04-20 15:17:33 +10:00
39d0822602
Sane SSZ object default values ( #963 )
2019-04-19 18:26:54 +10:00
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
408ef7e6eb
Merge branch 'dev' into carl-patch-1
2019-04-19 14:50:48 +08:00
523800819b
Merge branch 'dev' into vbuterin-patch-2
2019-04-18 21:17:29 -06:00
7a435d2e1a
Merge branch 'dev' into JustinDrake-patch-14
2019-04-19 09:37:11 +08:00
26afa077fd
Resolves conflicts and merges in dev
2019-04-18 23:17:53 +02:00
faa6a46f15
Merge branch 'dev' into JustinDrake-patch-11
2019-04-18 11:45:45 -06:00
741a74a02c
re-add crosslink tests and ensure pass
2019-04-18 11:16:50 -06:00
d6e616d4fe
Merge branch 'dev' into carl-patch-1
...
* dev:
Cleanup per-epoch processing presentation (#959 )
2019-04-18 12:02:10 +02:00
fb641bc05f
Merge branch 'dev' into JustinDrake-patch-14
2019-04-18 19:51:17 +10:00
7a016489c1
Moar
2019-04-18 19:33:38 +10:00
857d9b2ed9
Merge branch 'dev' into prev-cur-crosslinks
2019-04-18 19:09:41 +10:00
d4ce0d20a0
Cleanup per-epoch processing presentation ( #959 )
2019-04-18 19:08:34 +10:00
172e106b48
merge
2019-04-18 18:59:44 +10:00
4244db92ad
More cleanups
2019-04-18 18:53:22 +10:00
743193aa7d
nitpicks
2019-04-18 16:53:02 +08:00
cae5c22718
Simplify get_crosslink_committee_for_attestation and move to test helpers
2019-04-18 18:15:20 +10:00
6975288254
Merge branch 'dev' into carl-patch-1
2019-04-18 17:52:56 +10:00
72f4e2d3b6
Update 0_beacon-chain.md
2019-04-18 17:51:50 +10:00
40a898f125
Update 0_beacon-chain.md
2019-04-18 17:46:31 +10:00
Justin Drake
Carl Beekhuizen
Danny Ryan
Ivan Martinez
protolambda
terence tsao
Hsiao-Wei Wang
Michael Sproul
vbuterin
Ryuya Nakamura
JSON
Alex Stokes