Commit Graph

156 Commits

Author SHA1 Message Date
Fynn
5955f5fb3b spelling error
Former-commit-id: 4102e06957f63a1e1ef042e85b417619ac83880b [formerly ec96af55f6d78f005a6a71f71948bc80622984f2]
Former-commit-id: 3ac8814109205b5d6ec19ff666a3483fbcb6e178
2018-03-09 10:28:20 +01:00
Fynn
17096c1b79 Changes in terminology
Other minor text changes


Former-commit-id: c130baf3adfd0429f0ee061b1d2a42ae9abd870e [formerly 5a7f51838817d2b275a59ce4913a26c4c9f494a5]
Former-commit-id: 12c08d013353ad6f235866bc9db66c9e3fddcc8b
2018-03-09 10:02:09 +01:00
Fynn
9abe5d4cb3 Explaining the canonical chain
Former-commit-id: 4235ab94b501110bd79d93d309feafc67cdf018b [formerly dac59e89dc4b45892597d7061c177c293e1e7fd6]
Former-commit-id: 02fc33adc6966782e1d1a8878f6d29753bf08ef7
2018-03-08 19:33:12 +01:00
Fynn
d4a3ad8f83 WIP: modify sharding readme
Renaming terms and other modifications


Former-commit-id: 7ecab689173dcca4f95acb081cdb29a6afd51b00 [formerly aa5a94028a459b2f9291653214aa07744e7dc820]
Former-commit-id: aa809c5b5bc1bfe1b210449512990eec452d1633
2018-03-08 19:13:55 +01:00
Preston Van Loon
374bc76ad5 Merge pull request #47 from prestonvanloon/cleanup-1
Delete some TODOs

Former-commit-id: 713f9c2e19a759a6c99cd9ad5867c58e469021dd [formerly 60d85f69bd45f4afe3cb37813e2fd50f41ca7f63]
Former-commit-id: d4896bdd64a6893d5b15d9016eb99351fbdaac53
2018-03-06 23:07:13 -05:00
nisdas
81aa4bdc61 Fix errors in Doc
Former-commit-id: 4977a7c206a65b3abb45be17398b9aff04ec63c1 [formerly fc76150ef3412e82732afdb8ecd648781161b9b5]
Former-commit-id: 83e707bc59bf180941f16a1c8bea656f353cf50a
2018-03-06 13:18:28 +08:00
Raul Jordan
1f9f01dc3b Merge pull request #54 from rauljordan/cli-entrypoints
Proposing cli entrypoint name change as sharding-validator instead of geth shard --validator

