56 Commits

Author	SHA1	Message	Date
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
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
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
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
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
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	04271a89fe	sharding transaction tests ... Former-commit-id: 05978a0028b27bc99cdbd2cdf8f66c78a48444be [formerly c05cd8f789a0f2a3b24b4a41eda2d6d89c33e41b] Former-commit-id: 04955bc0a35f4932b5ff28c98393ff79d0356d4a	2018-01-16 11:56:21 -06:00
Raul Jordan	cd9febd964	new sharding tx creation ... Former-commit-id: 49c7d3ec20aef302a78d0b5cca429e82e6db723a [formerly 3226861cee91b190a384b920c97d40532ca35d25] Former-commit-id: c4edba1470e8bc5d6e7cd67c1d9f9269ae6b589e	2018-01-16 11:21:28 -06:00
Raul Jordan	ccd6c446de	creates a new sharding transaction ... Former-commit-id: 878a8020d1e5311d0370c33602b529f1b6f3c1eb [formerly e1b83dfed44b0774d3d9da8022d1b095c9086e16] Former-commit-id: de36b645a3d760556152cebf7c0906cec2f08058	2018-01-16 11:16:46 -06:00
Raul Jordan	b336b6adfa	sharding tx base types override ... Former-commit-id: b000e066b08f84dd40c251b30f36af125e2beaa8 [formerly 918447dfb6071e7346a737de737b510fad9607df] Former-commit-id: 821ec50c9b6149362ef3f7d3994cd23b99f0ded1	2018-01-16 10:41:00 -06:00
Raul Jordan	26778d7a35	incl blocks, transactions, and vm protocol interface overrides ... Former-commit-id: 4f7ea1013da8d6daefab63a0236b14fef66b5c1a [formerly 658e8d21091332ef2e25ba61ac839ed3af98822e] Former-commit-id: 11677ca82e862dd20e0541ef196c17ebd38af856	2018-01-15 16:53:42 -06: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