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
Terence Tsao
2c0b90725a
sharding/proposer: added todos
...
Former-commit-id: b8262c7980dc6234aeac59e502372d0081477aa7 [formerly 4800a3568317699caf17af0c8bacf528cbee6cfd]
Former-commit-id: 786b683be96f2bbee96782deb08c0a56b7144f72
2018-06-07 15:16:34 -07:00
Eli
6e589de2c2
Merge branch 'master' into construct-collation
...
Former-commit-id: 51ef4ac4f41608e97dbbf656cef8f0845385e687 [formerly be41d0c16a53e78ec03a70d15ca80938dc618437]
Former-commit-id: a120db9588bd18e26f28090a378d481becf73d5c
2018-06-07 10:34:39 -07:00
Eli
2af0893602
linting
...
Former-commit-id: 1f9da258e234ee15e1b966c6b448d3d777b6f4f1 [formerly 1599e79184b460213ed219f5bbd9b29605dfd927]
Former-commit-id: 73cf4a00f38a78f0f9bf74a47ec1947915360341
2018-06-07 10:34:21 -07:00
Eli
1a8d71d768
sharding: BytesToChunks takes body as parameter
...
Former-commit-id: 9d5203efbf1598e4c71c78ae124f18310dc85ef9 [formerly 7e549528a5d6a9a16a9ad717d32a7f22201ba54a]
Former-commit-id: 56b9f78162ec5e24223a1261c3eb192a7a2968cc
2018-06-07 10:08:22 -07:00
Eli
2a971237df
sharding: clearer error messages, removed unnecessary lines
...
Former-commit-id: 74b3ddefb7a85bbc9dbd40b3341fa6639d04ec4c [formerly 5a07a9b50cb77d5dedce690a8b36cc46f5cfef53]
Former-commit-id: 4b4b3927e777934d3e8266f745e3fd8b035b0088
2018-06-07 09:51:57 -07:00
Terence Tsao
a49a98ef80
sharding/proposer: refactor based on new architecture
...
Former-commit-id: a91b7f2811d53f52bd729bf21c4a39fe6643d7ed [formerly 76199bc18fbb484cf8eb2e21082b3e948c12674c]
Former-commit-id: f6967b3f9f5bc5f55f2825521553dc1a1699d979
2018-06-06 23:03:54 -07:00
Terence Tsao
431dbe521a
merge with master
...
Former-commit-id: be6dd63cd6331e8e4dfcb75e588a21a4a1eb1ac1 [formerly 3eb428951073367dfdfb940f337b267f99b04a88]
Former-commit-id: ecec29608b437876d75422bd30c1d70c88da9a01
2018-06-06 21:59:11 -07:00
Raul Jordan
18ccccf21c
Merge pull request #149 from rauljordan/node
...
Refactor Sharding Node According to New Design
Former-commit-id: 370719264192a27347680f63be59cf6f835fca5e [formerly 3a57dd9fbd8cdabf97db83a5031340bc93a838aa]
Former-commit-id: 56ed9e58dc958204e09bb2888e424dc4366f5199
2018-06-06 15:15:42 -04:00
Raul Jordan
d3d509fcda
sharding: info level comment
...
Former-commit-id: 14cb9f40fba2121c04dd35b32e4871abf295b2cf [formerly 41f30d808a5b326175fc1ca2cfe6c21b507518b1]
Former-commit-id: 633f9a8216310ac16a0070f0b5eeb33fd99014bb
2018-06-06 14:53:24 -04:00
Raul Jordan
5e73a0705f
sharding: comments
...
Former-commit-id: 96f657456147bf7d982d45af46dfd49d2ce47444 [formerly 7c21efd8264d66e80b6b3749d271c0ce57229a76]
Former-commit-id: a11ac85e2123a173dfb38ef7ae46cde9ec990fab
2018-06-06 14:46:26 -04:00
Raul Jordan
af35efe4a3
sharding: rm todo
...
Former-commit-id: 6e934460d846f8ce8b9c5115391b8fa9c6d857cb [formerly e9712cf6a9d76c3c0140888f69525e7f37f555e4]
Former-commit-id: 60cbb34750ac612cb5edfc7bef99377640674d08
2018-06-06 14:39:59 -04:00
Raul Jordan
005409dd49
sharding: fix lint
...
Former-commit-id: 4da1be96e52fb098581f975995c116d8812b0361 [formerly 2202c858dda5d35aaac4931b637f43569153f507]
Former-commit-id: bf9ee6ba99a21cc82b3e044d50b109e850db1560
2018-06-06 14:22:48 -04:00
Raul Jordan
c3e9750309
sharding: remove error from close and log on service fail
...
Former-commit-id: d26cede2713f223996de9dccb869fccf40d43f97 [formerly 1808d0364a2adc7bdb55965290379a03da2046b3]
Former-commit-id: 630fde9ad0b91586ab55e58ffb8add50219e043a
2018-06-06 14:04:00 -04:00
Raul Jordan
e17900ac18
sharding: graceful shutdown of all services
...
Former-commit-id: 47da16d4915e10d9755d641c5c4102eb8c90beed [formerly 0b3e95b7037fb7c3e00b0460e615cff64ac1844f]
Former-commit-id: da75e9d2766922d6fe375f8770795f2d6dde113c
2018-06-06 13:22:21 -04:00
Raul Jordan
eca02ffa99
sharding: fix lint
...
Former-commit-id: 22d4a531da13984b7b8eb64c186f9102a3344f78 [formerly 60f4fc1b8ed37d5e6b1166b55f9505f197b72be5]
Former-commit-id: ce8b543acedf4719a525c5704ea36c551448a311
2018-06-06 12:10:42 -04:00
Raul Jordan
27d8338c1c
sharding: rename service method to retrieveservice (less confusing)
...
Former-commit-id: a09da925434f3644338fb7ee59c96cf558e3c1ec [formerly 0b465fde9ac197d4cde232f4fc2f177141c2c621]
Former-commit-id: 75a1eaf42978c9c2b035bbe57949195c69615b63
2018-06-06 11:12:03 -04:00
Raul Jordan
cb15bac394
sharding: stopping sharding node log at end
...
Former-commit-id: 48ec046f14bc75976d3ef78403226c07a5a34ca0 [formerly 7d36228f2165a1fd9ae8b4edab7d2709df85e1f5]
Former-commit-id: 6e6eb9a09e9c67a7bc92f929e01ae010726591d6
2018-06-06 11:07:49 -04:00
Raul Jordan
7b41757654
sharding: sync with master
...
Former-commit-id: 53c92a9cbae6c604d0edf429e0fd0c8d22f70825 [formerly 02d09912b46393fd29930ae7d04ecf7ff6e2861c]
Former-commit-id: c1d5b8f21d9f7bc35820a231fa74a87456fb6360
2018-06-06 11:06:01 -04:00
Raul Jordan
5c68bfa381
sharding: nicer error messages on service start, stop problems
...
Former-commit-id: 0a8cf796dae889b4ee1a49d71d22a668905e109b [formerly e3e4a8844b1a0544b927d0ebfeff1b735e9ec957]
Former-commit-id: 89f0dcc554cac78900b43f64924f3fcea967f541
2018-06-06 11:04:20 -04:00
Raul Jordan
ef368d2b2d
sharding: address review comments
...
Former-commit-id: 33820dfb5ed6a3e04e924d5c7cdf454ce4385780 [formerly 1c839832bf48281d3067d90e9a15d2cacc5d17f1]
Former-commit-id: a9d747b7d7bfecb5e8718df6f6ed54161f34b759
2018-06-06 10:30:43 -04:00
