Fynn
46c33c9bfe
sharding: get_eligible_collator with tests
...
Former-commit-id: 19bcd3b213dec79c4fa634e31105c7e09cd7ffd2 [formerly be97e08143820904c399eff1f9b27dccc84bf3c0]
Former-commit-id: e1c18d06271f0df5c667823372ff8f314a6d9f82
2018-04-04 18:05:10 +02:00
Fynn
abdf7b9b9d
sharding: tests for deregister_collator
...
Former-commit-id: b45132122f5ff237082a390d04a9fce51098264c [formerly e75f76656887bac728ab65d60acc330adece44ba]
Former-commit-id: aeea9a6841dffc722f171d2d10c166c8af523008
2018-04-04 07:57:45 +02:00
Fynn
7fa709bd40
sharding: collator functions
...
deregister_collator and release_collator implementation
Former-commit-id: 2c9a3ef1ee840209a65f9d6bd5d27f6efcad4ce0 [formerly f60bca0bc0a46f61dfa45fc62af9c37d75b6a749]
Former-commit-id: 3be99e546546fbf91ffb92586dd9e4448b4b563c
2018-04-04 07:57:06 +02:00
Enrique Fynn
33bfc902eb
Merge branch 'master' into smc_phase1
...
Former-commit-id: 3499684490b234ed887834cfdc36e5d207d260a7 [formerly f2d74d477d17afb2871e5997584ab7ea542f99ee]
Former-commit-id: ce4db3f2fa9925f3a31454d6d0058a1a4c407adb
2018-04-03 09:55:29 +02:00
Terence Tsao
32df032c07
sharding: align config with phase 1 spec
...
Former-commit-id: e51e625451c086edb968f1cfbd0516678eaaa645 [formerly 886d4beb7d029ee156af565a5c1721a7061a4ff2]
Former-commit-id: 35de58aa8e9609e50e53c1c219a94a07a7e73c44
2018-04-02 15:51:36 -07:00
Preston Van Loon
a95d979ee9
Merge pull request #85 from prestonvanloon/refactoring
...
Refactoring sharding package for proposer/client separation
align config with phase 1 spec
update SMC to use 1000eth as collator deposit size
fix deposit for collator_test
fixed config test and added more test cases
Former-commit-id: 7fadb044ec7bb136964781ac271ce6abb4cff86f [formerly d1c93419517a502d37f09560187a9d804bfea940]
Former-commit-id: 9747bdee7a32a4a056402d1f4b0da114c63003b8
2018-04-02 15:49:51 -07:00
Preston Van Loon
72bd785a2e
sharding: Package comments and responding to PR feedback
...
Former-commit-id: 970a229ed8d1cce8c5383a40e313092828c1be69 [formerly 0f30c11d3352946caccc1d325a0551f43dc8439c]
Former-commit-id: 6ca7badf14c01fabf6a63db26214b6a0179aa8f2
2018-04-01 15:46:02 -04:00
Fynn
09446f5ebd
WIP: SMC for phase 1
...
Former-commit-id: d756e5811f4d8803252276d83bc9e189473ed435 [formerly 3f9041a1733c9bb0882b395010008fe2aea5f74e]
Former-commit-id: 3911cda4e088c50ba9a5d85e6a6af963c4773a91
2018-03-24 18:37:53 +01:00
Terence Tsao
af7124e91f
fixed all the typos during integration, manually tested
...
Former-commit-id: 85344d0a515f1bc6d2ac32a43ac7b2fc96e477c5 [formerly ae47d11056c1c4ca49d254c25ab324240751b2dc]
Former-commit-id: 2655a39f356563dbd37a5344a217f8ab5305d263
2018-03-08 17:40:22 -08:00
Terence Tsao
533e12b6e7
updated VMC to SMC
...
Former-commit-id: e8aa99e8cae2f59728986c9bf079ad399bb1d8ed [formerly 7e7f88907c44c4a7cbefd2d0095dee33a86265e8]
Former-commit-id: 7e8ef4440f41760cf346378916242888b44f609f
2018-03-08 16:04:13 -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
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
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
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
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
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
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
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
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
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
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
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
31663ecdcf
merge current changes
...
Former-commit-id: ecb74d7823ae58320c9e43b596e02b1d213606c4 [formerly 005a99595afb098054ea412644a037ccb0244715]
Former-commit-id: bb775a75603b63fbcf0169efe163fe5f078ebcf5
2018-01-29 13:40:40 -06:00
