Commit Graph

1701 Commits

Author SHA1 Message Date
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
313d3d0c73 fix travis tag
Former-commit-id: 7ea518aafc363df9f961fc4c08294ebd59cefece [formerly 5ac628cc15c2ea2bb9daf4012b9e679888f53e85]
Former-commit-id: 6c410a5607d0a6813a8dffd09bebc277d7f34b9f
2018-03-05 21:50:27 -06:00
Raul Jordan
e1f93b7779 added wip to top of sections
Former-commit-id: 6b6d3fd116d9d1cf33c28f69652939f1af7c9a92 [formerly 3804d1f8fa070c9f7f3c0ad5c73e19009b90dea0]
Former-commit-id: ffdf7351f8d671275b8cc76f928ccdb14bbceb54
2018-03-05 21:49:52 -06:00
Raul Jordan
684b053a9f addressing code review comments
Former-commit-id: f57ddccc6d61e57da2543111c827e7057e0bf55f [formerly 69d57a3645ff85d81a942f6603bde6fd42197d06]
Former-commit-id: 75824c7c1d5f19197f12475305e19bf89166e38e
2018-03-05 21:46:28 -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
a9548320d5 add travis build
Former-commit-id: 9e5e097a71dce4dfa7ff170d205b7a7abc7aedb6 [formerly 420d417f962124c0e03bd063e1a75d00a3cac6a0]
Former-commit-id: 32a3f598222d0ff225a95ef8c39a45fa8ab8f72a
2018-03-05 21:24:11 -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
f1ca4699b5 remove nonmarkdown changes and merge
Former-commit-id: b750f526efc8f9386b3355eb3c47125e3078ea19 [formerly 93c558771fa6ecaeb5076b5a409ec2d32ba703b9]
Former-commit-id: 9ce4c558ac369393510fe3c9c2ab8e021123132d
2018-03-05 20:15:05 -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
Raul Jordan
c2cc4ed7a7 fix, table of contents
Former-commit-id: be3d11b5816bb2edeab191a3a21ae3eb1eb846d5 [formerly 3a2946bfe5911e7dc68ddc635e60370bef991288]
Former-commit-id: 3e36207ccc64feb5a0420c8968c4133a84043d31
2018-03-05 14:53:25 -06:00
Raul Jordan
0a6af384eb edit toplevel readme
Former-commit-id: 4ac9172f87e7889c132ba552ad658d508fcd8723 [formerly 778be614af9b19e0a85e728ce5230a7004ee152c]
Former-commit-id: 28b3db6fe34c736132c600847a9c4c09163a874f
2018-03-05 14:50:34 -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
cd26ded1fc include terence fixes
Former-commit-id: b982c043b8f4c286e1200d9f40247ec6cb866c59 [formerly 34458578355ba9c0bc1dd82a4dc4c46344d74fc2]
Former-commit-id: 344225ee9af05acf42c3e20b95755a4bbd68f5e3
2018-02-27 16:09:26 -06: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
Raul Jordan
ee5ff8201b start pendingtransactions ethclient public method
Former-commit-id: 87b05d1db7a21b17c873e5b115cd0df2d9ef9d12 [formerly fb12b71cff1304d57291a6e6e79df1bf0ce6e15a]
Former-commit-id: faaaac93d112e30371e9f7264a45c39aa77dc19a
2018-02-26 22:38:27 -06: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
nisdas
420b76a9cd Remove Subcommand
Former-commit-id: 1b5a00dfc5ada45e3136137f4cfc5fb9c7164055 [formerly 1e099a9438bdb3dd9da0e0178581317f3c9b76ff]
Former-commit-id: d9e3da56fcc91af9e3cafc3d1ea55a92106a71af
2018-02-25 18:22:22 +08:00
nisdas
3259e3616a Add Join Validator Flag
Former-commit-id: 1c881038a2a42bc677ed9a8b04f206952d385d62 [formerly c0e94478b985e3df5bb2a714695101bddc2d9388]
Former-commit-id: 05244e6d66e996a6d46ca3272ef6d52d4fee3b78
2018-02-25 18:04:38 +08:00
Terence Tsao
232bdefa12 withdrawl/withdrawn
Former-commit-id: 08bd67263deebcdec3ce3a3cb42d50780a5f8883 [formerly 8add04fcc45d0bdfb36052e3e91015ad26ca980b]
Former-commit-id: dba141ed8ac1d5f9dcb285f009793979fa7595a0
2018-02-24 12:48:34 -08:00
Terence Tsao
c96a1845b4 cli entry point for joining validator set
Former-commit-id: 6d6852983c30ab74287f34374243d18047899e4c [formerly 26ced5a3e73e9f07b73dd5d60548cbdd5d282162]
Former-commit-id: c09a2c28ec94700eabeeba1e3511988d442eff53
2018-02-24 09:58:10 -08:00
Preston Van Loon
395ef980a8 Merge pull request #32 from terenc3t/lookAheadPeriod-calculation-fixed
fixed period calculation for head.Number to not be mutated

Former-commit-id: 57b517fcedaecf49afe0703c0d7ad6f6f9f05150 [formerly 03584f067379e22f11a9a554c34bcb8f4193f848]
Former-commit-id: d9c0aae88e3535abe00da376efb5d65a47691cac
2018-02-23 16:06:08 -05: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
Preston Van Loon
a419a37965 Merge pull request #30 from prestonvanloon/master
Merge upstream after 1.8.1 release

Former-commit-id: c3814aa0a55b42711319679846460a0ccf8ec6d8 [formerly 9db0d7e5ff9511094d8220a913db1def7484bc79]
Former-commit-id: e31bbe8a6084a076132120318456cd5d4f1828b5
2018-02-20 22:50:22 -05:00