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
Raul Jordan
5bfb1e42d9
sharding: added interface tests
...
Former-commit-id: 69cd77645d47bcc4eaa6f2850e1741afc29e0958 [formerly 6211c61f013386b5eababade9d7bfeafcde69b63]
Former-commit-id: 1cfc772c16423123718ce36aee06242e09a4bca9
2018-06-05 22:38:16 -04:00
Raul Jordan
12d35d3e92
sharding: fixed runtime errors, addressed review comments
...
Former-commit-id: 941b7f13b58758d0290481b23fae292fee7d078d [formerly 020042b380b63527163c41a37a14022e61f844c8]
Former-commit-id: 183ed3603fc3fd0cbf964ae468acad4fa850f0fd
2018-06-05 22:03:58 -04:00
Raul Jordan
581883bd9b
sharding: fixed import cycle
...
Former-commit-id: 7aa2c458e37fe4fd5b340d2da0bbc7fa44778258 [formerly e71c11cd82b059dfb0d589e42fdba763cf9cadf1]
Former-commit-id: d02e7567fb5bd8c08fed0e9735f08dab95544b2b
2018-06-05 19:03:15 -04:00
Raul Jordan
3861c0cf06
sharding: ensure godoc for every package
...
Former-commit-id: 0ecc597de035e61ca219f4f30695cb8db59c129b [formerly da9312c1c9d69010083f94f387fe6a52aa817683]
Former-commit-id: 8c8c218e16ef248ae8954168cf7bf5aa6ed6839d
2018-06-05 17:28:57 -04:00
Eli
cff44e1bc0
Merge branch 'construct-collation' of https://www.github.com/elihanover/go-ethereum into construct-collation
...
Former-commit-id: d017ac8d51726cd3432b461e772c39db564a9de1 [formerly 1fee3e3b332919756df6660b22fa2eb9b71da20b]
Former-commit-id: 2e3152e60620bc8adcdb3a4e00dea973239a32e7
2018-06-05 11:54:11 -07:00
Eli
cb767733ec
sharding: fixed poc test
...
Former-commit-id: 706b1e38615eb528e04806feb27f815599817e5e [formerly 5b90be43cac6328e1b0d663c68ccdc364c060324]
Former-commit-id: bd96b28541d5a9240c2c309e03d0d35741776c2a
2018-06-05 11:54:01 -07:00
Eli
2ea1d8b198
Merge branch 'master' into construct-collation
...
Former-commit-id: efefd29ef0196dbaa26bcd06ea884bca518fdc09 [formerly 9118c3fe21bb92e977e433d25e3cd4ed9ee741eb]
Former-commit-id: bf1dbe6fd1655e37abec8d747dc4886de79e7e7a
2018-06-04 21:24:17 -07:00
Eli
022e9354d5
sharding: comments and test for CalculatePOC
...
Former-commit-id: 3c43afc6baa48e86756be0641523464394ef2fd7 [formerly 5b291e644d7952469513a8de8de130af616192b3]
Former-commit-id: d6cedd81667dece83a292b465cc3e6f60badc365
2018-06-04 21:18:51 -07:00
Terence Tsao
075f61c9b2
sharding/proposer: add TransactionReceipt for tests
...
Former-commit-id: 997e5a24bc253a598604bd6aa2f57b6eb6acdf12 [formerly 6193eb4b4951621d88c1e00251ded83bc77353a3]
Former-commit-id: c07a284a63d8f951068136005497255f78402860
2018-06-04 15:21:07 -07:00
Raul Jordan
8685b0a201
sharding: register p2p and txpool in order
...
Former-commit-id: cd4ebad4a45c3f02d9fb14134bdcd3e85187241e [formerly 507ca92b4728a695d67dd416c71b77f0fa4d33e3]
Former-commit-id: c1350c2143ebdfb4e17f19f7ffb77351a854db91
2018-06-04 18:02:34 -04:00
Raul Jordan
1057d8bf6a
sharding: fix lint
...
Former-commit-id: b57c5bfe397d13556f34ea1884482b2ca4bbe975 [formerly 849061b6ea1ceac3688f3f2085ecf626c7e5f006]
Former-commit-id: fbab77903733ce35bb82e3684ed2ebe020431c8e
2018-06-04 17:25:59 -04:00
Raul Jordan
9d584d334d
sharding: fix interface errors
...
Former-commit-id: 3714c5c46fdeafeaf1c0d64f70989fdd0913fce6 [formerly 1f9ff85f10520e409e787c6be644682ea8b4bb93]
Former-commit-id: 21214d113530fe5ef67961358a291f7a5ca974b8
2018-06-04 17:19:16 -04:00
Raul Jordan
fc40d603c0
sharding: define empty p2p and txpool services
...
Former-commit-id: e95f66b509da5b24054415c15642fd952728a193 [formerly 1f8c4e6ad036cddb162a5588696d44d648f7d5eb]
Former-commit-id: 2897e7c38f227a4f8cd0456cb6fc904ecddeb71f
2018-06-04 17:10:59 -04:00
Raul Jordan
cbfdd4807e
sharding: register actor services, modularize services
...
Former-commit-id: 2513b3150392096adf0ac8e43349a1ff046f941c [formerly ddfe2a5c70a4b28c60d4321d87dc4a2a512fdb72]
Former-commit-id: 07ffa1c5adf2ab34760d975110d08ddabf2c3d95
2018-06-04 16:34:48 -04:00
Raul Jordan
0d85d18726
sharding: implement node register func
...
Former-commit-id: 808d9952e0dcb15c191ed4cd0ae6274e402beb46 [formerly 1b4c863ebccfed99d018b63f15a3df3de653ff50]
Former-commit-id: 83ca14b18bd098667452d0c563a336a75a4f2f5a
2018-06-04 16:00:47 -04:00
