Terence Tsao
2732187e64
sharding: file name changes
...
Former-commit-id: add615ca3874397fc04d935b15d0913dcd2b4e18 [formerly 32f4e81a98e3084c1a9c7d277862a04f541f4cbb]
Former-commit-id: 63a1630e1f679a7a341d0194c16c9cf9d11cc342
2018-04-26 15:44:34 -07:00
Terence Tsao
791576b204
sharding: \collator\notary\ on all files
...
Former-commit-id: 859723690bc327d7df9ffdd8f7ae247c05e1e1bf [formerly e2603e530217645b3f1fa180613ba27dca74e2f3]
Former-commit-id: c812bd611996a0a8a344064199163aa709ee3f24
2018-04-26 11:10:31 -07:00
Raul Jordan
fabb563468
Merge pull request #91 from terenc3t/config
...
Align sharding config with minimal sharding protocol
Former-commit-id: de8ca6974d4afd55f7acb2478594f6787319691b [formerly ea8642aa2aeae238ade6329352777761d624c667]
Former-commit-id: 62470999ad55ed30f1e2db79fa907848b59edb2d
2018-04-23 15:25:49 -05:00
Raul Jordan
4f5404c552
Merge pull request #90 from terenc3t/collation-header
...
Align collation header with minimal sharding protocol
Former-commit-id: c5b6c8c04d537a5a6d41c27562a477b88dc25dd8 [formerly bed47e36747ae7a3b1f95ec4dce1cb6f8cb4b09b]
Former-commit-id: 0814bd14e96fcc607a9b4f4a2e93ace248bcebf0
2018-04-23 15:24:22 -05:00
Terence Tsao
495f6ea312
sharding: removed parentHash
...
Former-commit-id: abb7faaf16e79105b301f412f293776aef1352dd [formerly d59d6bea68aa80bb0aa79e3bf6d23de1d6596f8f]
Former-commit-id: b4b2e2a45661b9268117b91b8ad8c0386611ab93
2018-04-23 11:52:24 -07:00
Terence Tsao
b91567e961
sharding: collator -> notary
...
Former-commit-id: cbe92076bf961b4a506e8acda66ba0e5abecfae8 [formerly 6f7b1551946be0351fc1983d8fd431cfaabaff24]
Former-commit-id: 78619799ac7d64dd00e32e7d3020d361546dca93
2018-04-23 11:42:08 -07:00
Terence Tsao
c2a80b6a65
sharding: add parentHash back
...
Former-commit-id: 125c45ffa41de11f00a55854bea39d3b1057eaa4 [formerly e192b92393f26d84afdc1243e802cb3feb6479b4]
Former-commit-id: 5c3d9063f31b312c362074937dc6fbc1192c97fa
2018-04-23 11:34:12 -07:00
Terence Tsao
6d1604f482
sharding: added proposer address back
...
Former-commit-id: 12ab8ef26946cba413232622e830b31075bfb68c [formerly 50b00ce9998cbcceef4ff8c815dc7a87e491aff6]
Former-commit-id: ceb37809573d83161cc69929f6c9c54bb1acd60f
2018-04-12 09:38:52 -07:00
Terence Tsao
f5e3c1c6b9
sharding: align sharding config with minimal sharding protocol
...
Former-commit-id: bd55dd6746c11c47f8744ca3b2e59c04ad07bb0f [formerly c9b46314489a2e53df4926557fe80075a89ec4e3]
Former-commit-id: 149bf1150a922005b33cb91b622aaef05569f160
2018-04-11 08:13:53 -07:00
Terence Tsao
19665aca8b
sharding: align collation header to minimal sharding protocol
...
Former-commit-id: 1c630baa8d0cb0602dbbd4073998d78e2be6502f [formerly 236e508800ed9dbcacdf6fdf3375e538294b356e]
Former-commit-id: 00f8ddf9246d3378279325e53824c1f451a2c11f
2018-04-11 07:45:24 -07:00
Preston Van Loon
6618c12ef7
Merge branch 'master' of github.com:ethereum/go-ethereum
...
Former-commit-id: 64a62da53a5878450d6115fbc7fec6eeb70c7c2c [formerly 2a2a46b57a6a62b13689578cfcd33c8b8bf0529f]
Former-commit-id: 58cdafb64755ab12a765d2156a8eab468989f3a4
2018-04-06 20:06:43 -04:00
Preston Van Loon
589689cf7d
Merge pull request #87 from prestonvanloon/testing
...
Collator: add test for joinCollatorPool
Former-commit-id: a940a35422146888ecef0bc28be9dc03e71c806c [formerly abc8304b100c85da43549a04950fe1f7d7c6c3d1]
Former-commit-id: 1e94cffb64714dcea14a103737e640a28f949887
2018-04-03 19:41:09 -04: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
Preston Van Loon
8d01b0518a
sharding: s/CreateTXOps/CreateTXOpts/g
...
Former-commit-id: 72f0620c7de05caf26bc6316b886d7ee063b45aa [formerly 7adad0ddfad8bc2555579a1bf5bdf46bb8d575ec]
Former-commit-id: 127e5f89dd4fda27f84bf626c30de86551392bab
2018-04-02 22:26:29 -04:00
Preston Van Loon
b7cdcfada5
sharding: added test for joinCollatorPool
...
Former-commit-id: 74e19dce8affd194f5fd6ccc10d22f2b295b6daf [formerly a6f2e6d2b5fd10c217214715ea405dac816df945]
Former-commit-id: 535445ac986ebc4bb4da1aaca2956c0bf5f192f5
2018-04-02 22:25:26 -04:00
Preston Van Loon
34653d4421
Merge pull request #86 from terenc3t/phase1-config
...
sharding: align config with phase 1 spec
Former-commit-id: 245fdf3b1c5a4373d85a15ed4209019550048b5f [formerly 5a1a835e491a7551c4a3d1a4614cc1f24e0e222a]
Former-commit-id: d5fcf87f42d798afa300f7bdba5b284414edb1dc
2018-04-02 21:52:52 -04: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
33b8f07b02
Merge pull request #85 from prestonvanloon/refactoring
...
Refactoring sharding package for proposer/client separation
Former-commit-id: c7a28a1abc8886d15a20880ecba9c7b67633c323 [formerly 976701722f86bf1ac160fd6bfb9e207ddddfde2b]
Former-commit-id: 1a341f77b8b142ad614b00eac16eca328495bafb
2018-04-01 17:06:00 -04: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
Raul Jordan
6e52ea2a46
fix typo
...
Former-commit-id: 0527546ad5f116fd645d40f573270469f869787c [formerly fd4bc33aa4b3c6a546862ab1d339984199124943]
Former-commit-id: de0f81e9cb3ce0007b7c9a1435d8716a8d53bb04
2018-03-30 16:41:58 +09: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
Enrique Fynn
f2d677360a
Merge pull request #77 from enriquefynn/geth-sharding
...
sync with upstream
Former-commit-id: 07c242df797578a156809b8607f1ff805961174a [formerly 61b508c927752faf11882d0c21431ea3b0b57060]
Former-commit-id: 7fbd5ff5b2c6d768edef053bb5b89f3790f50e4a
2018-03-24 18:34:42 +01:00
Fynn
8ad2c66784
revert commit on abi.go
...
Former-commit-id: 674e5d0d5c775a7aadf7722ddc3f1348b01cd713 [formerly cdfb7fae04ddb608566a0716f43062d26616a293]
Former-commit-id: 0032a4d6775f6a843cd7531db201c4ae75a7e39d
2018-03-24 17:18: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
