Commit Graph

31 Commits

Author SHA1 Message Date
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
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
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
3b7c5bf64c sharding: notary casts votes
Former-commit-id: 8c0007eaf2de0d36c69ea346f85234dee6af89ee [formerly c9ed2d6063398edf0734a6d48a6cc88b6afd637b]
Former-commit-id: f508bacaab3632fa4d3d05c26eea3c6b155c2ab1
2018-04-30 17:31:44 -07:00
Terence Tsao
668bbc7478 sharding: check bit in bytes for notary votes
Former-commit-id: 4c38295fbf89008dda9c43ee6a60472e15726064 [formerly b6594988cb3353751f09ac69863813ca106467df]
Former-commit-id: d2196e99231a1cb0f43d0f5380bb2fdc645a8949
2018-04-29 16:31:30 -07:00
Terence Tsao
3bc4acd4e3 sharding: finished addHeader, started submitVote
Former-commit-id: ed38e8621204fa276328cfe8dfbf989294a28519 [formerly 10bbd9cc3990c0922e73eeba138bab7d016e9fde]
Former-commit-id: 8d0d2407ab547a8f5e2022d85361dd74d3328da9
2018-04-28 14:55:27 -07:00
Terence Tsao
8bed2909f1 sharding: initial commit for add header in SMC
Former-commit-id: 71e0b082ddca84797d04ffd07a2904eef013a7fc [formerly c9e0bf0453a0c60b3f327731bd58ef62a7cd5915]
Former-commit-id: f07a9c7590d715abc41f0c2fdb64c46e553af0b4
2018-04-28 10:11:42 -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
b923b9e101 sharding: feedback changes
Former-commit-id: 3251e6a3a13984b154dfb82ffae68ec214177829 [formerly 0bc330ae3445a0d88d014afa412dd4e21bdb5208]
Former-commit-id: 3c3938127ccc1f56ced09496038fa0d72ed32ae7
2018-04-24 08:47:08 -07:00
Terence Tsao
f32a80a911 sharding: added tests for sampling committees
Former-commit-id: abdaf09b36f79ea6dc90d2a1d6390b20fb1f2420 [formerly cd0aac8794f2c51e19bd839c0c04bdf4103731a4]
Former-commit-id: 9a53826157411039ec2fad9adefd8623147b6725
2018-04-23 22:02:37 -07:00
Terence Tsao
0d9523dcd4 sharding: fixed notary sample function
Former-commit-id: 608025faad454e517fd144759886e04113805907 [formerly 5b753cdef5fc3f4f4f585e972ba624a42d21c672]
Former-commit-id: 8125d538d91209971860ed637b456ff07dff8151
2018-04-20 16:14:16 -07:00
Terence Tsao
d45e45f543 sharding: functions descriptions
Former-commit-id: ea79f98f18b2f001c8b0c9579926d7c2de4e45c8 [formerly 2bafc5faedc0dba69799629bd55d17683e06a583]
Former-commit-id: 609f9f31e1b6cebb515300f5c8672c15ae2003c1
2018-04-19 23:41:52 -07:00
Terence Tsao
9d2be9f867 sharding: fixed lint messages
Former-commit-id: a79631df65076e8ffd6ab2cd6265a1411456356f [formerly 5f02c7f2b7f50b230e9a434a50d2d569770806ab]
Former-commit-id: 2fd87aa767d8efbefdf54cdc08f49cbea0dd5b6f
2018-04-19 16:47:38 -07:00
Terence Tsao
dfc0ca55cb sharding: proposer is irrelevant for spec 1.1
Former-commit-id: ea7d8068b76b367e99948542e0153afc3e906d5d [formerly 80249c257922b26a0908aea044eee004acdd5bc9]
Former-commit-id: 4483c490a8eb3f1f3eae22ad6574ce132e353b13
2018-04-19 14:59:13 -07:00
Terence Tsao
5e2b6274a7 sharding: fixed naming styles
Former-commit-id: 4e50f1f8edc38d24b265e540c060a4c0bbf52052 [formerly df906e85f5ab5fb27afce1569a4f2992a7169527]
Former-commit-id: 5fd3454d63cd3fb05288a413bb78d887eeac08c9
2018-04-19 14:59:04 -07:00
Terence Tsao
b5e77c3867 sharding: cleaned up comments in code
Former-commit-id: e733ef576dfa5ab1165bea1bf2c1502c01de0ebd [formerly 9694cff89a1bc823e3f069f40564947715475c11]
Former-commit-id: 3a7109e6f02ec648390f2f6364e71ebb288b5bd9
2018-04-19 14:58:49 -07:00
Terence Tsao
7107f8fa2b sharding: function to check notary in committee
Former-commit-id: d46016ebd3bacbb50cbc03084054ce21c9ac9d81 [formerly 6a95cdcdc60bb4dc6a359735f618ed765553095a]
Former-commit-id: 3db9a81c0d2995ff474b3c10b3b87f8f3432a495
2018-04-18 17:46:41 -07:00
Terence Tsao
ce9a724556 sharding: monitoring notary size at current period and make adjustment next period
Former-commit-id: 3a40788c3dad272570980e426c751a9431908a0a [formerly 6149e9eae68a5e7e6f6b87adeafa6467582caeeb]
Former-commit-id: 175c0d263e3a5486cc583640f819c8c1d77adff0
2018-04-18 13:51:31 -07:00
Terence Tsao
4bfa96219f sharding: fixed up on notary's register, deregister, release functions
Former-commit-id: c59f4274aa31f240a8b41f86d36de38782b1998b [formerly f7bc669d44adb550e2902d8ff8f210eb30630aed]
Former-commit-id: 8214f75adeef0c8316bd2fbdee648548a96b91ad
2018-04-18 11:26:09 -07:00
Terence Tsao
ddc67976fe sharding: /collator/noatry and align constants w/ phase 1.1 spec
Former-commit-id: eefbc5f230aea78eb30adc8bb09f7ce7a5844043 [formerly dc9a760f78d3a4d356e9f9d6ccf8b39129ce756f]
Former-commit-id: cff011989f46e2235e700bd84278043038014367
2018-04-18 11:04:11 -07:00
Fynn
46c33c9bfe sharding: get_eligible_collator with tests
Former-commit-id: 19bcd3b213dec79c4fa634e31105c7e09cd7ffd2 [formerly be97e08143820904c399eff1f9b27dccc84bf3c0]
Former-commit-id: e1c18d06271f0df5c667823372ff8f314a6d9f82
2018-04-04 18:05:10 +02:00
Fynn
7fa709bd40 sharding: collator functions
deregister_collator and release_collator implementation


Former-commit-id: 2c9a3ef1ee840209a65f9d6bd5d27f6efcad4ce0 [formerly f60bca0bc0a46f61dfa45fc62af9c37d75b6a749]
Former-commit-id: 3be99e546546fbf91ffb92586dd9e4448b4b563c
2018-04-04 07:57:06 +02: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
Fynn
09446f5ebd WIP: SMC for phase 1
Former-commit-id: d756e5811f4d8803252276d83bc9e189473ed435 [formerly 3f9041a1733c9bb0882b395010008fe2aea5f74e]
Former-commit-id: 3911cda4e088c50ba9a5d85e6a6af963c4773a91
2018-03-24 18:37:53 +01: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