Former-commit-id: 3d66238e91490f9117b521a5d2ee0ad3842513f6 [formerly 004f5d38cdaf8cae414b8ac65892186a0a52a808]
Former-commit-id: a638c421282188c8277ab593c0aa690955bb3d2a
2018-03-05 23:01:19 -06:00
Raul Jordan
3b1ad08f16 merge fix conflicts
Former-commit-id: 446daba283ac08db03039e05bc80bb3bd412c809 [formerly b6f7451abcaf9085ede193768b88d1a7d2030c80]
Former-commit-id: dbd9975edab2a234670cb4b2f233aa693533e39a
2018-03-05 22:21:50 -06:00
Raul Jordan
5baf8d9361 documentation cli entrypoint changes to reflect working versions
Former-commit-id: 0894f57736604a60f6fac8e770158cdb69b8b1fc [formerly f817d7211d9887ff6c637afe0616e9f0de3f0ac8]
Former-commit-id: 1d0b85df6faeadddc5b0f7859c8971cae903d0c3
2018-03-05 22:20:39 -06:00
Raul Jordan
dad1cc4b83 proposing cli name change as sharding-validator
Former-commit-id: 4569ef4d3b333fab68851b546661d553d4fed298 [formerly 1c79a70562b6180496da5953e20e94763fd8a24e]
Former-commit-id: 3e91b7bbb3e4d3c4e6272bc687169d1c7cfbf0cd
2018-03-05 22:17:55 -06:00
Raul Jordan
c9cfb23312 rename sharding proposer cli entrypoint, add travis
Former-commit-id: 9ef2e52fa98e4451baf611135740c82aeb52c092 [formerly 8623b637d7c8b4cb414329dcd753e322f79bf31d]
Former-commit-id: 6305062eeaf7074ef75d779bd69f4a1c7ae8999e
2018-03-05 21:25:34 -06:00
Raul Jordan
bc1cd1f017 remark beautify markdown
Former-commit-id: b92827f722ffbce34a5f8a141875a49e53d2e2a1 [formerly fba2c4a8a32646a1657e8f483eef4183fe41077d]
Former-commit-id: f69fefc72d43bd51ffc766ad3fe5f399311d1b4e
2018-03-05 21:20:36 -06:00
Raul Jordan
95097b4d44 acknowledgements
Former-commit-id: db7dda350b88be6a3c78016e6b2c5190d3945553 [formerly dc90477386117e33f7430684ab66baf143d0b043]
Former-commit-id: 54102cebae5972c2c2991ae780814d7778e087bf
2018-03-05 21:08:24 -06:00
Raul Jordan
6095394adc more md fixes
Former-commit-id: 866eef677338939e3e2bef9427cc7a459b10c130 [formerly 2eb248ce004626127f0e775caf6adcfe3008a2d8]
Former-commit-id: 2a00fc5410cf2786402be0a1226a0c6303c6dac5
2018-03-05 21:06:19 -06:00
Raul Jordan
0ca5005c31 wrap up markdown port
Former-commit-id: b283b4df4c846007644161396f96cf286ccc46d9 [formerly 7abadb0e32d35a30c86f54c8003f31c0804555dc]
Former-commit-id: 1c5d6d3bc4deae86ace745b62a1da71d7444b645
2018-03-05 21:04:16 -06:00
Raul Jordan
40097d5f9e remove nonmarkdown changes
Former-commit-id: 7b2d36758abb09f51f1171dacb5093fc349500b4 [formerly 0840930693cf36e3c3e9ca9c0fd2bf2aee9fad7b]
Former-commit-id: 71f8827e75df8a456079d24f39c63c5df36abddc
2018-03-05 20:14:39 -06:00
Raul Jordan
b00d675f82 first few sections done
Former-commit-id: e4000e8d98d3c55e373d4bcfc305583a2457fa76 [formerly 7d8b6406488e7be76243ba8b6fa6136d885007a4]
Former-commit-id: 06e22a040b2eb7623e4f59ca7a4b9fe0e19ad3e3
2018-03-05 15:56:05 -06:00
Raul Jordan
708ca8f559 create sharding readme TOC
Former-commit-id: 12693fa4d343babfddc554eb3c1752e8593034cc [formerly 1cb45ffb313590c9d54cedc96846b9475d6a8932]
Former-commit-id: 740977a24f2af57a79d8da825ab75b20bdb41397
2018-03-05 15:42:11 -06:00
Raul Jordan
757ed73811 merge
Former-commit-id: 0d963909e7a94237a9c142a159afb662c84b3bc6 [formerly b4ffa19c54f832ed00b380a0af0b310e04eaa595]
Former-commit-id: 09262828e831385c21f9e91fb2b5fc74fd9d1b9c
2018-03-05 15:01:26 -06:00
Raul Jordan
46af98f8be add genesis
Former-commit-id: 956b990713a2c1dae9658eeb37f4bcbda01c1277 [formerly 407049499a4206f94e2ec017898ebe0bd7569488]
Former-commit-id: ce80641e796c73b9cb0897067d79cc8074b1a173
2018-03-05 14:55:56 -06:00
Preston Van Loon
3da21bb56f remove old TODO
Former-commit-id: 91eaf64bc2d90f1ccd915d87356b326341bcd55f [formerly f280e3c2f8513a7f113f3da828cd7fea7a46a8ab]
Former-commit-id: 0ec24bb0be0bfcba37bfa9c42c57fc91225fe1c2
2018-02-27 19:31:15 -05:00
Preston Van Loon
30fd4a6a17 Remove comment TODO resolved in #41
Former-commit-id: cfc2896b65e3e92c0cfb6f98f7230876590e13b1 [formerly d6f2219b30fbd6b1f475c356797516e9a42a139b]
Former-commit-id: aa9494c354035cce86f1775638c5224f87705344
2018-02-27 19:22:20 -05:00
Raul Jordan
bcc9262af1 travis passes
Former-commit-id: 1b02e531ecd2bff3263e51459484e2bdc89509ad [formerly 041ca5c04d7a1d3c2b8bb8b68329634dfe3f19f7]
Former-commit-id: b849269c48e6fbcbee805dfcfabb84e694d51b31
2018-02-27 16:08:02 -06:00
Raul Jordan
b0c85f76c1 travis passes
Former-commit-id: aed0c3dea70c1bd21ae39b2008e3f8f9fcab2813 [formerly 70818ba9bdb0ceafd4b63f9d9975848c6750f487]
Former-commit-id: d34790ea9f7dcfa8147ea23732fe9ded1fd988ce
2018-02-27 16:07:46 -06:00
Raul Jordan
27049961db Merge pull request #46 from terenc3t/refactorAccounts
refactor account interface, and unlock account when client is created

Former-commit-id: 8169f4fcd5d78b410282b90acc9158affe13d02e [formerly 804c32d0ffad9b25c384be8a695bdc1e5889082d]
Former-commit-id: 3803facfa9b846a6c7329e15e628ec35e28be48f
2018-02-27 14:57:10 -06:00
nisdas
8350dfa45c Merge pull request #45 from nisdas/bufioScanner
Change from ioutil to bufio scanner

