Commit Graph

208 Commits

Author SHA1 Message Date
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
Raul Jordan
d6dbe3bfce Merge pull request #81 from rauljordan/documentation
Modify Documentation for Updated Phase 1

Former-commit-id: c984c9b42d5233332a010939ac82b7109c32a901 [formerly c671aff690ca2d841c56e80f91ec759053fd965d]
Former-commit-id: 3a1815c3ef770a3af06befc4aeb02930ada0bbfb
2018-04-03 11:35:16 +09: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
Preston Van Loon
3b0cd6f032 Add back go generate comment
Former-commit-id: bb4191598ca1d29bacd4ccdc0459cf650b121403 [formerly 6366f9aa7390814b83863cea0687c3de48c130ba]
Former-commit-id: dccf95e4ecc152133f544ea00127886cb96be740
2018-03-31 18:21:09 -04:00
Preston Van Loon
3da5bb8e08 Remove comment
Former-commit-id: 86c78d265a8bc6b1b73e90fef02f8cb59a4e326d [formerly cd0239b478dee46d1688abd9d6b7e0a82dff6bf2]
Former-commit-id: 5518c399bb0a0831f746bbff5460771c4dbbe01f
2018-03-31 18:07:43 -04:00
Preston Van Loon
9db49e8be3 lint
Former-commit-id: cdd3520e9e4705f23addbcbee86819dcdc322182 [formerly 0ef943ecc446417babcb02f2f49a3c48ed9db772]
Former-commit-id: 3dd9b81535df442cbdcd4ef6a4e043c192fbd8d0
2018-03-31 18:05:22 -04:00
Preston Van Loon
7df6110eff Working on testing after refactoring
Former-commit-id: a85e9b33e2895c403e625a650fca1d530a0f8230 [formerly f258e65dfbdcde622dcdb3e74b24f8dea33c6751]
Former-commit-id: 94c5da680fdf74217500980089837e7c336d93a4
2018-03-31 17:48:57 -04:00
Preston Van Loon
ae1dfbbaf9 Refactor proposer
Former-commit-id: 2c934014a8624f84a33850a748dc41227f6a64e8 [formerly eebbc1a6350e0895f770c89efee80204cfd63fba]
Former-commit-id: 74dca03e825ee2a5af2f8e4bce21c8ae0cae70ee
2018-03-31 17:04:22 -04:00
Preston Van Loon
13789b6e63 Cleanup refactoring for sharding client interface and collator.
Former-commit-id: 9d452ada62e9afe7295d07b2e7650736e640b39a [formerly ef6fcf4365cff18f14e9bfbd43d6b9d362abfbe4]
Former-commit-id: ede05e77ef22b10fd7d12ac635d2879165416904
2018-03-31 14:25:39 -04:00
nisdas
9614c81228 Fix RPC error and change log statement
Former-commit-id: 54da8e259e6abae30c61dc6301cbfeeb0ede8570 [formerly 31f207fb38d4a1699dc60c294cf99a1673b54ab7]
Former-commit-id: c70fc84a836a6b03bcaf07b5fe7a9eb5c116e0da
2018-03-31 14:13:51 +08:00
nisdas
394adb4750 Refactor Code
Former-commit-id: ad6a4793064556b556a92dbed3f8a555972c07a1 [formerly 13e903a723eee255b4eb6e2bcc7be06ba73b6fa7]
Former-commit-id: b2ecf21d02170030dfc56e9d9303aeb7bee45fab
2018-03-31 12:07:42 +08:00
nisdas
f47a4c5984 Adding sub-packages
Former-commit-id: 1bcb1a5a5a1116aca454f6c91df537be9f612cfa [formerly 9df4e60ca104f676fdd33da59c108205f223cdf3]
Former-commit-id: 64a678d3a48ad2879a827db59e6606b9efb0ac95
2018-03-30 06:55:52 +08:00
Raul Jordan
5521bde340 rm swp files
Former-commit-id: 3c4b7a6e2709b7b9feb4162a15483881532dd819 [formerly 3c698021c7950cc15eba8ae8c24280af84f9fa35]
Former-commit-id: d33d257a410e486ec82ae053216572ca68d4b682
2018-03-26 06:56:05 -05:00
Raul Jordan
f1adbf0ca1 wrap up all with the new spec
Former-commit-id: 7ea5d07e1adcb55a890bc357c0ac4fe00772d5ed [formerly 2e7457822099fe06109876f7d3de4f6073e6cd45]
Former-commit-id: b2df3c04f0936757679e05021fba7db3fa06c0ac
2018-03-26 06:55:42 -05:00
Raul Jordan
9efa252147 begin with the smc method explanations
Former-commit-id: f5161cbfbc8dd2855238d6f0bc819881dad35e60 [formerly 824d2b791e93cbb00d30d3834046a3d489d00f87]
Former-commit-id: 5a1a28e0580cff15aa61ce4ee45965ae596012c3
2018-03-26 06:39:35 -05:00
Raul Jordan
a9a5e78aa8 edited end to end sys architecture changes. Onwards to SMC sections
Former-commit-id: 7593ceb6f963ccf3dc6aa43e51f73d9fa551386d [formerly 8f10a15bfb03886f602e740e9709b4be7a80ac09]
Former-commit-id: 951eb00043f2e33d63ba01bcdb92664c89cf7684
2018-03-26 06:34:37 -05:00
Raul Jordan
030489da5d finish system architecture
Former-commit-id: ab40206e82e39c28a17af43980c6876c2d340dbf [formerly c26e0e483344305fe37cc27792b0b2f7ff3af723]
Former-commit-id: 65465d58d0ac51af8d5dd9f62714bf6abf7d8f0a
2018-03-26 06:17:54 -05:00
Raul Jordan
08db75e11e modify initial system architecture section
Former-commit-id: a34ceb04a27af307645cba533584497ea696c8fa [formerly 78246b40b1b7b209221077a4af7b68769ac346bb]
Former-commit-id: 386fbf227e5979d49fc305d6d317fe8602058c95
2018-03-25 10:58:34 +08: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
Raul Jordan
bda2415416 added all roadmap phases for sharding
Former-commit-id: 04f5fb76b8ef008a66f4e5361cc4ea56d7baa453 [formerly c5f714b9f48d0dc69b6f88916c83543b1cb36d23]
Former-commit-id: 4c16327f354ee7276d62a31dcad6444b05b70c82
2018-03-24 19:00:55 +08:00
Raul Jordan
2f2f68009d finished the releases section
Former-commit-id: 4f89abf11436b1267382b23318c15affed5efb99 [formerly 500b60b45d244ea57c3563ffdcf2c6d1521927a3]
Former-commit-id: aa9456b6682d09f692c9b95ff43190bf3cb2bff0
2018-03-24 18:40:01 +08:00
Raul Jordan
64ab9d6748 finished changes to introductory section
Former-commit-id: 4bdb23e28f5f1c1b92a623ccaa11596c5289b556 [formerly 6279a111f4cc407e7c0dc377bb6bce2e9015419b]
Former-commit-id: 7784edbc72d25c289239ef7df52a0cb1e04ff783
2018-03-24 18:27:12 +08:00
Raul Jordan
8ca5777cc6 working on introduction section changes
Former-commit-id: 270d1b4d6a3807daef15c4feb7c9a699028e6e4c [formerly 714a61c27239b51aee0f58246e9335c452d1df4c]
Former-commit-id: c4463d0641a1abc1ccd0e8dd66e8eb158beb5652
2018-03-24 18:12:32 +08:00
Raul Jordan
53345ebcda edit toplevel README for updated phase 1 plan and goals
Former-commit-id: 443eaf92040c5f6e5fa39e889d86015a4d1bce60 [formerly 1a4ae36baa02c3acf5609e1234000deaf3c457af]
Former-commit-id: 31b9229b4b4865f4d1b1907fdea045b7ba1ae63b
2018-03-24 17:59:13 +08:00
Fynn
eb70fc73cd Merge branch 'master' of https://github.com/ethereum/go-ethereum into geth-sharding
Former-commit-id: 25dc367490dd16ef4fa1d462118aa438df1b319a [formerly 6fab78aeb8b9f54fddbad1406f97392b753a830a]
Former-commit-id: 0de0bb3ef9af1735ac8ecd1aefe2d57c0f76c62d
2018-03-23 19:10:53 +01:00
Terence Tsao
cc7c2066bd fixed print statement of deposit size from wei to ether
Former-commit-id: 3fa5bf50b0f46465f16660e0be6b4cb7eb64e3b7 [formerly 0e3b6a78e5602087861f91ac93d1bd94d6d9674f]
Former-commit-id: 2e9be84786757ec4706b9909e4db2a5e19fb550a
2018-03-21 21:21:24 -07:00
Terence Tsao
4bb856a622 change shard count to 1
Former-commit-id: d8467e1a5984852549ed1182f82050c4d7b4fdff [formerly e78ec2db8f5919541a73782b7f02ed19b6a7f5b9]
Former-commit-id: f2349649dd1d031f7cae9dfd54ad75ff79ba60f6
2018-03-21 21:04:07 -07:00
Terence Tsao
f2660f4bd7 added tx does not exceed gas limit todo back for #37
Former-commit-id: c9bf9cc7564922c617245519e771b4966a4058ba [formerly bf1f8c7111408195e1c5508f03ce058881e70f97]
Former-commit-id: af346bd57e9dac6f6d6bdb22d70270e7fa8207c5
2018-03-21 07:33:57 -07:00
Terence Tsao
f30bb129cf removed todos
Former-commit-id: 05cfda4922ebf3bc57aa57a94a001ceb6be615e7 [formerly 094b52515d872458155169161008a71ee940d538]
Former-commit-id: 377d521fe46955b41c66d52769b42a4b04244d68
2018-03-20 22:57:35 -07:00
Terence Tsao
009a96f8c2 format
Former-commit-id: 0dfd8ae44d6bf896b9d0c43f7cd656c47291fb77 [formerly 37a4fe6edcc9447d8233c05cb06888bc33e8ac20]
Former-commit-id: 1fdb96e7d1dab081c685f705120f270285c4cc84
2018-03-20 21:10:41 -07:00
Terence Tsao
d625475a96 added TODOs for tx to blob
Former-commit-id: 5b122d8260ec36d7b9931cd37194993915aeb363 [formerly 2a1376100a61088f5bb455462c782175985c8e6a]
Former-commit-id: 157da67786f1b0132625e9c91564399f7afa96a3
2018-03-20 21:07:40 -07:00
Terence Tsao
84b53b0942 collationHeader updated to align w/ phase 1 spec
Former-commit-id: b340430ddb847c52c6e50358a6332354200ccfde [formerly e51bfd83e6ddb4d2a099f5afe6dc8f54eaa40217]
Former-commit-id: db119d9e55981418c8b170d8207fe4f4c6c0c4fe
2018-03-20 10:36:30 -07:00
Raul Jordan
d2f6818491 fix review changes
Former-commit-id: 53a70c90c1f7f139958508e6e058e322ef75dc4b [formerly 021ac9e2eda49246804bf0beb3a654b5fdbde70c]
Former-commit-id: d876f1dd9ea8fe45e639e0b3ef29e09508d263ae
2018-03-11 17:38:34 -05:00
Raul Jordan
383877ed4e modify all diagrams
Former-commit-id: 1bf59d9b19bdca78746f9be949fa7f2098aa3d62 [formerly 736691fc8b8ffc174dd1611e9263d8400f8c5ace]
Former-commit-id: bb70c23bcc1f49c8f380a45902a8e3775ba04052
2018-03-11 17:29:11 -05:00
Raul Jordan
31b028dd91 change outstanding instances of validator
Former-commit-id: 27fa4b9e40183d985cd625defc5d17224b9a2b73 [formerly abfd9c3529d11d45b31aca5efa1628a6f9a4c8b4]
Former-commit-id: 5ae3d9045e27cf74d9447ca1062001a0e51bb7ca
2018-03-11 17:12:44 -05:00
Raul Jordan
90d6040325 Merge pull request #67 from enriquefynn/geth-sharding
WIP: modify sharding readme
Former-commit-id: ac1e156e3dd9cb4a38c885535aa6c45dc56f1de5 [formerly eae7644144b87ea1632f32534f162283bb5cab4e]
Former-commit-id: 75e14cc6af6a6dbe25a07fee4cbe9a1df0960fed
2018-03-11 17:04:51 -05:00
Fynn
462dba4f48 review changes
Former-commit-id: 478880ffa02d5c048d7985569b0b93be23e5147b [formerly d2a283904a83837d330af456e0d4043955bf34ce]
Former-commit-id: a1068a88c92138a4b822e11ea8347681d016378d
2018-03-10 09:05:17 +01:00
Fynn
12385fd54a collators are not proposers
Former-commit-id: 3de87d7f661dbf548d31060ae161d56e00a98d44 [formerly 2467249db129500e08378d0c1194bd3ae864edc4]
Former-commit-id: 08240fb4286c13daf2b919685ac8d5f7720fdd43
2018-03-09 17:29:51 +01:00
Fynn
5955f5fb3b spelling error
Former-commit-id: 4102e06957f63a1e1ef042e85b417619ac83880b [formerly ec96af55f6d78f005a6a71f71948bc80622984f2]
Former-commit-id: 3ac8814109205b5d6ec19ff666a3483fbcb6e178
2018-03-09 10:28:20 +01:00
Fynn
17096c1b79 Changes in terminology
Other minor text changes


