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
Preston Van Loon
ff42e169bb
clarify contract generation bindings.
...
Former-commit-id: 1958eba734a8f17050a9ad90b2ff922a732dd30e [formerly 22c585568d5f74c86acb4da4ef5e1cbe462bd9d3]
Former-commit-id: 6fa71862e0c3efeba6b754ee7f1ccc4fd2a8a10a
2018-02-09 18:41:08 -05:00
Fynn
645a766dff
Validators tests on public variables
...
Former-commit-id: ec65d1831579c1e655d5110e24b598c55439aa8f [formerly 743745d606a0ecdb7b200b77a621674109478f36]
Former-commit-id: 942b7f9931a6dfdb867bacb37a7dc78ae6cb7e46
2018-02-09 10:31:50 +01:00
Fynn
784322737a
New VMC bindings
...
Former-commit-id: c02902eb4cde3766ec672a7612c0dcd2514d4368 [formerly 4c76d28370e56f1e8f50655c7df1f9894fddb2db]
Former-commit-id: 52dd53447781dc44521f25f05896163aa97dd4e1
2018-02-09 10:31:39 +01:00
Fynn
6c6522d058
Correct blockhash calculation, public variables, renaming
...
Former-commit-id: 4755f6fe836118f03f25077a2068b3365ff18d92 [formerly f657bfabc15ba498bab86e9bfb5648fbd56bc84b]
Former-commit-id: 6cca720cc6c182317e65d06e845c60f6be82441b
2018-02-09 10:30:01 +01:00
Preston Van Loon
411d749b19
Merge pull request #19 from nisdas/IPCPath
...
Add IPC Path Flag to sharding client
Former-commit-id: 44474d0f4633caadcc9287aaad4aca98881d2854 [formerly be2ad87d6f8cf2d9f0011d9c397f3541c7897183]
Former-commit-id: b5093c0c63326d847f0df32177a1ef8f7fee5466
2018-02-08 10:59:28 -05:00
Fynn
0018701b01
typo
...
Former-commit-id: 9f523cda559a09adf613c48325e2f46959ee0be0 [formerly 0a498090e82b8f6158dc6fc21e7e6e5fbad21420]
Former-commit-id: c3f2b54642096d19cd0e1d79bf4d3ba2a140bfcc
2018-02-08 14:04:11 +01:00
Fynn
0d9e52cdbb
Test withdraw
...
Known issue: Test failing until upstream merges fix with abigen
Former-commit-id: 50560ecd4d58885193d11819fc0d3f94f887f615 [formerly 34a38d7f3ab02879d2a2b8ee34be3ae1eafa1548]
Former-commit-id: 81778c0cdd45741888f6ca6640b46f54001ea1e4
2018-02-08 14:02:33 +01:00
Fynn
885964d444
VMC tests according to review
...
Former-commit-id: a60313824a7eea70e4bec716aa05df5689ee12d5 [formerly 3c31c53a4e82f0b42b67386ec6ee13bdf022b770]
Former-commit-id: b6795e8d6557961460c67cca445438c3e9223905
2018-02-08 11:52:11 +01:00
Preston Van Loon
aa1a3b3405
working on testability with interfaces.
...
Former-commit-id: f8aa95e14151ae8d43d6781cdc64cced71a82e60 [formerly fbdb217576862532d2fe89f5a017d2641dfc6217]
Former-commit-id: 5879301b438746facd133f21ef6b299623b346c8
2018-02-07 21:00:20 -05:00
Preston Van Loon
b153986145
Merge pull request #22 from nisdas/genesis
...
Remove genesis.json
Former-commit-id: ef097edd1617afb2f08e0f7f5326f8a53ffb7505 [formerly e0b384cd0df368fe1f8c817b56a428121a6970b0]
Former-commit-id: 342ffbec10145a9ae82d2bb9e7e530fa75b29269
2018-02-07 19:15:10 -05:00
nisdas
675fa964a9
Deleted genesis completely
...
Former-commit-id: c7802d9801476fca780f203bc46907de2e5af0cd [formerly 5bac3df6b4fa50846a5e2e5ec828795c14ecf97a]
Former-commit-id: ca681be45ea8fff5200ad35930ae8b1d12c7e7be
2018-02-08 06:30:41 +08:00
Fynn
4ce78e1195
new VMC go bindings
...
Former-commit-id: d70fa1433845729030eb856f396cade160a69e6d [formerly e28e1369ed57f7d906050a12a39b39d309f69687]
Former-commit-id: 6076727c16651caf84593e84fe4a85a6a43c0c25
2018-02-07 20:57:25 +01:00
Fynn
d1afa7ec28
Update VMC go bindings
...
Former-commit-id: 6729e1945dbca3f237b374ce5d87a52c707b8369 [formerly fa09ca6235e95a261f0488ef16de8063c59587cd]
Former-commit-id: 185161da2dc15cca5ba3c8b9c270b21ffbca0e2c
2018-02-07 16:50:43 +01:00
nisdas
d727b6270e
Remove Accounts
...
Former-commit-id: 35ecfe25f877c245b9495bc0e01e0ec2c76471ae [formerly 1b1bc1688ee71cd17027555353457d3704d696a3]
Former-commit-id: fc246254a27e1ea2b118290816882db50a1807e9
2018-02-07 22:55:41 +08:00
nisdas
5ed53ce510
Update Genesis
...
Former-commit-id: 0a782d19ded546d0535ba46f8039e7e2b936ce44 [formerly 0eb81b87dc40c14342cd31ae0d12b7d413d28be7]
Former-commit-id: eff374541b2eac9efac83086465c39ee1d6cbc9c
2018-02-07 22:41:40 +08:00
Fynn
efa5a3bcd0
test deposit function
...
Former-commit-id: 3bb37461daeb436d7d1055e669798b98b57b28d2 [formerly 4edb8c7db143c1bb4284c9a663c0e2c7c6c4c2e1]
Former-commit-id: 07b34d17e31437931e128ef661fd2968c3a7ae6d
2018-02-07 15:07:01 +01:00
Fynn
49a749ba33
New VMC go bindings
...
Former-commit-id: 0497b159b6e9629aa7efb814cc707037cede63db [formerly 3012bc2e73445311406225b4d8035d2748672a17]
Former-commit-id: 9d970a34d7c272638534451688e05a68fedfac03
2018-02-07 14:49:34 +01:00
Fynn
66da19c50e
VMC tests
...
Former-commit-id: 0065f7844e971e5104894a1ea36e9955fd7f0faa [formerly 762b0597b7fdb88a7579d31c26efe9d7d6fd77a2]
Former-commit-id: 89877b41108d3379e444cc3a4da20522b6db7f0d
2018-02-07 14:06:42 +01:00
Fynn
f0b5a4fed8
New VMC go bindings
...
Former-commit-id: 08fb127f5eee6d67c3d4c39c7e39a69b5e1a0129 [formerly 79dbe268286cbb087c5931d92db75e6b4ffe7e88]
Former-commit-id: c49531e7c47e322ab562f0efa1109d102471e1c8
2018-02-07 14:06:14 +01:00
nisdas
573a22986e
Add IPC Path Flag to sharding client
...
Former-commit-id: 7d596e8ef95e71f7381dc27b25e1a4a2c0fa9a47 [formerly 76650eb37ce1755839ed23d8b1fe36d2dbdadffd]
Former-commit-id: b518e5a1de2615dbf5d16a819b057920df65dc60
2018-02-07 15:52:42 +08:00
Raul Jordan
2a612de3c5
adjust all for review, create test files
...
Former-commit-id: ff13be57aab24129a97f359464fb5b8154c5a206 [formerly ff9566d3bd5653b23fc2846b26e1b07a15fdc159]
Former-commit-id: 371821f0ad0bb76640eed2199f5dc49f979d14d8
2018-02-06 17:06:47 -08:00
Fynn
078e5358fd
Unpack CollationAdded event
...
Former-commit-id: 8bb53ee170dd6d399c6f1cf798b439e690a33466 [formerly 1fbfe139b5e7907fd297626217868cfa4ca1ca32]
Former-commit-id: a671a9fd2a4e8206f5c4759092d11caabd9b649c
2018-02-06 21:53:08 +01:00
Fynn
46b667709f
Merge branch 'prysmaticLabs' into geth-sharding
...
Former-commit-id: 9918b52f2299661d536c8b09e4e986b8fb33ec58 [formerly 9b8f31820b55346ec9c76a61fa97dfc664595670]
Former-commit-id: bdc5c5fb1c8c727dff13c2375ce8626eeeb624d9
2018-02-06 21:51:22 +01:00
Raul Jordan
a092f8d19d
include latest changes with txops and everything running smoothly
...
Former-commit-id: 4367137b9310a7c7a74e569499def685c06c1c09 [formerly 3947fb77747b13e5bb61c0bfc51127a0df4f5796]
Former-commit-id: 0abf3e2beaffc399d53a1f1919a9b5a7b7512aee
2018-02-06 14:22:19 -06:00
Raul Jordan
279ca11940
wait func
...
Former-commit-id: f5c1e413d1ab851d7875830c91755556b1a38467 [formerly b687a2462ba18e2e1d3d6db7297ae9f48e904d27]
Former-commit-id: e595ef78375e736609a554101066896929f04521
2018-02-06 14:08:28 -06:00
Raul Jordan
6fe43bd446
adjust code to reviews, abstract funcs, clean up files
...
Former-commit-id: ec19a9de17ec38c54af49684426345056fa3fb07 [formerly a8533d2bcc036bde18583abc4a157d63e552ee06]
Former-commit-id: b085ecaec184ad2c2370388c2717d1e6f8a2e04f
2018-02-06 14:04:45 -06:00
Fynn
67dce86c6c
CollationAdded event unpacked
...
Former-commit-id: 542a2c3a8ee952dfe49106d56efffdb3c08815d6 [formerly 8c1f11fe17594e2d69957bdf588f4ee633f8e7a8]
Former-commit-id: ff10848fcfb8ca70e8973b39359b8c9ab631aaf3
2018-02-06 09:47:41 +01:00
Raul Jordan
a9afdd90ef
propose collation called on geteligibleproposer
...
Former-commit-id: 0a23d54aa3006d103bb7123bcfe0ac2ca3a2b027 [formerly 7266cc53ca4d6826b4a54d30391f9c5e5b0b7d10]
Former-commit-id: 6b33ca471ede8696fc83285ae426645308a4c6fe
2018-02-05 22:41:40 -06:00
Raul Jordan
538a4ef41f
add all TODOs and get things running
...
Former-commit-id: 574697493b0cdcf905066744b9705d3436dbc73c [formerly a81127a11ce815ca4255674544a410c750039f14]
Former-commit-id: fbd9a1214716a13a98ceef420760e73bc65439db
2018-02-05 18:50:32 -06:00
Preston Van Loon
0a458de73d
Merge pull request #4 from enriquefynn/geth-sharding
...
Validator manager contract in solidity
Former-commit-id: 41453f9a6262ca73e52ed93aa5e9539b7d6edc46 [formerly 5c8e92adeb56fc7b3de84cc5cf50125bf52e84db]
Former-commit-id: 75b3b72fd7bd5468a6d41a01474db3da90dc9061
2018-02-05 14:49:51 -05:00
Fynn
7ef5c029b9
Renaming variables, removing unnecessary requires
...
Former-commit-id: e7ab3f1756067a9feb9c4b010e8089e5fb04566f [formerly aa39862c0e3edd2baec6d90bdb01ded21b19fff0]
Former-commit-id: 514e3db78ad253d7768bdec5cb6ac0c6428ab8ef
2018-02-05 20:32:45 +01:00
Raul Jordan
9b6eed7dae
regenerate bindings with new changes
...
Former-commit-id: 3893bee1aeb1f4cc0b11516c93d9c9295b2b1e44 [formerly 9fa34925ad183d9319cbc9cabe1250563609dec3]
Former-commit-id: 89e46099f8cbacc9ba0e2f23213b5cb3f3e49b7e
2018-02-05 12:23:46 -06:00
Raul Jordan
4aa44d2a4a
merge changes
...
Former-commit-id: 95b3eea4682c52b52efaedbab8a55c8be686ee5d [formerly ac59cd5a3f0c0a60d343cadbaa8b971ca54774b4]
Former-commit-id: ade280b31df202e8c0bcead31ef26786620e5255
2018-02-05 12:21:20 -06:00
Fynn
74a744f338
make shardCount public
...
Former-commit-id: 7546ce0eb3a7c0c6e6ca53588bfa0d7866d3734d [formerly 1ba1e42c6d4645b69916ef09f90a96fce98c6d0d]
Former-commit-id: 963c0eb9e89d82b2015c52558fae69379f3b31bf
2018-02-05 19:13:11 +01:00
Fynn
89b3f36f2c
adjusting code to review
...
Former-commit-id: 3c47ffd37a1dfe26da31c12c2005b079ce6910bd [formerly b5fca337e8c32e9a4c6f8505722c97e08464cfff]
Former-commit-id: 5b8433833e53f8e9411afbf1ea36752b5395be18
2018-02-05 19:06:00 +01:00
Raul Jordan
ad2a5a655b
proper error handling in collator.go
...
Former-commit-id: b2b5a4602f2767dfdd8b3de3b2a9cf4994f8e2fa [formerly 1b764bc06d5d5eff79ffc197d89c3614313d7bb3]
Former-commit-id: ec5a587e262d81211ba525afaf603a89fc1916f6
2018-02-05 12:00:29 -06:00
Raul Jordan
6314e30738
incl shardcount and geteligibleproposer
...
Former-commit-id: ca89a12bde74378a1ca74d5d22cbdb66990c7025 [formerly 4c1576328b40485517e429e1f767d796fc102158]
Former-commit-id: 01ea5d46fb9bda3dc340e368a37efbf3a34e7624
2018-02-05 11:54:33 -06:00
Raul Jordan
d2a96c3f35
merged enrique's changes
...
Former-commit-id: 47b434828969f56074df73ff2c50cb5b23711927 [formerly 349e2ec3535e13b56c187aa53f2f529736aa56e9]
Former-commit-id: a7bfb88c58188c6d330017f5283b8a9cc4cce214
2018-02-05 11:50:57 -06:00
Raul Jordan
60c3edf599
merged
...
Former-commit-id: d9e4ef72bd42bf36b98c7e052d9a34838ae996dc [formerly 8e0d5dca4592d67663d91655a6abeca60c37b27d]
Former-commit-id: 821fc21775c8e5d973dca6c4702bca43905f777d
2018-02-05 11:49:46 -06:00
Fynn
fb1cce66a3
styling
...
Former-commit-id: 883fb24df46347c049867fcc47cac930b0123b8f [formerly 1e3bfdd66dc35b33e3c298bf5c2e700fb4743d3b]
Former-commit-id: 4bc93ce29921fc0b2af09948b6a8bdd1af6ddbc3
2018-02-05 14:47:48 +01:00
Fynn
a6a1a4f790
Trying to outsmart the compiler
...
Former-commit-id: cee4cb63e4738372fa5f240e9dd63f9f43a316c9 [formerly f2691c26c2ae080e6996bf97dd4dc16a1ae77bf7]
Former-commit-id: bc82a7508a1914700d48b9a505f7a21472f31bc0
2018-02-05 14:38:59 +01:00
Fynn
68e6135d02
Fix type errors
...
Former-commit-id: d18b56f51a6b87c7b976de24778789fa62644495 [formerly 02d0739b8bbadbfa8e2e499e1a14d5fef772c83e]
Former-commit-id: 7eed34e7d43f6255d2310bb86310fc0e56eb4d2b
2018-02-05 14:37:01 +01:00
Fynn
50ce4c735c
removed validator's cycle var
...
Former-commit-id: 2d019e818145aaf8510d38da46b3a0748d68cb93 [formerly db9083c59f38349e7dcba65ec4fb2843b709818a]
Former-commit-id: 8ef26b218aec854a987697e3c73e104f85cb3c65
2018-02-05 14:10:28 +01:00
Fynn
dd4a391f8b
VMC contract adjustments
...
Missing CollationAdded log
Former-commit-id: 2853d6719f0db7b09edc46a382db73f3a4cd0389 [formerly 213dd18a8a5edcda88a5405ef38a37d6053dfbcc]
Former-commit-id: a2e31148e881d02c1e0ff83349529cd12d12aeaf
2018-02-05 14:04:38 +01:00
Fynn
7819ec6684
no need for RLP lib :)
...
Former-commit-id: 7864362ff2b5ef8a242a0069de2ea9542c1880d6 [formerly 58bb466edee5553bd6650f61a33744c7983bdcb1]
Former-commit-id: c7f09619fb3e51875d271bac61d10df75a5ac4fc
2018-02-05 14:04:21 +01:00
Fynn
d9a7106a0c
new event
...
Former-commit-id: 7e553b8f467e46b53b331d70bee5c89277dc4067 [formerly 0b4a95c2b2e1403493db125359fec9d89dad4d23]
Former-commit-id: 8bad3a5e1b1a5dcab3dbc717c872dd39b29d207e
2018-02-05 09:47:27 +01:00
Raul Jordan
ed6e77b24f
propose collation called if addr from sample is coinbase
...
Former-commit-id: 95d9c92597ded3ddb607370f43702122c44b5f56 [formerly f19f1fd28b1f8d44b27e054cfccf39b37110149a]
Former-commit-id: 1364ac025a86fd1b489255646efeb0b09c1c3cb0
2018-02-01 18:01:21 -06:00
Raul Jordan
ec5e19f77c
loops over shards and checks if eligible proposer
...
Former-commit-id: 50cae4574228c725b83c0c6669a0a1231129d2a8 [formerly 7caacc27c9ddb53a0b0d3d635cbd93bec61499e3]
Former-commit-id: 8f127e38b79a57e7ca52fe02b1f989b032d74a2e
2018-02-01 13:30:24 -06:00
Raul Jordan
ea885e97ea
get shard list programmatically
...
Former-commit-id: 17272ff42a6e802584171c230634b690168a8800 [formerly f733e0760493d8d784bd68cfba648c2ea62fdb43]
Former-commit-id: 7ebe6cf22b8193302bc1270a2fd52df21b97c136
2018-01-31 22:41:11 -06:00
Raul Jordan
319ba38250
rename to collator.go and implement the watchShards func
...
Former-commit-id: a408cce4805fab38dd0d52d8743c4d00b82133ee [formerly 01b8b29da9443a10ba632f386385e4bc9fc86a84]
Former-commit-id: a88f703397c4f0a90414b1769a499bd108dcff05
2018-01-31 22:33:38 -06:00
Fynn
621e769692
constant variables & no need for sigGasLimit
...
Former-commit-id: c36b63e78bc0bb6d05763605f443d99fc6370eb4 [formerly 5ed2b7fa9a7640ea93fc05b7351da95f10a5b6b9]
Former-commit-id: ccd55ddcc878e4d1bcd3e71102f88de23982a427
2018-01-30 10:24:32 +01:00
Raul Jordan
5ce2be8aeb
merged and included latest contract code and bindings
...
Former-commit-id: b661bb5ead2c16045c57a4834d6f4a1a3abb68b9 [formerly 4015afdebbfe1729ff3e87d49fd0a8741b71e5b5]
Former-commit-id: 430b7ddec633d60e591041d1e381c781174147e7
2018-01-29 13:41:21 -06:00
Raul Jordan
31663ecdcf
merge current changes
...
Former-commit-id: ecb74d7823ae58320c9e43b596e02b1d213606c4 [formerly 005a99595afb098054ea412644a037ccb0244715]
Former-commit-id: bb775a75603b63fbcf0169efe163fe5f078ebcf5
2018-01-29 13:40:40 -06:00
Fynn
b68db42854
Simplify validator's logic
...
Remove validator's code and use the transaction's signature
to verify the validator's identity
Former-commit-id: 4c30667db429a46986dd82a0ac80dbe0d64bd8be [formerly fae9ab5be5e78493a497543512a42368f52f8de1]
Former-commit-id: a8d78246d61b62d936257d2f48a8ea77c4c06792
2018-01-29 17:43:45 +01:00
Raul Jordan
db26c86f2e
add question
...
Former-commit-id: 3c7dac62cab0fe7987af3ead5c2d94d551ff201d [formerly 8b55773c96e30c3e1b54f978addc47be4e27b257]
Former-commit-id: 7866488bf1777a56d87d21c3f0f7fa670342d0a1
2018-01-28 23:54:10 -06:00
Raul Jordan
d636b84527
deposit eth into vmc
...
Former-commit-id: 3e33f6d0795ecb55081fadbc7316f1ba607cbd56 [formerly 5b90a5bfa48df92b07940173c5cf12ae449e1d28]
Former-commit-id: 2edb6c8e4a4441d3616d5a790ea6e2942687227a
2018-01-28 23:41:40 -06:00
Raul Jordan
dabd48c6d9
deposit into vmc using transact ops
...
Former-commit-id: 62d7abbd20e92d2825eef85103981b42f4349c3c [formerly f911482b82c5c2c4c66c9cb901bf6b9c5e0a57a2]
Former-commit-id: 9d5e6cdb2b7d2f4c76fd13e5e18b3eb758b2fe37
2018-01-28 23:35:15 -06:00
Raul Jordan
68cd20f4a9
comments
...
Former-commit-id: 913d945a3565e5bfdef67e6b9cf822fb5d56dcb0 [formerly 59f7ef0164287a95c61edd6bf2a74c120c1a5c41]
Former-commit-id: 6af3c24ccbaf127e99c7b09b8a58123f75f6dee9
2018-01-28 16:22:09 -06:00
Raul Jordan
760d3a1289
init vmc validator
...
Former-commit-id: 64d7a424c48c44917ad7439164f05372582ef857 [formerly 63fa2f70fe30ce4403157ab87e4344a0b5681163]
Former-commit-id: ed84eeb88b0a8b705fdf4c3f6c4a65053c58532e
2018-01-28 16:21:46 -06:00
Raul Jordan
c147675ec3
subscribe to new block headers for eligible proposer
...
Former-commit-id: c9eea106dac51f1d9a91fa16bc0c9a700d6a740d [formerly 86b5dab0dd01a8c5199dd7c5b06c86a4cc022369]
Former-commit-id: 5ee1c82975c61976e47efeac40e060a11f15e1df
2018-01-28 15:57:20 -06:00
Raul Jordan
3e35aaea76
added txpool func
...
Former-commit-id: ce9c444b973f4c856987e3393b76dceb4676bb10 [formerly 89fc90106f425a943ee1c556b0904eff5c96dda4]
Former-commit-id: c3a97c1421c394b9aaa15aaecdb2dd7a1aea75a2
2018-01-28 15:30:32 -06:00
Raul Jordan
7569bce70f
modifying the sharding client to listen for incoming tx's in the pool
...
Former-commit-id: 2baeab1f2d2ca80fd7c93f73a094a1b9754c9ea4 [formerly 4783c52f7f1998b97f97734b8e77e97fed0295d9]
Former-commit-id: 1bd46ad5776d2ffcf2bf5c04cbc8d7a221405871
2018-01-28 15:10:26 -06:00
Raul Jordan
8406d59f3d
merge changes
...
Former-commit-id: 207684b3a5191be2305ece19ff3902322e749749 [formerly e2439e5f533bb0f35727980e6c66ca1849782a5f]
Former-commit-id: d685e96e3f1b020a720d68b6377bf781f81b5864
2018-01-28 15:08:31 -06:00
Preston Van Loon
28f4b2f964
fix tests for to work properly
...
Former-commit-id: 6aa5738d5a16ac31e3da71f11fba5b16643a105c [formerly 837b547034da7991eaaf4be82e436b74972eccb1]
Former-commit-id: 6b8791f4ca9969f57fc89ac775e5bfda3cb7f518
2018-01-28 15:57:05 -05:00
Preston Van Loon
028a18b8fc
Merge branch 'sharding' of github.com:prestonvanloon/go-ethereum into sharding
...
Former-commit-id: b14eb58d4c07f4a54cce296424585428adaed020 [formerly a5990b38c2a443c533ecaa7a65318960f00b1009]
Former-commit-id: ce6ce777d7bccaa51a9601078582cb81684fee67
2018-01-28 12:39:35 -05:00
Preston Van Loon
a68be6076c
fix estimate gas price test
...
Former-commit-id: a4565e6a8937824be3b095534cc6fcbc037fa116 [formerly 2ab68064d3306a9112fad1dfaf57838e258d02fd]
Former-commit-id: b8c128dfb85b0e291237bb1fc1a21d7cee45bf45
2018-01-28 12:39:09 -05:00
Preston Van Loon
f943ae6eb7
Add minor comment to indicate that networkID == chainID
...
Former-commit-id: dc216cc7c2af745a579b23cbd88d24970322091e [formerly 2f2423862ebdf38d2ebe90be4c705cc68dd78e01]
Former-commit-id: 377189a64e200bb874d09ee2f115556aa152b86f
2018-01-27 21:24:23 -05:00
Preston Van Loon
864405a823
deploy VMC rather than ValidatorContract
...
Former-commit-id: 43aee542df91cb2bfa293a4583f5a1b12b5c8790 [formerly 06d9ebb22185133b1abca17543e9f4922e62f4b0]
Former-commit-id: e0cceae6369a7be1a7837df362ff2d748d8cadd5
2018-01-27 14:57:37 -05:00
Preston Van Loon
49542d24b6
update codeblock type
...
Former-commit-id: 701fed57ef320dcca8c210c438b877c7ca153130 [formerly 51d6976c029a1c6b8537f02bf14ae18478391462]
Former-commit-id: 2b1004a44b9366a70394e5b004c534734f2a4cfc
2018-01-27 14:29:17 -05:00
Preston Van Loon
c072e9a241
fix comment
...
Former-commit-id: 8ee7b36974893875069841e78908ad750529bef0 [formerly d9a17181b9e8eeeb47f74f8a681def14edc5cc34]
Former-commit-id: 95a9a0bd5f9b351efbc03cb04bcda1819ca9d8f4
2018-01-27 14:25:07 -05:00
Preston Van Loon
488a7d271e
Update sharding client to use generated go bindings
...
Former-commit-id: 9286ea4689812d94e6be396912c51c20799948a1 [formerly 6224962ab5bc72cd61e970d53e41c7ca04a75027]
Former-commit-id: e5d20015dca23a5e6da3e00300dd1e40f5a920b7
2018-01-27 14:24:13 -05:00
Fynn
5e77438b14
addHeader almost done
...
Former-commit-id: a2e45cb91aec036dd9967db19eb887104371b8ad [formerly 6010ac83b5383d86861ff660ddb2dfae03a50816]
Former-commit-id: 737c461344fc027f6b147e923d0757fc636caad6
2018-01-25 16:55:46 +01:00
Preston Van Loon
37bc466ed0
WIP deploy contract using builtin ABI package
...
Former-commit-id: 9ff3b6dfc6fc9f5bf8278eccef6eeb6bf9cd3434 [formerly 1282951d281590f65a7d8576c0535ce27d1d31ea]
Former-commit-id: 4a0607441cecc0c617dc1deda8a3a5b1291ef763
2018-01-23 22:25:32 -05:00
Terence Tsao
9f4a8b83e8
update READMEs datadir path to /path/to/your/datadir
...
Former-commit-id: 89587d9fb77db98488a9bc91824a92c97c61cd3d [formerly 5216e97d22f51aaff2ba55fd5736986c5a4d8edf]
Former-commit-id: 8b52aada014c65f4debad6e91fbb541874f4cd0f
2018-01-22 12:51:12 -08:00