Former-commit-id: 2a2148a6bee555f6629fd4cf306e208a556e92d9 [formerly ac00ca1d65a3f7eebc8ebbc52a50f208603d34c6]
Former-commit-id: ab36fb37941e0c2df9a1575db7cc71881a22a8d0
2018-02-28 03:03:38 +08:00
Terence Tsao
550857efff refactor account, and unlock account when client is created
Former-commit-id: 070519fc78204142787fb029adbbff8fecb8ef19 [formerly 3108cad68479d3aa2f3ed4b916c797042b3652d0]
Former-commit-id: 6fedfecdbc7839bc78054ea7a8b38987d2bf9cf8
2018-02-27 09:15:45 -08:00
nisdas
11ec5db55b Changing error
Former-commit-id: a8d82f8773392a30d885b570f38160e04d819e7a [formerly 6c7b389396643110e7ec1eb2b5bb92b9ea4d723e]
Former-commit-id: 6bf3998fe1e4392b7704d75e781012bb8b612095
2018-02-27 23:50:56 +08:00
nisdas
58bfae12ca Remove one time variable and change capital ization
Former-commit-id: 424d1f536fbc46002c37df35a582de3772405c29 [formerly 534eab56faf5379970b8018d8db9c46789df34b1]
Former-commit-id: 993b362bffb8d5b3ec6019137cc324d078e989e3
2018-02-27 22:43:58 +08:00
nisdas
8376b28a33 Fix lint
Former-commit-id: caeb71c32561fd381577cf376ec24468d9f94139 [formerly 35b9abe6cd42749d59f140feff5fca3d8b4107e6]
Former-commit-id: 168f24d03bf13a544513c2f970525627b03797a8
2018-02-27 13:32:27 +08:00
nisdas
6b8f403160 Change from ioutil read fileto bufio scanner
Former-commit-id: 8dada22f453ed3c19c0e0f9fc565ae874feb7867 [formerly 5935902039f2829c21d1d6523cfbe99403e3924e]
Former-commit-id: a384213b80bc648c153941e2a8969b01f0bb0733
2018-02-27 13:14:29 +08:00
Terence Tsao
349501a815 fixed linter issue
Former-commit-id: 6f9ff695c747f337cce2d6fdbd04c48b4a36d9d5 [formerly 7397777cc91d4055558d3e32d17eec53f0b02cb5]
Former-commit-id: 3eae93312088ab799c2ac5878295ab212f469ec1
2018-02-26 18:19:36 -08:00
Terence Tsao
7dcef60a37 removed unnecessary fmt.Sprintf, renamed flag to JoinValidatorSetFlag, and elaborated on its usage
Former-commit-id: 7e98ed54ff716b2da878f085ae1ff40472ce1966 [formerly fc5b4ec6ab005aedf8d0aa3206f27209aab65d71]
Former-commit-id: 4b17e2e49cf3df95a90be3fc7fb2bb66a96bbeed
2018-02-26 18:07:09 -08:00
Terence Tsao
8b91d97897 updated comment to reflect new method name, added punctuation
Former-commit-id: e1c33f0d62cd460afc750e538a15b051be755ee2 [formerly 92a2419212708a0fa9f3ae88f9aeede7d836df4e]
Former-commit-id: 6f8bd74087939390191abae2b56a6bed22280c95
2018-02-26 17:31:00 -08:00
Terence Tsao
b3648af9be updated warning msg, and made method name more descriptive
Former-commit-id: 9a3da33abd9f3a4a687d3991ceff2ed1e428e871 [formerly 6d19a8f335e9307d4b10a47eb60fb9743c7db435]
Former-commit-id: f6316b049ffc6f3ab94405a841bda1d2686a287f
2018-02-26 17:18:49 -08:00
Terence Tsao
dcdafc3111 verify client is in validator pool before querying eligible proposer
Former-commit-id: 137864983a88747e187ddf8215b5ca91b6122df2 [formerly 66faa46eb087b222292a1b0d941374601a8e9f12]
Former-commit-id: c0e2a692144a3c8c530c4cb8e7b6188c1d581d17
2018-02-26 14:48:42 -08:00
nisdas
e028d5d8f0 Add Flag to main.go , and use flag in vmc.go
Former-commit-id: 53b5ad5831de51e345854a38b1f7928e31ffae16 [formerly 4ee90d9a47c09f436f50f079ea4a8be2e9b86036]
Former-commit-id: ba696db5822ec0293597d68e6945062f477e8f12
2018-02-26 10:20:42 +08:00
Raul Jordan
129819178e Merge pull request #31 from prestonvanloon/collation-type
Collation and CollationHeader types

