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
Preston Van Loon
904fc99ab8
Merge branch 'master' of github.com:ethereum/go-ethereum
...
Former-commit-id: 14a5d232f81a641706346fb14d943fca043252e5 [formerly ed44a4b74bce2ec8369da92b65165dc50ff8d3e8]
Former-commit-id: 6a966bc370b01f1383e59a7307421bf44eec6561
2018-02-20 21:58:05 -05:00
Preston Van Loon
0cc6a006c1
merge upstream
...
Former-commit-id: b1699eddfbe71837d0703c6c998624bdcffeee55 [formerly 324fd14865ea1bddc19d776718d1d8e1cf3ee210]
Former-commit-id: 2523cca14cf81b44d7fe05a121524e38f9ecc77d
2018-02-18 21:03:41 -05:00
Preston Van Loon
a8eea1e41f
Merge pull request #21 from enriquefynn/geth-sharding
...
Test VMC contract in golang
Former-commit-id: e807ac9db2ec99d4ec6ebad36fee0a2c28726de8 [formerly f0ede019f599c829d5b08ae2fa1abd06eb78ccce]
Former-commit-id: eb9af3a283b3351a7543551cd79e3ab367852387
2018-02-16 11:32:10 -05:00
Fynn
a5aaceb685
accounts/abi: use unpackTuple to unpack event arguments
...
Former-commit-id: c68a94f9ab014bf08d193a91b5b4d5f9e2e0140f [formerly 575f80f76b518841acf6c3ec38819c5d124c0cda]
Former-commit-id: a782675800c85d71e855b7f20877689aeb3f4dfe
2018-02-16 15:51:22 +01:00
Fynn
5b5cae693f
accounts/abi: use unpackTuple to unpack event arguments
...
Events with just 1 argument fail before this change
Former-commit-id: 69cbb51c56054208417e464dc6e46a94ccb3bbeb [formerly fbb03244929beb0ce8f9c607ce33d107e8319b89]
Former-commit-id: 984154c1ba79f1fe8bf0106a604b2765ea312079
2018-02-16 11:46:25 +01: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
Raul Jordan
02abe2b874
merge
...
Former-commit-id: c2fe0bdd7bb0f5530ac2b3a0516dcf9ae6c4088d [formerly 4b6ffa6639bd73c4b6e03af63b7e400f1e8e47d2]
Former-commit-id: b351702810764a1e238257cc103801af071855d3
2018-02-09 20:32:15 -08:00
Raul Jordan
65733e841e
merge
...
Former-commit-id: fc7a0db3f9e9a4f0542ac213eccc84e2fc2a6925 [formerly 9ffc075818c1815916b7220b62b07c3f6f9d5378]
Former-commit-id: 1cdd1f7efedd687e4415463f2ef515638dae1ffb
2018-02-09 20:31:16 -08:00
Raul Jordan
a44f887210
Merge pull request #26 from prestonvanloon/collator-tests
...
Add basic collator tests with interface refactoring
Former-commit-id: ce9690746956267831757c17bf9e5c2320d57ec3 [formerly 630b2d86310d31d4873d5ac08aee8943c72337cb]
Former-commit-id: a71c2c4147c28f7a2001a2c9a84ad3b8f5021503
2018-02-09 22:28:50 -06:00
Preston Van Loon
f05d13ea21
Merge branch 'master' into collator-tests
...
Former-commit-id: 68ed6c0ccf87dd910d7a1bf5cbf87f900b9ea5a4 [formerly 583e51372f30e158a7fc7a42463e90182a152101]
Former-commit-id: c3c3c3c6e2f59ff6e25e897c24e436b14ffd993a
2018-02-09 20:11:37 -05:00
Preston Van Loon
276f6c739b
gofmt shardingcmd.go
...
Former-commit-id: ae3114325198530646bd0b377cce4fd68c33ec13 [formerly 1c646da464b0dbb3fcdeb49cea6d7c6678135ae6]
Former-commit-id: a1a98cd93b882f10dd212885b0f327cf5a44935c
2018-02-09 20:09:08 -05: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