Former-commit-id: c130baf3adfd0429f0ee061b1d2a42ae9abd870e [formerly 5a7f51838817d2b275a59ce4913a26c4c9f494a5]
Former-commit-id: 12c08d013353ad6f235866bc9db66c9e3fddcc8b
2018-03-09 10:02:09 +01:00
Terence Tsao
663448975d vmc.go/smc.go
Former-commit-id: a56649c9e583d7c363a08dd60eb4bfe38af4096b [formerly 4fc97d45939dd7d633bfed57b20d7086ccd71197]
Former-commit-id: e4f7b2dbb738f0d2d7f1b4aa880cd6fafb93bc47
2018-03-08 22:01:48 -08:00
Terence Tsao
5bb4b56a25 fixed return statement
Former-commit-id: 72a6194db8e0586e9b4b05f16898fff1516a07a3 [formerly 4353ca90022670878d3ccaef6d6ec886d110df0e]
Former-commit-id: 3bbf849e7f2cf1c846f58f7a1d916fa1276279fc
2018-03-08 19:30:30 -08:00
Terence Tsao
aa5bb73045 fixed travis & preston's feedback
Former-commit-id: 7939967ec2b19ff2dbec2c09d027e68a7c832c32 [formerly 6f7df3d11a74ba4d20ba169cc1ddf5a72f8d28dd]
Former-commit-id: ff4c98fa06880688b7351c24260c9126ab3d1402
2018-03-08 18:05:39 -08: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