Former-commit-id: eb88cf48b62bf30354cb18237320e6240f54c23c [formerly 293c4138d1141686d6d31184f17d0873a9d325b0]
Former-commit-id: 8bc0f378af66c5e0cff7669b68b6ac8d7580485e
2018-02-25 15:18:23 -06:00
Terence Tsao
ebe815821c fixed period calculation for head.Number to not be mutated
Former-commit-id: 56af1ad6043db21c5e9ddfca1ed3c05ea5645c6a [formerly 73dbf59c6bb50da956b7eb0eaa409dfcd3d72560]
Former-commit-id: cb179c464b0ffaafecb146e34621a00e2e6835d8
2018-02-23 11:57:37 -08:00
Preston Van Loon
147864f221 s/collationHeader/CollationHeader/
Former-commit-id: 3ded106afb6b4eea8a93b5d2d5834fec824128e0 [formerly 5db6c8280186a059b6514948e6cc11d17555ab70]
Former-commit-id: 858de6272dd74ae6061823e9d1ce9225a3f8c139
2018-02-23 09:54:36 -05:00
Preston Van Loon
e65be3456d Add getter/setter methods for Collation
Former-commit-id: 7d76aa16fac553b57023f91e808653b202308ad7 [formerly 46a739d7c1caff57beb6abb6285b8ad70db990c6]
Former-commit-id: 1c428340e16ce4b8dad92d89a0f2a6e69872ca0a
2018-02-21 22:39:51 -05:00
Preston Van Loon
2afb1e5227 Added collation and collation type. Added GasUsed method
Former-commit-id: 16fa7aea81210b0dbb2f8f2fa560a046ae14fc73 [formerly 5c7fb20b829a2e19b6ea7fbc14cc8284b84658bd]
Former-commit-id: 07c65a1d78fef9b362db229e7266e97af78da6e8
2018-02-20 23:57:52 -05:00
Fynn
5f5192bf1b linting
Former-commit-id: d52533929e344d93805ef00967af286378c1cff6 [formerly 834241fd80e8c1ee060dcbcf61ba66cd9752245e]
Former-commit-id: eb50605bde285837555ce7d7ed8efd0edc97ee1a
2018-02-15 20:00:54 +01:00
Fynn
eda7b6e39c Merge branch 'master' of https://github.com/prysmaticlabs/geth-sharding into geth-sharding
Former-commit-id: eb7c1eb8c3148b4a15ac2aabeb621da9d005a2c5 [formerly 75c1ef58c95d29f82be16c488dc624994b25c177]
Former-commit-id: 7ed06ae9eccf633c9a0c942bbbf3860556868641
2018-02-14 16:06:21 +01:00
Preston Van Loon
4e7d00c361 Merge branch 'master' into fix-travis
Former-commit-id: 7f089d6aa2b2784d74521ee104d1a7b0ad90eccd [formerly b0550f6b6bac0e7c7de867b745fd2a1148212859]
Former-commit-id: 12eea39cf4a4421889b29f851681fa188d894267
2018-02-09 20:08:00 -05:00
Preston Van Loon
de9a14b0db disable client test
Former-commit-id: 19f022ec752f75056ecca70a05fb16308951cd9f [formerly 3e68da8b40eb9e2c0bcd08b9f268c9a6ff371912]
Former-commit-id: bb56149172ba3db3df56971f3abff31b581e46ad
2018-02-09 19:37:47 -05:00
Preston Van Loon
e148927171 clean up code
Former-commit-id: 61bab1957ec678ccbb4c25971dda3f49e3a111d4 [formerly 5bc437ec7d168e4c62363a808a22f9f0f78e1577]
Former-commit-id: fb8e6f31b9c1baf8aede8bd3b007c84dcde2d842
2018-02-09 19:37:30 -05:00
Preston Van Loon
a92945577a lint: remove unnecessary switch statement
Former-commit-id: 831551f32fcce774174ff991a3b3d83b6cda8b84 [formerly 561a47aa73d04ff60994cadb8ff149fe88ae2dc0]
Former-commit-id: da00c165621ad399486474e4298c0acff76a3779
2018-02-09 19:07:51 -05:00
Preston Van Loon
a91ef3d516 fix typo
Former-commit-id: a53a87832df4bf9ade11fbc1a37fe05d23a08590 [formerly 9e485b9ee07748bcab0d0fea33f483fdd5e75845]
Former-commit-id: 7ab90df1a1a6e67952b1ee15b1398ab9a9a7fcbe
2018-02-09 18:57:25 -05:00
Preston Van Loon
b840bdb1a4 return error and clean up test
Former-commit-id: bd81cffdb82ce3849486b03be4bf6a3088bb2986 [formerly d808676e6c9871ad55d6576e2ef86c3ed13da22b]
Former-commit-id: 5cc96395c90c27d6b792d570b6d2f44844180110
2018-02-09 18:47:36 -05:00