Terence Tsao
89dedc3184
sharding/contract: merge with master
...
Former-commit-id: 9f271cd21ed6c7c5b3b04a9db7118d2a75f61d34 [formerly 2dc1d365b337c98aa543b6d6e8b54bf0b92d48c1]
Former-commit-id: ebaf4132fbbd00b027dacd4b9e38f2f765274b70
2018-05-15 11:22:38 -07:00
Terence Tsao
56e90be294
sharding/contract: add balance to notary struct
...
Former-commit-id: 81d73e4fe4675b370160bd7b391dfe6fed17aaab [formerly 734e43220a976da1a88e4d19b2ec42f77020e351]
Former-commit-id: a78e3fd7b345e8f032adc03aa567250b99c2aa1e
2018-05-15 09:05:01 -07:00
Terence Tsao
c545df41be
sharding/contracts: fixed getNotaryInCommittee not fetching latest notary sample size
...
Former-commit-id: 0591d5c65d5e8b165f9ca442391e5af0644b3e4d [formerly ae1d540ca879d6a72032462b880892c7dcdec179]
Former-commit-id: bd310578fb6afafab3f9485e70be1dacdfcf3f1b
2018-05-13 10:13:25 -07:00
Terence Tsao
ff71722488
sharding: tests for submitVote
...
Former-commit-id: 1366e3a2ce8443fcca97b3a3dca97d2ae2173a1c [formerly f90336cfa8a389a4e2e7a64d5051fa809fe6b415]
Former-commit-id: 5da8b6d82156acf78618f15b45e8b0e0323c962a
2018-05-09 11:53:55 -07:00
Terence Tsao
9dbf1936b4
sharding: added submitVote test
...
Former-commit-id: 969f64168aea10d5b812919bf5a3d4f534a90922 [formerly 03a49e09f1ffbfe52858d89ddcbbac34f848ba19]
Former-commit-id: f1f57db412f0ae9bc22c31a5aabd5f4e4df3491c
2018-05-08 17:55:50 -07:00
Terence Tsao
6fb4d23c5d
sharding: addressed SMC review feedback, refactored bitwise ops to be more readable
...
Former-commit-id: 55f263bd66cc76f14aba0862670a7189cc53153f [formerly bbef8789c0cb4155185f09de12388dd05f60d3c7]
Former-commit-id: 365d81184578e1d6bf55ec24d01d3c1b91348173
2018-05-08 14:55:18 -07:00
Terence Tsao
ea13800459
sharding: test for adding multiple headers within same period
...
Former-commit-id: fc458cbf2960c15c0fa689b22b03614578ab8be3 [formerly 715efa2aeaf765dcab6fc87e1c3da729f2447f8a]
Former-commit-id: 420db139f99b7cb667ea3d5113d36037a88e0904
2018-05-02 11:50:31 -07:00
Terence Tsao
48a6306127
sharding: test for add_header with normal usage
...
Former-commit-id: 63f6cf891ff13d1ea88126793ad73e0ef458ef6c [formerly 16966f2d6e2054b432852e46758c12a06108e6e3]
Former-commit-id: 7d6ff2b31b31f59c171552043b6bb181dec0eaa7
2018-05-01 21:33:40 -07:00
Terence Tsao
84389b219b
sharding: fixed return bool for functions in sol
...
Former-commit-id: 33624e189e073aa862f2e33f8fd5ebea919d6368 [formerly c7c40d11c99abd923eeee641866e73ea26d7ca13]
Former-commit-id: 7d307bc09f0f46d31be20560879954eb8b2a9215
2018-04-27 16:38:24 -07:00
Terence Tsao
4e45d1882c
sharding: fixed lint
...
Former-commit-id: cecf8e888992de3583c222e98f1e3e4c26c48924 [formerly 67381715d66b4a512d9e884a257ab0609fd81d33]
Former-commit-id: 66fa59bb52e8343843f10247d668e2b3fe8c892f
2018-04-24 11:22:55 -07:00
Terence Tsao
b923b9e101
sharding: feedback changes
...
Former-commit-id: 3251e6a3a13984b154dfb82ffae68ec214177829 [formerly 0bc330ae3445a0d88d014afa412dd4e21bdb5208]
Former-commit-id: 3c3938127ccc1f56ced09496038fa0d72ed32ae7
2018-04-24 08:47:08 -07:00
Preston Van Loon
a95d979ee9
Merge pull request #85 from prestonvanloon/refactoring
...
Refactoring sharding package for proposer/client separation
align config with phase 1 spec
update SMC to use 1000eth as collator deposit size
fix deposit for collator_test
fixed config test and added more test cases
Former-commit-id: 7fadb044ec7bb136964781ac271ce6abb4cff86f [formerly d1c93419517a502d37f09560187a9d804bfea940]
Former-commit-id: 9747bdee7a32a4a056402d1f4b0da114c63003b8
2018-04-02 15:49:51 -07:00
Terence Tsao
af7124e91f
fixed all the typos during integration, manually tested
...
Former-commit-id: 85344d0a515f1bc6d2ac32a43ac7b2fc96e477c5 [formerly ae47d11056c1c4ca49d254c25ab324240751b2dc]
Former-commit-id: 2655a39f356563dbd37a5344a217f8ab5305d263
2018-03-08 17:40:22 -08:00
Terence Tsao
533e12b6e7
updated VMC to SMC
...
Former-commit-id: e8aa99e8cae2f59728986c9bf079ad399bb1d8ed [formerly 7e7f88907c44c4a7cbefd2d0095dee33a86265e8]
Former-commit-id: 7e8ef4440f41760cf346378916242888b44f609f
2018-03-08 16:04:13 -08:00
