Commit Graph

852 Commits

Author SHA1 Message Date
Yutaro Mori
ad291e93f6 perf improvements to CalculatePOC (#182)
Sharding: proof of custody performance improvements
Former-commit-id: 6a41b5031298579c78d848277fbdff77de27b5f3 [formerly 31a818a367d311f8c7021b9a6b5cad986e53baf3]
Former-commit-id: 2c992bf3b2c98573db021f46680a48ccc632f25b
2018-06-18 07:06:02 -07:00
Preston Van Loon
f32f7ba36c sharding: Internal helper package (#189)
* move log helper to internal package

* move log helper

* Add readme


Former-commit-id: cc9eaa1e87415c031841f367c30dc3b20cd54858 [formerly 60a22abaff65803fbad00a089f842e6e23e9ec9f]
Former-commit-id: 62769aedb094e51fb87757d174b7c6fc77464f96
2018-06-17 14:57:50 -04:00
Preston Van Loon
ab2954a693 Add a log handler helper (#188)
sharding: add a log-handler helper for tests

Former-commit-id: fb083848d8615f36786f5c6b96a2182a8be21b9d [formerly 1c62e207943d9265a59f0ff6577479c6a2eaf76b]
Former-commit-id: 0677762c40db862185c7b951e419473949b761c9
2018-06-17 12:40:35 -05:00
Raul Jordan
50c69a6571 Simplify Interfaces Into Smaller, Useful Ones (#184)
sharding: simplified all interfaces, into smaller, more useful ones
Former-commit-id: c49a98c4c57bcce710d91034804fe270b2567645 [formerly fe0fb3f69dff87c40a98da4a5e7f52d0ac1106aa]
Former-commit-id: 73f6b5c33b5c3197bf76096cf18cc490acb16462
2018-06-17 12:39:42 -05:00
Preston Van Loon
912b3b65bd FIx start/stop of ShardEthereum (#185)
* sharding: Fix mainchain.Client starting RPC connections during ShardEthereum.New. Fix graceful stop

* sharding: Just pass the cli.Context rather than keeping it on the shardEthereum

* sharding: add doc

* sharding: add doc

* Sharding: remove exgtra newline

* sharding:fix lint


Former-commit-id: fdaf8160245d9233b693f685ba6078e4b15fa279 [formerly f7fa71912b7d8340ede6cd08b357056fafbab014]
Former-commit-id: 0e8bfbbc579451178f76263364fdbcd00a91d651
2018-06-16 22:26:03 -04:00
Raul Jordan
9e1c76e693 Merge pull request #133 from elihanover/construct-collation
Construct Collation and Merklize Chunks into chunkRoot

Former-commit-id: d4ed64c3d3802f1bfc330d6d4c7ee18109cd3f85 [formerly 1c70ba631e08220189b16315f28b477172d07d55]
Former-commit-id: 1ab7be7a53c31ee96b9c3abdbdc198eff874207f
2018-06-13 21:10:12 -05:00
Eli
5f7237a468 Merge branch 'master' into construct-collation
Former-commit-id: 74b350ce5e3ff691d96619841d8c79dd8bb3fc31 [formerly 74164493417986920fe40d0543335046d85fd9fd]
Former-commit-id: b487569e8cf816856c37d9d7c74244cf1e9a057c
2018-06-13 15:31:32 -07:00
Terence Tsao
ff79950641 sharding: fixed lint
Former-commit-id: 52c3570cba9b5b78d853807b10a7ee599c5c059b [formerly c4e2137e7de6c3fa6b921f8bb1a630cde1ce5ca5]
Former-commit-id: 973d4e99f27a6411386ef91ee84ea92faf72fa4c
2018-06-13 12:07:15 -07:00
Raul Jordan
886cf9e607 Merge branch 'master' into remove-interfaces
Former-commit-id: a6527d7858355b3de4df270d00d9a94031fdc892 [formerly 4a5eaa82a48de4cc0112424fde2a17c49fba4a10]
Former-commit-id: 4e91334e6c5fce26e408a083a69b8533dd76cf7b
2018-06-13 12:41:46 -05:00
Terence Tsao
1bd464aade updated shardConfig to config
Former-commit-id: ec3595f6111b15e2ea6a3ecd35e6a3934314a662 [formerly df7289f224ce6bc35ef9dd2ec6e129662aad3489]
Former-commit-id: ae8e1f1b95b113767cb3fa0e0835e59043ceca32
2018-06-13 10:37:23 -07:00
Eli
b92ce331fa Merge branch 'master' into construct-collation
Former-commit-id: 53a154aaaf9e1fc47d578c8755393d6bc37aa3a8 [formerly c2ec003f8e3948f4d5ed80821fafb6a24e8f7948]
Former-commit-id: f568728bbc65af284e4d417f92343e4c82fc9f25
2018-06-13 08:38:26 -07:00
Eli
8752d76677 sharding: corrected error type
Former-commit-id: 30968e4992b491fc7ebeac4abba65cd4338d6785 [formerly 47e1c6c092170002d46d2513c23af44fd81f5e92]
Former-commit-id: 385f981d0ecd7d658b74c7de55ea90946df313e8
2018-06-13 08:21:53 -07:00
Raul Jordan
6889eedcd1 Merge pull request #174 from prysmaticlabs/p2p-feed-api
Peer to Peer Feed API

Former-commit-id: 7a38354c89c2c0d85f52c5bfb2f59b11c8615f1f [formerly 7c73afa67bf0296a565991f85f207e857385e4f7]
Former-commit-id: d85cde67fdc27e55ecd3962108771c320b14c41a
2018-06-13 10:16:58 -05:00
Raul Jordan
3ac72f079f Merge branch 'master' into p2p-feed-api
Former-commit-id: faabf714ec639427d33022c67456fc53fd97e6b8 [formerly a7ceba7cb6ae65b1f8b49f11b27cbbe0373be033]
Former-commit-id: 3113062927fafdbca335748eea40796437ae0612
2018-06-13 09:19:51 -05:00
Preston Van Loon
67c37cde39 Remove unnecessary interface. Remove "shard" prefix from many places
Former-commit-id: 3782465be416107779942a03984ae0b77e5efd20 [formerly 6ef8e5ea1b51845a9510e0597681a001f602076d]
Former-commit-id: 0bd84c0478896264737f96ec4d08e9587dd2172c
2018-06-13 08:44:33 -04:00
Preston Van Loon
9ab76dc1f6 add TODO issues, fix typo
Former-commit-id: 797bc1cf3a759f2a55dbf1ce790c3f599682448c [formerly 8f4e5d953c3e553944db263a76c142ffccad516d]
Former-commit-id: c7c1e3e2d340c8cd5f97e4549fa46a7959be06c6
2018-06-13 07:44:45 -04:00
Terence Tsao
b41b8c823a sharding: use pointer for default config
Former-commit-id: 47354dddbeb7c5db47c79c5b929524d221f35814 [formerly 570a02de295c3d30c1b03327615dcb3d47c8c363]
Former-commit-id: 329af4b67168e0a58b7bae38c16cae4354fbf808
2018-06-12 20:11:07 -07:00
Preston Van Loon
240e6da7c9 better docs
Former-commit-id: baccf088d88578ae6e13d0091c06420cc8f78199 [formerly 07d1b108fb118ab4cd0cf6fc8fefad70431d3409]
Former-commit-id: d1bac4c0b5faf5a21b111af0d6ed45b245272e7d
2018-06-12 23:03:13 -04:00
Preston Van Loon
b4702f9966 Typo
Former-commit-id: f40d1c783e9196c769c6dd5132de2175edfda64e [formerly b67787261f69ede4c8a6763cc31832d0005011ad]
Former-commit-id: 041b9dcf7a86f3966ce85dfdfe048aa9973e46bb
2018-06-12 23:02:07 -04:00
Preston Van Loon
5fa1090821 Add feed example
Former-commit-id: c2752225dd7c5aa19b8e1bd79f4513493e4cfbda [formerly cb091e596b79767eee5b312df94054d13be0f698]
Former-commit-id: 2471f1863d552209ee48324b2d26710b9ea246d8
2018-06-12 22:43:19 -04:00
Preston Van Loon
489eb89f2e Fix typo
Former-commit-id: 04ec02588f6f38a4dcc737126449998fb4f01e29 [formerly c6580d7eb8565c615e3684615e2d87cb101d5ce7]
Former-commit-id: ec51ad69a7ad5062bf285b18e04d4a716f4d04c0
2018-06-12 22:23:12 -04:00
Preston Van Loon
ddf419d029 merge conflict
Former-commit-id: 4efc6f5db110d81c745c090e9c171e6b8b90f00d [formerly 0d786d9e9890ff5182e9b78176b04fe05432a8d8]
Former-commit-id: 1d23ef11a165596a3ef28c6ffc6d0458e008a749
2018-06-12 22:15:12 -04:00
Preston Van Loon
7abcc195ed Add placeholder methods for Send and Broadcast
Former-commit-id: fd78c149bb1b19439ed3a6b1f6036d8f381f2879 [formerly cdcc33a37eea0c297dbe05d21f2fcbbf38b1503e]
Former-commit-id: ee7a588c5eecdf3cf5b2e05191359d8cb7a8798c
2018-06-12 22:13:24 -04:00
Preston Van Loon
5b70c21731 Add link to design doc
Former-commit-id: c9fbe47ad80943eb96194433e843769f19bb8cf3 [formerly 2a24667a14daa6cb6ef96b1c56529acf09844277]
Former-commit-id: 58090a839fc4c8b73531c3124e25835b87aa0809
2018-06-12 22:10:16 -04:00
Preston Van Loon
c17db32069 Better documentation, add p2p message container type
Former-commit-id: 2790cf05b6dbae32cc8ced818e0af70bb20f8582 [formerly 782d2cbb05d9fe391f867d33c9ae0820b3fda203]
Former-commit-id: 78a21d732a68267fae930858f9e09b26ea9419b8
2018-06-12 22:06:59 -04:00
Terence Tsao
7c08587d4c sharding: fixed comments
Former-commit-id: cfdbfb5f1fc3ef087f6e9551a4009fa19e8dbc3c [formerly 05cefa891ccddeb2045cc3ca4fd205d904288a44]
Former-commit-id: d4bc6b0dd7b894fb85f654c6de5106353b9dce60
2018-06-12 16:30:43 -07:00
Terence Tsao
6c17f3c430 sharding: sync with master
Former-commit-id: e9e3daacc36c75fb87fe86dc0f17f92989defd38 [formerly 9efd4db17012e6c35911e293aafa8937711a5fdd]
Former-commit-id: d7f24230c673a4801abe71b21acf2acaba8f85fc
2018-06-12 16:12:59 -07:00
Terence Tsao
75015adc8a sharding: use shardConfig across shard codebase
Former-commit-id: a1a8597ff0d5249056feed2f1f888d46b35eccda [formerly 4da30c5de1366f140374410ff700043a778e9f97]
Former-commit-id: 9125d61ab20e9a6cedc3f63f69b6bdd152687190
2018-06-12 16:03:20 -07:00
Eli
aa3fac8afb Merge branch 'master' into construct-collation
Former-commit-id: 82fc04606512ed4cbcdbe6f171b924bc2829c735 [formerly fd97529a0f197eebe6d11b9bb22dd24da48610cf]
Former-commit-id: bc91eba3e01b45041ee76332bb973f5b0c1f0a9c
2018-06-12 13:37:53 -07:00
Raul Jordan
b60e56c0b2 Merge pull request #170 from rauljordan/interrupt
Graceful Shutdown on SIGINT and Non-Blocking Services

Former-commit-id: e6bfb2edb4d6533fd54fcbbe0d7f0f8ad53a35e3 [formerly cbcfc39b526fccfd138fdeb85ffe103ad39fdc1c]
Former-commit-id: 6784684479c9ead9763c9747a9f6e7aefe732650
2018-06-12 14:40:04 -05:00
Eli
14bcc31a75 Merge branch 'construct-collation' of https://www.github.com/elihanover/go-ethereum into construct-collation
Former-commit-id: 2350014d778d48dbecd01544b77c7abab0a0108f [formerly b8c4e09c184385e5834d3549dae5261d5b617937]
Former-commit-id: 47647ce88e2f0fefa6b62b7d8b5d2f8db16db60a
2018-06-12 10:22:32 -07:00
Eli
dde6e70756 Merge branch 'master' into construct-collation
Former-commit-id: d4fc305467544cd1a3d95ee5a338aa211b1e73f2 [formerly 87b957424793737b6324bdf63af936bfdc36f099]
Former-commit-id: b3bab328bb947ddac5e0dcf48616479456b73d83
2018-06-12 10:22:16 -07:00
Eli
2bcaab972f Merge branch 'construct-collation' of https://www.github.com/elihanover/go-ethereum into construct-collation
Former-commit-id: b18199efa96246befae0b90dc67e267f817aa019 [formerly 304c44533e327efb223e82e09d3af0575b30d007]
Former-commit-id: 2dc7a33ac6c12ad7d72a7a358ada611416984238
2018-06-12 10:16:43 -07:00
Eli
a1cbd11339 sharding: fix merge conflict
Former-commit-id: cfc34323ade884f101679888f92eeedd6e51ad98 [formerly 54d350b1c2a2b2af794a699ea1c41a8438e7003c]
Former-commit-id: 8b3f63e0e3e968de0e97aed4ef6ab851d0ec3778
2018-06-12 10:16:25 -07:00
Eli
fb3e26159b sharding: treated rlp error similar to transactions
Former-commit-id: fe1aa2a4427d8cc68a8f3b91d1c4f08b2f41b4b6 [formerly e1202f47345cb9aa3b37663573e2a07703b29c47]
Former-commit-id: 324cc86345ff6666c94914b30cadbf136b4a3cee
2018-06-12 10:11:22 -07:00
Preston Van Loon
0b50d2778e fix bug found by test, yay
Former-commit-id: d785fe8737d7b514e1104fe3853d1c77356a7449 [formerly e4514806763853f9ea7e449aa7397bd4b208f043]
Former-commit-id: e52fdf8806cf01c3f79cf86a06c16dd91f302c2e
2018-06-12 08:49:03 -04:00
Preston Van Loon
6caef73f7b Add inequality tests
Former-commit-id: d04fa104faa112ae600e2115022e0d240bbf6bb7 [formerly d9c71078256ba3c96dc977f2078e16c561f79436]
Former-commit-id: d403c1c30c3fc6d76fb70c499ec7bca7c0877ade
2018-06-12 08:48:05 -04:00
Preston Van Loon
a94c31286d Add feed method for getting event feeds from the p2p server
Former-commit-id: 2456f006193ba329b3324502e1e67b5865806c4f [formerly 6cb59e1f477c928faf950db6be737194d41d6653]
Former-commit-id: 92479416c6d1bc861f8a897afbed8c15b7ed76f0
2018-06-12 08:33:00 -04:00
Raul Jordan
ed1200b1a0 sharding: fix merge confs
Former-commit-id: 6016b3f659b6d325061f7862e2b0b7d9c882df93 [formerly 64aa7c188428e5f0415062d22f65093be73cf20a]
Former-commit-id: ba6af02c1a8cffbc36edaa04685ac7a456c03919
2018-06-12 00:14:25 -05:00
Raul Jordan
3bd52dc116 sharding: address comments
Former-commit-id: 79d9091f883f99d819cb73a862e4925cea309931 [formerly 0307849b5b99bd4d08fbd4a9986b729640bf2319]
Former-commit-id: f950a1554d82d54ce981ce22c4e5639093428c56
2018-06-11 23:46:53 -05:00
Raul Jordan
f37d6d58d0 sharding: interrupt working, actor services nonblocking
Former-commit-id: b27ac69451c09f605f38989b3efd2a43cc5d0fae [formerly d97bf308d74e0769c402b01c2bc0fdd82f8a70ad]
Former-commit-id: 0e787677d5d125f6552c88668a667041a35d2510
2018-06-11 17:21:24 -05:00
Terence Tsao
e5586e53c5 update README.md with shardid
Former-commit-id: d65033af0411a713bc340d83f8e990f119a7e16b [formerly b9eb5791673ca834912a883b27e1502415d1edb3]
Former-commit-id: a74f81df2caf4e73c207dbbc4dd98ac5a5587378
2018-06-11 11:18:01 -07:00
Terence Tsao
7858e9abfc sharding/node: get shardID from cli, pass it to actor services
Former-commit-id: 0220101381cf92180c1003997e514260290548d5 [formerly 5ca29b99f069db4169d98508aeb10b9ea88b679b]
Former-commit-id: 23ce869125865eb86eea1ef20587b475f39f2ed5
2018-06-11 11:00:31 -07:00
Terence Tsao
437dca85db sharding: merge with master
Former-commit-id: 50ac63913eb22eb6a9358a8f8c48bb68037ecf66 [formerly 95a0e6812a0291532ac1213e2f7b97472dcce0a0]
Former-commit-id: 0234a523ca0ca1c195e56cd3d0eb6bcb170b2469
2018-06-11 08:44:39 -07:00
Terence Tsao
c654446290 sharding/node: starting to parse shardID from cli
Former-commit-id: df0167b1675268a36b2293c8951ea282ee383c78 [formerly 6410dee77b426976e5d685f854f11e6837985c3c]
Former-commit-id: b29cc11669b443fb90dc27f99f7f8e1680e1debb
2018-06-11 08:41:59 -07:00
Terence Tsao
f3517ee338 sharding/proposer: resolve merge conflicts
Former-commit-id: 928ef8cac10f54f82f3afdcf6ae80f98695d8f80 [formerly 0f29fa1b85f089e561004fb2699891d8d17b536e]
Former-commit-id: af058dcd40c5aff1f3a27492d33c704e2d77be20
2018-06-10 09:13:57 -07:00
Terence Tsao
72c03348b6 sharding/contracts: constant variable for challenge period
Former-commit-id: 6c54cefc17c1855b3fde65de940ab0ae5db072f1 [formerly 70a7100e04ffe3b3d7b558ee05ae4a97fe16403e]
Former-commit-id: e5b1d3cc70144cc2fef69ce26b1be89d1721dd7c
2018-06-09 07:50:23 -07:00
Terence Tsao
035d0fb669 sharding/node: use ethdb.Database, remove database.ShardBackend
Former-commit-id: 44c0c5682c0296d94943b354171e69b4c8cf5312 [formerly 54da5cb45b098f0737fb3c37964e612dfe93c751]
Former-commit-id: 5d84d3c5038a01c4108e519d5a5c69033ace8ae2
2018-06-08 14:45:26 -07:00
Terence Tsao
9969f7e9bf sharding/node: shardDB is a property not a service
Former-commit-id: 7d85080fc0d3b82a0bcf5b60546f22d0e78cd9e3 [formerly 7b659786136a9451a7980cb447128ad4f059efd1]
Former-commit-id: 9844823e588bf0d9127fb4019bd66812b6527411
2018-06-08 13:15:18 -07:00
Terence Tsao
86b349f137 sharding/node: start integrating shardDB to shardEthereum
Former-commit-id: c2faefc69d8784c25a1416e274128402456e4382 [formerly 88a632e96bf12d02470545933b0ee9ac90622b23]
Former-commit-id: 6a33bb1dec693439b459f6399dba14f58a9e1723
2018-06-08 11:24:06 -07:00