Commit Graph

51 Commits

Author SHA1 Message Date
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
Fynn
67dce86c6c CollationAdded event unpacked
Former-commit-id: 542a2c3a8ee952dfe49106d56efffdb3c08815d6 [formerly 8c1f11fe17594e2d69957bdf588f4ee633f8e7a8]
Former-commit-id: ff10848fcfb8ca70e8973b39359b8c9ab631aaf3
2018-02-06 09:47:41 +01: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
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
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
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
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
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
Raul Jordan
808d28451d fix up the readme with the working entry point commands and flags
Former-commit-id: 9311b79eb9fb9b8a0e77fe12ca1ae47a2c38e9f1 [formerly 9e6aa0cb15a9c3354785b96dcd1d1f29d56662f7]
Former-commit-id: 9be9a066bb243134860044dd2612ee394d3cf54a
2018-01-22 10:48:22 -06:00
Preston Van Loon
200075f48c remove extra logging statement and comment
Former-commit-id: 56f2f83945769cf082032872d712f90c03977aa6 [formerly 7ad31d44fcea30fed41b387f44545bdc45adeb10]
Former-commit-id: a568c78aa5f8b19cdad699cac35ad2923a25b526
2018-01-22 07:31:38 -05:00
Raul Jordan
3e25cc8660 fix dynamic network id through json rpc
Former-commit-id: 2654b12335b4378c202ea854e27a8572ce17d20e [formerly 3ecb3593218566b84b4eec9c33d4252d4bc7681f]
Former-commit-id: ddd3b366f92b378eae94b7c37c529806391ba087
2018-01-22 07:30:06 -05:00
Fynn
435901aa74 Better abstraction to Validator Address
Former-commit-id: e49c7dfc3769f960337c4a5085b34da5c0b29cea [formerly 32bf6a45f7a21be714c4c44d9d954a878b0e22f5]
Former-commit-id: 57a34ee1f3269dd764fbff18b4af3cba5e85faf7
2018-01-21 11:10:27 +01:00
Preston Van Loon
6ffb46a90a finish lookahead period comment
Former-commit-id: e9b45d6873a17f40b3e30bcea008278fadb6d865 [formerly 31ba86dba21639e64130e2add6b9c1cce2521020]
Former-commit-id: e041f8f601cdc54fe020a15a199c382a6b0f91e5
2018-01-20 19:10:12 -05:00
Preston Van Loon
f139cb33e2 fix deps and allow passing the datadir as the first arg like geth attach
Former-commit-id: 6d2f0e329a63a06f08927d30717fa1fef2b82d74 [formerly 31a3ce5de98f6a9fdace9f972418ce38b5e265b9]
Former-commit-id: b7caa9b86ec4c75f9fce07200358315fb0c7f85b
2018-01-20 19:03:20 -05:00
Preston Van Loon
4a89464c91 cleanup / move methods
Former-commit-id: a3948262d6acc24f0f49c245593ab1cf10bb2962 [formerly a0d5b9186ba4faa89c7dc4bdcd8ad949f641ad1b]
Former-commit-id: 0635e28b194fa4de6b7bcdb819a524ebe44f2d9c
2018-01-20 18:58:09 -05:00
Preston Van Loon
167cdf7914 Add sharding alias
Former-commit-id: d733b0990ea46cbcdd321599be7448f085388fbc [formerly a68721a6073690fd578e26fb1a83f0dc46837836]
Former-commit-id: 2381d5d021b641023aede79f77c446254b954d17
2018-01-20 18:45:40 -05:00
Preston Van Loon
42af6aad7d Merge branch 'master' of github.com:prysmaticlabs/geth-sharding into sharding
Former-commit-id: d97669d782a1cad9ea53c42abd83bab7fa344d6b [formerly fb526e4296e653e035f48392891581d5ceeb86aa]
Former-commit-id: e36fd3c72997fda94b1c9b7e0689b8e1e96e5b72
2018-01-20 13:40:23 -05:00
Preston Van Loon
9ba9274ea5 Use network id from command line
Former-commit-id: 78c94954b281ba8b12802e7b54c0d1ceeda36a30 [formerly 907fdb09efcd3b4cc31aee5d9a2e354dfb84e093]
Former-commit-id: a9e66d5a14df26edbb4e2eedc1416e29284677cc
2018-01-20 12:17:59 -05:00
Preston Van Loon
1061ade1f8 Working on tests for sharding client
Former-commit-id: 71665407b28bbedc5d0fdf245d157ccdb373202f [formerly e37561747705f94c22f812528eb93abffe398b1e]
Former-commit-id: d805b464fdbee525e935543dc6d252962d634ecf
2018-01-20 12:01:05 -05:00
Preston Van Loon
8754a1de31 update error messages, update VMC addr with newly created, check bytecode (not working yet)
Former-commit-id: 5740a1fd78ab3d0c2641edaa99a0ed61b7f8472c [formerly 79079ffdc3782a2f58b6678f1d22a504a1125cf8]
Former-commit-id: a048daa18190deb46d924685657dccd737cb8003
2018-01-17 21:34:03 -05:00
Fynn
a3eb8fb155 withdraw implemented
Former-commit-id: f4ec0e7067ecc9406e7b3ef56659d5924b547c87 [formerly 6720442b533ed1bc406087452e5328363f1f01b9]
Former-commit-id: e2108b302ee39b6882c3de60b3ef19449c91e32b
2018-01-17 17:22:15 +01:00
Fynn
785d99de02 RLP implementation
Former-commit-id: 1a6144cb6f46b16281b79cb999acd838a01cd110 [formerly 42f939e8c110dd9982dbb7db25ef77d64219f2c2]
Former-commit-id: a0ebe69fd061ef85e26f87c02f7e1d4029d79133
2018-01-17 17:21:54 +01:00
Preston Van Loon
fa117e853f use common.hex2bytes
Former-commit-id: 1a43b0bfd1b8eed18c8f40c955b21f58a8e0a452 [formerly 2525b2d00d20fbb9dd1bb9581a9789dae74f6d76]
Former-commit-id: 192fdb6088b0d97a2f3b9222057e65ffb46ebba9
2018-01-16 23:20:04 -05:00
Preston Van Loon
1a0dcb955a update abi and bytecode
Former-commit-id: d12c81d3c5e40a2ed59eb8f5ca2b977dfa0cff0f [formerly 3cdb4b1860ab41e6a0608a2496ea675eb5d93606]
Former-commit-id: 2cd1c66534d1fe28124c771b78ff4c6613bdedbc
2018-01-16 23:09:16 -05:00
Preston Van Loon
f877297737 using password file, some method comments, working getCode for contract
Former-commit-id: 087f9d471291ba6361c8d8e905935227849d57ea [formerly 79568804120e8aa8914977967e3233ba5397b26c]
Former-commit-id: aeabcb2d2ca2622defd3f04420cde73df42be53f
2018-01-16 22:59:35 -05:00
Preston Van Loon
0194e1cc0c Properly support datadir
Former-commit-id: 80325290698bf7099f0e46cb48af46c9c197842a [formerly c036afc211c79e1134b4e42d5b79dd309d044eb4]
Former-commit-id: c2d592d61e4dde4d762253048e07fe54ff48e0a3
2018-01-16 21:37:01 -05:00
Raul Jordan
94368cbdd9 added README and entry point specifications
Former-commit-id: a538db47a820ea4c317ed23f2cdbc7e4e7bb737a [formerly 1499bab1308c0c25675b4b33100a29d898af57f0]
Former-commit-id: ee02769ea60fb9abcc316eb0bfa57437bc9a4614
2018-01-15 16:43:36 -06:00
Fynn
4c2180be1d WIP: Validator manager contract in solidity
Former-commit-id: 98483e7425feed46ae2a946e7d86461cbcf28d21 [formerly 334390368a91c34c1d66b0e262fcaef293cd6409]
Former-commit-id: 7f5f7dc5385c8cef6ecea39040f915554472a736
2018-01-15 23:01:24 +01:00
Preston Van Loon
2315677271 Merge branch 'master' of github.com:prysmaticlabs/geth-sharding into sharding
Former-commit-id: 9f8c0926411a1f11d0f7c438065a2034d3fc2198 [formerly ebe0e4bedb9c2f92c386e2d52faccdcfb858c8f6]
Former-commit-id: f07aba40e5272616287b078b0ac61046201c70e0
2018-01-15 16:40:35 -05:00
Preston Van Loon
7e09ed395b contract deploy somewhat working
Former-commit-id: 2bccce337d29f12b7a96d5d79be6528c1ddfe6e6 [formerly 853da49db264a445f955c21294909909c59b56f7]
Former-commit-id: d67aece06f67fc24d0a7036646ded876218ce84f
2018-01-15 16:39:00 -05:00
Raul Jordan
5442387060 incl sharding and readme
Former-commit-id: c5df26191476ac1fde46c262717d424466d21977 [formerly ed054b1fd30c24a430472ffa2be3c3ba81f1aeae]
Former-commit-id: ed346fd5eb7a50a9b7e8f0557a2245a37d56fb03
2018-01-15 11:41:27 -06:00
Preston Van Loon
50e92a018e add test boilerplate for sharding client
Former-commit-id: 7cbd81db9421e1517ad92829a2dbbdfcf5f38699 [formerly 76607161435699e18a970c82f9838d20e94f04d7]
Former-commit-id: f6db97246aa70eda35e59a2a05fa55316289bd76
2018-01-14 21:59:51 -05:00