Terence Tsao
9f791f20a1
sharding: merge with master
...
Former-commit-id: e48146fdad0808ff828bf53a039ee9cffba0b9a4 [formerly 4c6b0a3d19a582949b1542837c6132768df86da7]
Former-commit-id: 4a83a6533243b5d7afa24767777164e18defd7af
2018-04-27 17:23:42 -07:00
Terence Tsao
84389b219b
sharding: fixed return bool for functions in sol
...
Former-commit-id: 33624e189e073aa862f2e33f8fd5ebea919d6368 [formerly c7c40d11c99abd923eeee641866e73ea26d7ca13]
Former-commit-id: 7d307bc09f0f46d31be20560879954eb8b2a9215
2018-04-27 16:38:24 -07:00
Terence Tsao
f308706680
sharding: \notarys\notaries
...
Former-commit-id: 7eb970515405983d0d0d8f805fdff5c5a3317f93 [formerly 664a9e0acbccebda143006e8063389884efae880]
Former-commit-id: 61c048015002bf92da708f80365dfc38d11671ef
2018-04-27 14:14:55 -07:00
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
Terence Tsao
150f0ae58d
sharding: latest round of feedback
...
Former-commit-id: e37429c965bb98a0155f85351f76e0db2d0e2a07 [formerly 1d3ad1e172e1d0a80c66a2bd44a8fac7414d439a]
Former-commit-id: addf37b75b2c9952da0274bbb57df27b096455fb
2018-04-24 21:55:32 -07:00
Terence Tsao
4e45d1882c
sharding: fixed lint
...
Former-commit-id: cecf8e888992de3583c222e98f1e3e4c26c48924 [formerly 67381715d66b4a512d9e884a257ab0609fd81d33]
Former-commit-id: 66fa59bb52e8343843f10247d668e2b3fe8c892f
2018-04-24 11:22:55 -07:00
Terence Tsao
0b7df21505
sharding: fixed lint
...
Former-commit-id: a333578841a9058f1e7f298970fb1460ac5eefe1 [formerly 4dcb80be36a3d4d59e0c950e318ae277c792a725]
Former-commit-id: 576570909a92d0858cae2fa2fd8f6bf7088f06f8
2018-04-24 10:18:45 -07:00
Terence Tsao
08325ed7d4
sharding: abi name changes fixed other packages
...
Former-commit-id: eeb039b0e54b958cd64174495c8632ca66e240d1 [formerly dc0fb2653ee915b4033d3ed8cca10a4204ae7de8]
Former-commit-id: b138547efd51ac985ff7c759eea5d288149b460a
2018-04-24 09:01:16 -07:00
Terence Tsao
b923b9e101
sharding: feedback changes
...
Former-commit-id: 3251e6a3a13984b154dfb82ffae68ec214177829 [formerly 0bc330ae3445a0d88d014afa412dd4e21bdb5208]
Former-commit-id: 3c3938127ccc1f56ced09496038fa0d72ed32ae7
2018-04-24 08:47:08 -07:00
Terence Tsao
f32a80a911
sharding: added tests for sampling committees
...
Former-commit-id: abdaf09b36f79ea6dc90d2a1d6390b20fb1f2420 [formerly cd0aac8794f2c51e19bd839c0c04bdf4103731a4]
Former-commit-id: 9a53826157411039ec2fad9adefd8623147b6725
2018-04-23 22:02:37 -07:00
Terence Tsao
c8b0b8034d
Merge branch 'master' into smc_phase1.1
...
Former-commit-id: 6a8504f2b14443bfd6457716b739084b319ec971 [formerly 51429ea2436a7b56a075f1d1590e08545b7a8669]
Former-commit-id: f2f7b4f5f2d3490436f34a3cb386e8c1f50f799c
2018-04-23 17:56:07 -07:00
Terence Tsao
eb3f491cf8
sharding: added notary tests for degistration and release
...
Former-commit-id: 2c76a184836468e95f5893fcd736420e89769e37 [formerly 01c871c359c0cf74866c9c5738f1574d89610c9c]
Former-commit-id: 49a841231ed673421fca98d9bb54876b1e271ce0
2018-04-23 16:18:07 -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
Raul Jordan
d5ff23380e
sharding: update documentation for minimal sharding protocol
...
Former-commit-id: 24aecf98f904e0e517377f86a22a9c1efe4adb18 [formerly b332c7e0d3d5e46423b94278a7eda970a0a395aa]
Former-commit-id: 42be6cc789c0c00aa92cdffc5da586ae100b4434
2018-04-23 08:36:09 -07:00
Terence Tsao
8a10e4efa2
sharding: added test cases for registering notary
...
Former-commit-id: dad6acfd8273a5fce14a635999c145776727a50b [formerly 3d88c2eca4e930e07d76c2d28b2122408eb9b734]
Former-commit-id: ea652d4701ba898e007604d9c1e1ae6c94949072
2018-04-21 16:57:13 -07:00
Terence Tsao
0d9523dcd4
sharding: fixed notary sample function
...
Former-commit-id: 608025faad454e517fd144759886e04113805907 [formerly 5b753cdef5fc3f4f4f585e972ba624a42d21c672]
Former-commit-id: 8125d538d91209971860ed637b456ff07dff8151
2018-04-20 16:14:16 -07:00
Terence Tsao
b54a20281e
sharding: fixed notary tests
...
Former-commit-id: 9ba590940143b0de2068c8dfe4233d221d8148dc [formerly b6cefd256e5f0d2db0f8284932ada4a5e4804212]
Former-commit-id: 4aa404a5fd760990ecc4414360e7b02c068a882a
2018-04-20 15:08:52 -07:00
Terence Tsao
d45e45f543
sharding: functions descriptions
...
Former-commit-id: ea79f98f18b2f001c8b0c9579926d7c2de4e45c8 [formerly 2bafc5faedc0dba69799629bd55d17683e06a583]
Former-commit-id: 609f9f31e1b6cebb515300f5c8672c15ae2003c1
2018-04-19 23:41:52 -07:00
Terence Tsao
9d2be9f867
sharding: fixed lint messages
...
Former-commit-id: a79631df65076e8ffd6ab2cd6265a1411456356f [formerly 5f02c7f2b7f50b230e9a434a50d2d569770806ab]
Former-commit-id: 2fd87aa767d8efbefdf54cdc08f49cbea0dd5b6f
2018-04-19 16:47:38 -07:00
Terence Tsao
dfc0ca55cb
sharding: proposer is irrelevant for spec 1.1
...
Former-commit-id: ea7d8068b76b367e99948542e0153afc3e906d5d [formerly 80249c257922b26a0908aea044eee004acdd5bc9]
Former-commit-id: 4483c490a8eb3f1f3eae22ad6574ce132e353b13
2018-04-19 14:59:13 -07:00
Terence Tsao
5e2b6274a7
sharding: fixed naming styles
...
Former-commit-id: 4e50f1f8edc38d24b265e540c060a4c0bbf52052 [formerly df906e85f5ab5fb27afce1569a4f2992a7169527]
Former-commit-id: 5fd3454d63cd3fb05288a413bb78d887eeac08c9
2018-04-19 14:59:04 -07:00
Terence Tsao
b5e77c3867
sharding: cleaned up comments in code
...
Former-commit-id: e733ef576dfa5ab1165bea1bf2c1502c01de0ebd [formerly 9694cff89a1bc823e3f069f40564947715475c11]
Former-commit-id: 3a7109e6f02ec648390f2f6364e71ebb288b5bd9
2018-04-19 14:58:49 -07:00
Terence Tsao
7107f8fa2b
sharding: function to check notary in committee
...
Former-commit-id: d46016ebd3bacbb50cbc03084054ce21c9ac9d81 [formerly 6a95cdcdc60bb4dc6a359735f618ed765553095a]
Former-commit-id: 3db9a81c0d2995ff474b3c10b3b87f8f3432a495
2018-04-18 17:46:41 -07:00
Terence Tsao
ce9a724556
sharding: monitoring notary size at current period and make adjustment next period
...
Former-commit-id: 3a40788c3dad272570980e426c751a9431908a0a [formerly 6149e9eae68a5e7e6f6b87adeafa6467582caeeb]
Former-commit-id: 175c0d263e3a5486cc583640f819c8c1d77adff0
2018-04-18 13:51:31 -07:00
Terence Tsao
4bfa96219f
sharding: fixed up on notary's register, deregister, release functions
...
Former-commit-id: c59f4274aa31f240a8b41f86d36de38782b1998b [formerly f7bc669d44adb550e2902d8ff8f210eb30630aed]
Former-commit-id: 8214f75adeef0c8316bd2fbdee648548a96b91ad
2018-04-18 11:26:09 -07:00
Terence Tsao
ddc67976fe
sharding: /collator/noatry and align constants w/ phase 1.1 spec
...
Former-commit-id: eefbc5f230aea78eb30adc8bb09f7ce7a5844043 [formerly dc9a760f78d3a4d356e9f9d6ccf8b39129ce756f]
Former-commit-id: cff011989f46e2235e700bd84278043038014367
2018-04-18 11:04:11 -07:00
Terence Tsao
2450f14971
Merge branch 'smc_phase1' of https://github.com/enriquefynn/go-ethereum into smc_phase1.1
...
Former-commit-id: 514310116906d0e4531bd714d4b38256f6da8f3f [formerly e68690130b4d0f0547c168b3ccff41c012669f96]
Former-commit-id: 601235a7b4929b74faadd5e237017c7da5e1eea5
2018-04-18 09:56:10 -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
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
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
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
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
