Raul Jordan
8f731bfe28
sharding: merge from master
...
Former-commit-id: 946a6e98f66721064928bdfbe3a357fa9310c1a8 [formerly a3d8ebc4a85ef0d677440b55fa1445607265350a]
Former-commit-id: f5191ed0d7323c8f86b71c98ecd4b3bb1ba2c365
2018-05-16 09:50:30 -04:00
Raul Jordan
9b3a32221c
sharding: use .Hex() instead of .String() when logging hexdigests
...
Former-commit-id: 09695f12e61a3f25fa1830a445861119d236078d [formerly e79627c2af202768419df470cdc49e1a3f6cb826]
Former-commit-id: bbda4b36cceb25e765c05299d2ce96b7a6e4b275
2018-05-16 09:49:41 -04:00
Raul Jordan
54875f5389
sharding: fix typo in collation.go
...
Former-commit-id: 223f5fa3ac324327f105dff1f2912a5392980af1 [formerly ff32f9f6ff29e64467786dec0825fbc74835e319]
Former-commit-id: 8b36f30091c9314592cf85899caa3fa095ab112a
2018-05-16 01:13:06 -04:00
Raul Jordan
083c93e712
sharding: address review comments
...
Former-commit-id: 3d5cd49930ff1a07ccb544910e2b4bfeb75f04de [formerly 0275d8ec3ce981aed3ea2f88c660505e809f6b7d]
Former-commit-id: d291b375e7550f8792ece3e982f6b85da862ffed
2018-05-15 22:55:02 -04:00
Raul Jordan
b6949f8582
sharding: eliminated assumptions about db implementation
...
Former-commit-id: d17f7c367ad0c83516db37d7488eda3ad2ea3f59 [formerly 1fcd7a5bad4fe2c2dbaa5e4e200fd688227fd725]
Former-commit-id: 5d19cd72168913d681518d106e0ebe1bb2130d1c
2018-05-15 15:23:23 -04:00
Raul Jordan
77bd934efb
sharding: 93% coverage
...
Former-commit-id: f1a9fcf4fe1d11855e1dcb0a898f389dc669ab64 [formerly d255a71b60d1a939d2c7861039aace088a9fd34d]
Former-commit-id: 3671d13ffb1c71cf7c48eebedeab53fd16d4a0fb
2018-05-15 14:48:13 -04:00
Terence Tsao
591e4e9d49
sharding/contract: merge with master
...
Former-commit-id: f11d1a5d916236d9801f1cf53bb79d9814eebcb3 [formerly a0bd58da12e00a0a66cf27d8906d3dbbeb88768f]
Former-commit-id: 5c7f2c0e50def98ec052d7c413f83c3b4fb1ed14
2018-05-15 11:25:04 -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
Raul Jordan
f0fb634c89
Merge pull request #121 from mikerowehl/patch-1
...
Just an awkward typo
Former-commit-id: 8002c0ac7e543bc616e496720c7444ca56cb558e [formerly f50190a188cbe0a6aac4a00eacd371eb3cb7ade2]
Former-commit-id: 90c3e21cc6a8e387c7602070eacd49012ae4524c
2018-05-15 12:09:50 -05:00
Mike Rowehl
8535c0586a
Just an awkward typo
...
Looks like a section that got revised a few times and had an extra word left in.
Former-commit-id: d9b86c256ba77e3dfcd2ea435eb6d934978285f6 [formerly cbe38de2b3b5b2a665ec0a5c5f713f5ba730742a]
Former-commit-id: c6e21757cae7a0ab2e70c31e4d838b6ced993482
2018-05-15 10:06:11 -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
Raul Jordan
6e10d9fa6d
sharding: improve coverage for #100
...
Former-commit-id: 1fc773af9e07a79f63bf63a097526a7c3303cd14 [formerly 59b4763c8b101068eacd717caa757846a481c514]
Former-commit-id: 6b8162c9c976f15e19e16fcdda7fd3d274b2e151
2018-05-14 09:53:20 -04:00
Terence Tsao
43e48290dc
sharding/contracts: merge with master
...
Former-commit-id: fd5bf9ed3f541734c2b92363468afc75eafbee47 [formerly 3b4c6447c9c673a5d58242db4c9bb8f7fc9c4221]
Former-commit-id: e438fd2911e54b652e726d1cace5d0ad640e563a
2018-05-13 16:29:21 -07:00
Terence Tsao
8bff6099c6
sharding/contracts: merge with master
...
Former-commit-id: 251eebf6cb46497e3afda66e0496ebd04593a741 [formerly 3399601d0fd7263f99ad2a6c0e9935e1ad0139a9]
Former-commit-id: e92aa0f01cd90b73684d5f3b3d8b127ae5130b1b
2018-05-13 15:53:52 -07:00
Terence Tsao
16c5158cb9
sharding/contracts: collator -> notary
...
Former-commit-id: baa704eda89c6f51e8a8419550bd1f40ef378625 [formerly 277726a6ee2d899ae2f9cc428213205531356d0a]
Former-commit-id: 8ef9b8fe4bdbf4e0f7591c458b4cb7f37b81db61
2018-05-13 15:49:06 -07:00
Preston Van Loon
5359cf04a9
Merge pull request #118 from prestonvanloon/fix/already-deposited
...
Only deposit as notary if not already deposited
Former-commit-id: eaaacb92c2f79f4664279a3bcc5973ad89241b42 [formerly b95f0e744d05df2590d868ed447fb2d8dffbceba]
Former-commit-id: 0d4c692f25a765f1e8529cdbc95d4593aeefd0f7
2018-05-13 16:36:59 -04:00
Terence Tsao
248f245f9f
sharding/contracts: added regression test
...
Former-commit-id: 01dbc764a0a616d1ed4c21232d5fc886052c3c74 [formerly 5509cecf26e39948254f55d2d2cca820d3ed5b1b]
Former-commit-id: 3830de45de328b24d3d2c81559fac3a1e9d0a76a
2018-05-13 11:28:23 -07:00
Preston Van Loon
6de61b5d43
Sharding: Add check if already deposited
...
Former-commit-id: 32d3ec5c6bcbeb8e77aa7873e395e2b2cd362571 [formerly 623faf56f979a6e3f7bf4f903aac5c967da40dd2]
Former-commit-id: 5a60c62411845f441bca4f0a5540cf79ad9e0658
2018-05-13 14:23:20 -04:00
Preston Van Loon
4bfb23a5e7
Merge pull request #116 from prysmaticlabs/fix/deposits
...
Only deposit when --deposit is present
Former-commit-id: 731934362ea81e52957e95cd9b7a68e3805675cd [formerly dfef4cf8fe3d96a831b9fdbf3503db651ca67db8]
Former-commit-id: aea665ad8e8fe8642c8cd2c3868087a111c74029
2018-05-13 13:56:47 -04:00
Preston Van Loon
133026feef
Merge branch 'master' into fix/deposits
...
Former-commit-id: 476972e0c3a1c1ec858cc77fbeb1f1f74042b177 [formerly 658337b5062f39fd2ab8e31de09357c29a80ab49]
Former-commit-id: f47b6700d0c3756b6f0a51ee61f779611a48e66c
2018-05-13 13:23:20 -04:00
Preston Van Loon
f1d8accaeb
Sharding: added function doc
...
Former-commit-id: 0c20f0ed1c23a9b72620db14470239f71775ab82 [formerly 57d3964723de6bbd16dfc289730665aab89b60e8]
Former-commit-id: 83cb53bfc1eca388184d2d72910831d11181f14c
2018-05-13 13:21:21 -04: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
Preston Van Loon
5c7ce3af5e
Merge pull request #113 from prestonvanloon/fix/flag
...
Add sharding flags option to usage.
Former-commit-id: 172a2e8e071fc49557211c264695cc877a3cb537 [formerly dbe63e90a3b1eec1042f5bfe37dec22e6531f562]
Former-commit-id: 71aaf4a610d475f3e1aab9218fcc6339b41c96f9
2018-05-13 12:39:21 -04:00
Preston Van Loon
ce900f9bd7
Sharding: check flag value
...
Former-commit-id: f1bd210017d236d1ebafdd9b404be6b4731c75ed [formerly adc011704641d4830e6e46acbc6b33c2eb06ba92]
Former-commit-id: 0071f67a01cff53eaa8ba8a888aecc16f9150b8d
2018-05-13 12:37:58 -04:00
Preston Van Loon
6df9fddf7c
Sharding: fix error msg
...
Former-commit-id: 6b79f8caeb23aa405180a8f776eabdacbf35f765 [formerly e5d0d702cc93fbd3c13e0abf09606c82a37734ab]
Former-commit-id: 325a592978a92840d74844fae594bc927da8af4b
2018-05-13 12:35:28 -04:00
Preston Van Loon
a4a0ca98dd
Sharding: only deposit when --deposit is present ( #115 )
...
Former-commit-id: ea182c0890138082396b4d06d543a9929efa73de [formerly fbb923ff61f07a4e2cd6022069d7b29fca244c02]
Former-commit-id: 6b9769d4250599a6720cbdceb3e41459d7b1b5da
2018-05-13 12:33:29 -04:00
Preston Van Loon
69841d4df5
Sharding: dynamically load deposit amount from config.go
...
Former-commit-id: 14b48ff7efe688e4ea126db301a6d23a358060ed [formerly 77862c2e72e4f725a0ba7115ab16cd5f0b9dd774]
Former-commit-id: 359cd27670f304baa484b9dbeccff29b66accce4
2018-05-13 11:59:24 -04:00
Preston Van Loon
90440e97b1
Add sharding flags option to usage.
...
Former-commit-id: 53d8391434e77b68e29134d9f4cfaffa1ddd0c72 [formerly 32440329f168545310f7ee26c24081cb052673f4]
Former-commit-id: 300ea5da5ed7922287a27b56306def13594e41e3
2018-05-13 11:03:59 -04:00
Raul Jordan
880a5e7c9b
sharding: all relevant tests pass, linter passes, ready for review #100
...
Former-commit-id: 9ab2595c130922bc49fc3c9a69f11dd93b6774fb [formerly 32c501eddb94d5dbfab61550cfa8705be7b8e59b]
Former-commit-id: cfe18a1247e11e07d951e5038bf45d67e15d0bdf
2018-05-12 11:44:05 -04:00
Raul Jordan
63802e98e7
sharding: finished remaining test bodies, now just need to pass
...
Former-commit-id: 73f723be47a60743b7bca0fa469dd11f014e5fe6 [formerly 98fa2928954ce5bbb9228b2a9fa89c09807cf7d9]
Former-commit-id: 194afc9fb5c10f35a5783de462e6877e2446e471
2018-05-12 11:27:32 -04:00
Raul Jordan
7cb08abeca
sharding: finished remaining test bodies, now just need to pass
...
Former-commit-id: df5d0d09dfd223df52c1986b41f2620c21291629 [formerly 52445dd5719ba379d419b74f9759f52960a6f77b]
Former-commit-id: 5441958a8649dfaa4015032ba0701902ab4adedc
2018-05-12 11:23:14 -04:00
Raul Jordan
742b6104ce
sharding: include rest of tests, 2 still need to pass
...
Former-commit-id: 7042ae002b01c64c61d70b92e734de28bc616df2 [formerly e5fa5056c649b4718f3cd64184f6dbf07c62c0eb]
Former-commit-id: 0e669fd0fca32fc6da1a1bc7beb6b5c07254d72b
2018-05-12 09:57:34 -04:00
Raul Jordan
e317db2f8d
sharding: canonical header hash test passes
...
Former-commit-id: 4b6620bbaa724021a219c523d4350e3ff4a545a3 [formerly 48ea338a4b03d4b7e3d280f6061dd5b03f7b16c4]
Former-commit-id: f441a79366b89745d1edb0cc7b5331ddebea25ca
2018-05-11 14:27:29 -04:00
Raul Jordan
6edde106ac
sharding: remaining tests for kv store
...
Former-commit-id: b95783af1808209e492107fbb1c9cb318d04c899 [formerly 17c0946e769872d3f21b17996d73cffe6c8263b6]
Former-commit-id: 334deee870bcfef7107a3e4feeb2a275d9e9580c
2018-05-11 11:43:24 -04:00
Raul Jordan
5dc498f402
sharding: shardDB put, delete can return error now
...
Former-commit-id: 8d96f95dbe6419d804d86b05dca8f1e90e2b56ed [formerly c42c9e84b82dcc29d50739e0b8eac5bd65f93024]
Former-commit-id: 527cb5170e3eb156bf7c0bb2ec69ef9f32cc8320
2018-05-10 22:00:54 -04:00
Raul Jordan
5f76297401
sharding: address review comments and add new subpackage
...
Former-commit-id: 9dfe0415a7809738b7683090d08486d64ca2e4c0 [formerly c8f386658475a6d6a069ab44f63a3d6e39a80ea7]
Former-commit-id: 767719430eda75648b408b4f480b25bb68870421
2018-05-10 21:29:42 -04:00
Terence Tsao
0d73429252
sharding: reuse notaryCount
...
Former-commit-id: 46d9a0084896bd36375b756d1a778da28b838283 [formerly f97fdf445e13b5bc1d8efff79d7c42d76df360f6]
Former-commit-id: 4e627a869e3cea4894f4a5520280fae4d11ab3e9
2018-05-09 20:30:13 -07:00
Terence Tsao
a083a59f34
sharding: punctuated all comments
...
Former-commit-id: 024ae32926514787aa79b9adabb75bac8093cca2 [formerly ec5e6212b34ddff25f564f4cadd8a4ffae027a22]
Former-commit-id: 215ec3ed3cddd2c624cb5a7068b004e334ea83c2
2018-05-09 19:15:29 -07:00
Raul Jordan
8d2ddf94bb
sharding: remove log debug statements
...
Former-commit-id: 6f936f56853da062b98d3547a44d1d8db19ce26f [formerly a411bb24f5bed28d4097bcab74c22a804ad7f79b]
Former-commit-id: c8f5029343bd1c3a2b485591847447ef58eac74f
2018-05-09 17:36:10 -04:00
Raul Jordan
f8f879f893
sharding: use new header.EncodeRLP method
...
Former-commit-id: cf610c419a0c56c5257201274eea5cf0345d44ad [formerly b90bb344e2165eecc015f6174dd065abc7365b81]
Former-commit-id: 048f0c5a50c1818c7967a7ffa08f61d22b8a6aef
2018-05-09 17:35:32 -04:00
Raul Jordan
256892e6b7
sharding: rename methods, tests pass.
...
Former-commit-id: 55e22985980afb8538adcf13eae7242484c6466e [formerly 207348ebbfe33d343019fff3f47c5fbc7d7ea28a]
Former-commit-id: c8543ee2327f9bb1863a90d9538ff302f3db09f2
2018-05-09 17:31:46 -04:00
Raul Jordan
eb9c82b581
sharding: full reorganization of collation struct, encoding, and tests pass
...
Former-commit-id: 0ba99518af6187fc0711a00748af2e32cbbf5108 [formerly 0db02c5e354fc61ab7468dfc7bff3821ee8926f8]
Former-commit-id: 2defc15718fbffbd4d10a1f32f02a75637493016
2018-05-09 17:25:27 -04:00
Raul Jordan
d1aa843ea6
sharding: address review comments om #100 , fix linter issues
...
Former-commit-id: 5febe72a5a1936ce643488067e0990da810f1f5e [formerly 74c85fc99b259d064b5181f91cddf945e3d7b988]
Former-commit-id: 0cc6d451b5eee6e459597ad114a85bacc7a953f1
2018-05-09 15:23:09 -04:00
Terence Tsao
37889c476a
sharding: fixed lint
...
Former-commit-id: 413ad02b5004698771b67dfea296f1252b29c2e3 [formerly 978dcf9bbac9aabfb1decf48e5dd9af1c5b13ade]
Former-commit-id: 99c1b8b1a8dc308ebd834f18f04ea88861d8d17f
2018-05-09 12:02:45 -07:00
Terence Tsao
8b5cafd7a6
sharding: merge with master
...
Former-commit-id: eafe01eb22f8e478dacb6b07a17feeae4a7e0697 [formerly 2fe0af9b331c81eff468cb3adda6784af74d2a0f]
Former-commit-id: 93720d0e2f005bf1edfb141ffbf3e735fcbca7df
2018-05-09 11:56:59 -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
Raul Jordan
a617eba960
sharding: tests get collation header by hash passes
...
Former-commit-id: 59a0eee266d7a76b09258fcf8009f80049b60be0 [formerly 75c6a22893328306b18d4da1137455847fe85872]
Former-commit-id: 3ec5bc054413b21426d339c4a76832958a0858d4
2018-05-07 18:00:02 -04:00
Raul Jordan
02bcbbbd73
sharding: add test for get collation by hash
...
Former-commit-id: 9a715b24b4d04ef7a9bd006cb4f90cbdae55624b [formerly 3fd25eec8d68b7cf5b8f56ab7db86e9e92bed8ae]
Former-commit-id: d878d4578faf7053b914428a12ee3d7eeff83b3c
2018-05-07 17:33:35 -04:00
