Commit Graph

4867 Commits

Author SHA1 Message Date
Fynn
4c2180be1d WIP: Validator manager contract in solidity
Former-commit-id: 98483e7425feed46ae2a946e7d86461cbcf28d21 [formerly 334390368a91c34c1d66b0e262fcaef293cd6409]
Former-commit-id: 7f5f7dc5385c8cef6ecea39040f915554472a736
2018-01-15 23:01:24 +01:00
Preston Van Loon
92a48ed5a7 remove collation type not part of this PR/branch
Former-commit-id: 62179e39610ce42eae3f2e716c01be8a5dda1c42 [formerly cf4fe8cf7839f178f3d3d27da0b92fe1f83746a5]
Former-commit-id: 8199f36a3b617a55c1fd0ad63b79223e095b0665
2018-01-15 16:46:33 -05:00
Preston Van Loon
2315677271 Merge branch 'master' of github.com:prysmaticlabs/geth-sharding into sharding
Former-commit-id: 9f8c0926411a1f11d0f7c438065a2034d3fc2198 [formerly ebe0e4bedb9c2f92c386e2d52faccdcfb858c8f6]
Former-commit-id: f07aba40e5272616287b078b0ac61046201c70e0
2018-01-15 16:40:35 -05:00
Preston Van Loon
7e09ed395b contract deploy somewhat working
Former-commit-id: 2bccce337d29f12b7a96d5d79be6528c1ddfe6e6 [formerly 853da49db264a445f955c21294909909c59b56f7]
Former-commit-id: d67aece06f67fc24d0a7036646ded876218ce84f
2018-01-15 16:39:00 -05:00
Raul Jordan
21d7f3b529 merge
Former-commit-id: 048bc76c41bf9c9d617474843971140b6f57ca94 [formerly a64442dca80de64e1fadf9e77fcad8c3480c232a]
Former-commit-id: 35a6deb60998c8fe7c5394d9bc4a5a08737585bd
2018-01-15 11:57:05 -06:00
Raul Jordan
31d4fd0678 fix
Former-commit-id: 46792bf21cbfd109e0a912577c47e7c68c1fe09b [formerly 14503cf42f8cb0d70f7b09c9fdefd15a3deefaf7]
Former-commit-id: 72a23597a36b67bd2babb278132fc64807e86ea0
2018-01-15 11:56:50 -06:00
Raul Jordan
6d78659f2f Merge pull request #2 from prysmaticlabs/develop
incl sharding and readme

Former-commit-id: c31a60f6d931f1924cea700d3a660dccd771a0d5 [formerly 4ef03b7e748938ceabf425c3387b7bf2e51d4a07]
Former-commit-id: 2661dec87af1f0187b54c959f0375e81ac4a47e5
2018-01-15 11:49:44 -06:00
Raul Jordan
5442387060 incl sharding and readme
Former-commit-id: c5df26191476ac1fde46c262717d424466d21977 [formerly ed054b1fd30c24a430472ffa2be3c3ba81f1aeae]
Former-commit-id: ed346fd5eb7a50a9b7e8f0557a2245a37d56fb03
2018-01-15 11:41:27 -06:00
Preston Van Loon
50e92a018e add test boilerplate for sharding client
Former-commit-id: 7cbd81db9421e1517ad92829a2dbbdfcf5f38699 [formerly 76607161435699e18a970c82f9838d20e94f04d7]
Former-commit-id: f6db97246aa70eda35e59a2a05fa55316289bd76
2018-01-14 21:59:51 -05:00
Preston Van Loon
9b6f224f83 working on sharding entrypoint
Former-commit-id: 50c0ab4bad92d27bf980e83e64088940544e94c2 [formerly 5dbfb91e925f14a743390f7da6bb2db1a30371db]
Former-commit-id: 66fb852ec273f74baaaf25b5a80987ac284c56ee
2018-01-14 19:10:02 -05:00
Preston Van Loon
95efe2c78d Merge branch 'master' of github.com:prysmaticlabs/geth-sharding into sharding
Former-commit-id: 4e759ee7bae40cd720f533e46fadc8593244a855 [formerly fa345b14cdec6e15c53a332e0e71663d448fdf71]
Former-commit-id: b3c2fc04a5b397e49b7239410369dc0af55e4b5d
2018-01-14 17:41:05 -05:00
Raul Jordan
13f6d24f3b Merge pull request #1 from gitter-badger/gitter-badge-1
Add a Gitter chat badge to README.md

Former-commit-id: 32668d77a6dee920182a9a2c22f74a8a40708cf3 [formerly d09f4ad03ff9b2ad8f1be986f245319d021a3cb4]
Former-commit-id: 1cfd01134be134267dec61650c68261794334612
2018-01-13 17:32:33 -05:00
Raul Jordan
e63320f199 Merge branch 'master' into gitter-badge-1
Former-commit-id: 00382a8e1f2682d4dc99fa8de81cdcce98c262cc [formerly c6d60b00dbab45372afd6d80d3e6cda54c5aeee6]
Former-commit-id: 6c367257e8e009af1387bfc0996379155bdc32da
2018-01-13 17:32:13 -05:00
Raul Jordan
da20785685 Merge branch 'master' into gitter-badge-1
Former-commit-id: 23f542f43b4b493e38f5aa4c29788ed93a63b43b [formerly 71b23a6a28eb045fcfeab6329de69f1e5455486b]
Former-commit-id: d12b3a6decc876f010a71f98e11df7387c1aaf2a
2018-01-13 17:31:28 -05:00
Preston Van Loon
a41e372b39 First pass collation
Former-commit-id: fa0dc873367b92a06b10fd989e3fec960c03065a [formerly e98efffa565ea6aa3eadeb19c2f9a66a56eb5ddd]
Former-commit-id: ce6e4f01d12015e67a51aa7d928a6ab8e8eedeee
2018-01-12 22:59:17 -05:00
The Gitter Badger
f0d28b9a86 Add Gitter badge
Former-commit-id: 149baffe14f39f06a11819bad8cb5f8c39eb7219 [formerly 8af027a6cf4200c6f9eff6ebe309842699b1f896]
Former-commit-id: 7b136b3c018049f368d8d3ce437e56d4ca8623d7
2018-01-11 21:42:34 +00:00
Fynn
8bf9cd853f FreeBSD support
Former-commit-id: ff5dba816571945e8c0837f3ef52485da5fd7314 [formerly 2f23f618fd8f01331b593ab4e064138047fe7c77]
Former-commit-id: 1ec5e7440481e307be5e131ac0a416fd7d2fea9f
2015-07-28 19:16:16 -03:00