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
Raul Jordan
daecfbc906
Merge pull request #13 from prestonvanloon/sharding
...
Use generated go bindings for validator management contract
Former-commit-id: cad5e473a71bc8ad0689018cc65883e409126c68 [formerly 56409d4ca269dad701534c2136a086095d6d7291]
Former-commit-id: ab885a8d678cdbc5536fadab09b8f8704f973749
2018-01-28 15:02:35 -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
Raul Jordan
ec79a87ed9
merge
...
Former-commit-id: 9a827718c867cff1f883fbf1180e9197120abf07 [formerly 7ab3553c16ba1c0c90d2427a7876c70f16e71d27]
Former-commit-id: 17e39b7cdeff91ff22c33e9aaeb21f6aac35e89d
2018-01-28 13:27:27 -06: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
Preston Van Loon
c15634b962
Merge pull request #11 from terenc3t/terence
...
update READMEs datadir path to /path/to/your/datadir
Former-commit-id: 3071df335dceefee5ea2644df54cb096f4c0f46a [formerly 3dcc0fdf704b5168349b787128d80a83979a1277]
Former-commit-id: ac70129189739b08e5cb3d99e1153151add3de19
2018-01-22 16:13:03 -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
e762421f1a
merge preston's changes
...
Former-commit-id: e0add523876e26e99da26cd2ead412d40157f0ee [formerly a1c174a2eb92915ea0af9400ec81d60c0955ce2e]
Former-commit-id: 9f2b37d1258ae09c8104208bd39fc53ed68d7400
2018-01-22 10:49:23 -06: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
Raul Jordan
71860e6101
Merge pull request #3 from prestonvanloon/sharding
...
geth sharding entrypoint and contract deployment
Former-commit-id: ba96e81a08e862ab78d7aaf96eba5709875d9704 [formerly b3969a9fc197dacc351f944e5abcacc4e1a41381]
Former-commit-id: 4b8e449ce897cf8576678535811b95727982e2a1
2018-01-22 10:44:00 -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
Preston Van Loon
dbbd510e87
Merge branch 'master' of github.com:ethereum/go-ethereum into sharding
...
Former-commit-id: 67bbf74c5d56eb00019897556e98cb601f9bfa15 [formerly 499490a5fc98e3a41b409067c5f24d1ccc740976]
Former-commit-id: 725e6eecda7e624b7f0341582a26a6492fa6cc0f
2018-01-22 07:25:11 -05:00
Raul Jordan
99068b8e5c
fix dynamic network id through json rpc
...
Former-commit-id: 75c1f05973e1fd9cdaa86518c80b39517e0a21d3 [formerly 8279f4fa7f7ee34ad97ae332e281c89a89c5269b]
Former-commit-id: fe4066caab62419df0ca4e33fefb3539b4159335
2018-01-21 23:13:20 -06:00
Raul Jordan
da87a34718
Merge pull request #10 from rauljordan/master
...
change genesis to reflect new chainid and higher gas limit for vmc co…
Former-commit-id: c33968c7a561231164a5f0fa17a9392894722e72 [formerly 44a0f2e7169c1ad781378b13d0e66f78eac740fb]
Former-commit-id: 3e2904fda408ba4668e3ad933c0ece8073d43621
2018-01-21 22:52:31 -06:00
Raul Jordan
01efb9f750
change genesis to reflect new chainid and higher gas limit for vmc contract
...
Former-commit-id: 611b151b2bb4aa4bead8b936e81c2686652b5748 [formerly f4afae19c8e9af3ec7cce80de1bf3189e0f8cf87]
Former-commit-id: 204f6285511c642f91287375dcdfeaddec878ed4
2018-01-21 22:51:58 -06:00
Raul Jordan
fb4e9855b9
fix up genesis to reflect 12345 chainid and higher gas limit for testing purposes
...
Former-commit-id: 1a9405e48ba06c502a26ea34fc81631b35a38026 [formerly d81bca01442f353fa89d57a5f939921a73d712a8]
Former-commit-id: 43ffa3a326f8d88e3994cdf8ba70563c395992e4
2018-01-21 22:47:58 -06:00
Raul Jordan
014a22c8f8
fetch upstream
...
Former-commit-id: c9c999eabd6a11476495790e801fbddc35418302 [formerly 5e30cfb3123073eb1c965a9305d18921eb066a6d]
Former-commit-id: 6c073bd166fd9bcb337b6842406f4b5b9baf37cf
2018-01-21 21:56:18 -06: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
ad2384c6f6
Add a basic command description
...
Former-commit-id: 6576abbb33b8c01be58ebc1da7242328dd1d94a1 [formerly e5cfd3298f1fc8ba706e5a8575c69e7b17fcb6e2]
Former-commit-id: 9effda921bce995454aa815698b131a1de2c8c3d
2018-01-20 19:07:41 -05:00
