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
415c7d8b35
Merge pull request #69 from rauljordan/diagram-changes
...
Modified Diagrams to Reflect Glossary Changes
Former-commit-id: cc808724ebbd9830acd5ef094451f35a420a3939 [formerly 9102a7bce3efa1e2540dacc6bf9a5c1a75f08da9]
Former-commit-id: c4964610a1a08da92347beefe20694776fdb75e5
2018-03-11 17:50:43 -05: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
Fynn
209b90de5f
Merge branch 'master' of https://github.com/prysmaticlabs/geth-sharding into geth-sharding
...
Former-commit-id: aa501bf02e3a6b51e13032afbd4446b2bd571cca [formerly d2e8f1db5942027e4ec73d91e254968ede32e522]
Former-commit-id: 9e017c715294441c4d73de505e918da368af0772
2018-03-09 07:52:43 +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
Nishant Das
eac3e16ca0
Merge pull request #68 from nisdas/NewGlossary
...
Changing main readme to reflect changes
Former-commit-id: b8b73f5a4e709a00753cdf70c46e41341cb7fdb4 [formerly 4f235a54e1da22de1ee62dbd8b271b137df5cecb]
Former-commit-id: bb50fe30eb30568d8e9edaca4a05689fd9d1d3ed
2018-03-09 12:32:35 +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
nisdas
d776370d09
Made requested changes
...
Former-commit-id: ed7290df37ade9d8583c13b3e25855f468654a75 [formerly 0765aed72fab9a4d4581684c86e91b40f7671258]
Former-commit-id: 90382ddef9495c412ead54e82d70d038d2f376d7
2018-03-09 10:59:12 +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
Terence Tsao
eb26043c74
updated client to collator client
...
Former-commit-id: 0e2cfdaea0b47eec04cb95343f059fb8db040a12 [formerly 24843b2fa79b9bcac2c2c6e16848c23c672b95b2]
Former-commit-id: dc5499e7a819ff6cc14fd40f4e21ac7b5b7ed7ce
2018-03-08 15:26:02 -08:00
Terence Tsao
616e5f55e3
updated cli entry pts with the latest terms
...
Former-commit-id: e54d9c64425c9337618628b567a539c9cdf8b739 [formerly 079b4d5a8f02c32b20bb8964443b9bf154dfdd28]
Former-commit-id: 43251f050a4b9acbf01af1c1cf8639b3d7099953
2018-03-08 11:18:20 -08:00
nisdas
a87eede7ea
Changed main Readme to reflect new glossary
...
Former-commit-id: 6faac5f2518b20de888edacfe108c54f1e3c5583 [formerly 9ed3730e30a12f476cca9664868140be6314e1cd]
Former-commit-id: 63c7bb684896c06f04d9933ab28b423235065015
2018-03-09 03:07:56 +08:00
Fynn
9abe5d4cb3
Explaining the canonical chain
...
Former-commit-id: 4235ab94b501110bd79d93d309feafc67cdf018b [formerly dac59e89dc4b45892597d7061c177c293e1e7fd6]
Former-commit-id: 02fc33adc6966782e1d1a8878f6d29753bf08ef7
2018-03-08 19:33:12 +01:00
Terence Tsao
a2c212ca48
/vmc/smc
...
Former-commit-id: 48617412e5359dedf11d8eed6320a77c4eebd965 [formerly af3c61fd4f2da72de165a3098e30a8d3af1bd1e1]
Former-commit-id: a4220b04c03375c41656d1a92648b4b5ad3284bf
2018-03-08 10:29:53 -08:00
Fynn
d4a3ad8f83
WIP: modify sharding readme
...
Renaming terms and other modifications
Former-commit-id: 7ecab689173dcca4f95acb081cdb29a6afd51b00 [formerly aa5a94028a459b2f9291653214aa07744e7dc820]
Former-commit-id: aa809c5b5bc1bfe1b210449512990eec452d1633
2018-03-08 19:13:55 +01:00
Terence Tsao
979f29715e
fixed one typo
...
Former-commit-id: db5dcfd6ed8fe974703468fcabd129a1938da175 [formerly 8c7abcba5a6e9dfe6fb7d012d3ba54a12b738755]
Former-commit-id: 3afb20fa51b2c191249c187431c7f7dfc2ac9274
2018-03-08 09:40:59 -08:00
Terence Tsao
a66632477b
renamed to new glossary terms for main sharding folder
...
Former-commit-id: f305383a3bb64cd9b43a14a4426197a5e82a1d37 [formerly b55ec2db5cbfddb6a2d9bfb8e079ddd05069092c]
Former-commit-id: 92e5548fae9894c18ead5dbb3a3e7645345a8378
2018-03-08 09:34:15 -08:00
Preston Van Loon
374bc76ad5
Merge pull request #47 from prestonvanloon/cleanup-1
...
Delete some TODOs
Former-commit-id: 713f9c2e19a759a6c99cd9ad5867c58e469021dd [formerly 60d85f69bd45f4afe3cb37813e2fd50f41ca7f63]
Former-commit-id: d4896bdd64a6893d5b15d9016eb99351fbdaac53
2018-03-06 23:07:13 -05:00
Raul Jordan
c8e36e15bc
Merge pull request #57 from terenc3t/remove-collator-flag
...
removing collate flag
Former-commit-id: 7de8b81aa1bfebbe767f69a8d32fb324c735ae1d [formerly a7b8135fe3d6aa1268fff183aa2ccb15d5cf8ff4]
Former-commit-id: c92c13bfeda25b394f0f380d1c9b4fbf1c847b84
2018-03-06 11:18:01 -06:00
Terence Tsao
1538aee4b8
removing collate flag
...
Former-commit-id: 2242fdca1d18d17547ddc0e55e2d2a11d5f839f6 [formerly 0b257a237d00488b571d5b60ce7dc16dc3b685ce]
Former-commit-id: 5f77c8f6274916016b052b365dfc3183b3d2d23a
2018-03-06 08:28:23 -08:00
Raul Jordan
e800548b8e
Merge pull request #56 from terenc3t/collator-cli-entrypoint
...
add cli entrypoint for sharding-collator
Former-commit-id: 14c184a9fef07a3abcded593acd390f341ee583f [formerly 27b18dd39e6118f7eb4653725e6eb000e833c5a3]
Former-commit-id: 44b4140780bb17259f1bb8d042b64e2781145f86
2018-03-06 09:40:37 -06:00
Terence Tsao
9a56a56e62
add cli entrypoint for sharding-collator
...
Former-commit-id: fbe2f866e25778d1123f7bc494b18c67c7f6db89 [formerly b4197c2938959c5c623e425a81783f33869d0666]
Former-commit-id: a3eb74969066891766a3cbea3499c7a143dd009f
2018-03-05 21:57:42 -08:00
Preston Van Loon
ae5d3f45dd
Merge pull request #55 from nisdas/shardingdoc
...
Fix errors in sharding doc
Former-commit-id: e81138dbf7afcad122676ef1a7a9e71011db9756 [formerly 422b6c92961b90980c2d950f4568634ba52eb501]
Former-commit-id: c023c8354545dcb7a4e4099de19020284773cb56
2018-03-06 00:29:51 -05:00
nisdas
81aa4bdc61
Fix errors in Doc
...
Former-commit-id: 4977a7c206a65b3abb45be17398b9aff04ec63c1 [formerly fc76150ef3412e82732afdb8ecd648781161b9b5]
Former-commit-id: 83e707bc59bf180941f16a1c8bea656f353cf50a
2018-03-06 13:18:28 +08:00
Raul Jordan
1f9f01dc3b
Merge pull request #54 from rauljordan/cli-entrypoints
...
Proposing cli entrypoint name change as sharding-validator instead of geth shard --validator
Former-commit-id: 3d66238e91490f9117b521a5d2ee0ad3842513f6 [formerly 004f5d38cdaf8cae414b8ac65892186a0a52a808]
Former-commit-id: a638c421282188c8277ab593c0aa690955bb3d2a
2018-03-05 23:01:19 -06:00
Raul Jordan
7619618b5b
Merge pull request #51 from rauljordan/documentation
...
Adding Prysmatic Labs README and Top-Level Contribution Instructions
Former-commit-id: f5490f73dd86df360ca14c3437e7c80386c33c9c [formerly 5ac54e84fcb3f9cb9f0f144757a52b270d0ca86a]
Former-commit-id: c334c4ccd17eaafddb96eb1bec50297c787f61c1
2018-03-05 23:01:01 -06:00
Raul Jordan
c94ae993cf
rm WIP from validator section in top-level README
...
Former-commit-id: 6b1b0b0ca6f63982f86122f0c2936caddc4cc0f5 [formerly 43953682bdcb6e3e19d04066b821911903dd3fd9]
Former-commit-id: b3a9b8b641e0b1990856b65727c8e3502d92ab02
2018-03-05 22:22:23 -06:00
Raul Jordan
3b1ad08f16
merge fix conflicts
...
Former-commit-id: 446daba283ac08db03039e05bc80bb3bd412c809 [formerly b6f7451abcaf9085ede193768b88d1a7d2030c80]
Former-commit-id: dbd9975edab2a234670cb4b2f233aa693533e39a
2018-03-05 22:21:50 -06:00
Raul Jordan
5baf8d9361
documentation cli entrypoint changes to reflect working versions
...
Former-commit-id: 0894f57736604a60f6fac8e770158cdb69b8b1fc [formerly f817d7211d9887ff6c637afe0616e9f0de3f0ac8]
Former-commit-id: 1d0b85df6faeadddc5b0f7859c8971cae903d0c3
2018-03-05 22:20:39 -06:00
Raul Jordan
dad1cc4b83
proposing cli name change as sharding-validator
...
Former-commit-id: 4569ef4d3b333fab68851b546661d553d4fed298 [formerly 1c79a70562b6180496da5953e20e94763fd8a24e]
Former-commit-id: 3e91b7bbb3e4d3c4e6272bc687169d1c7cfbf0cd
2018-03-05 22:17:55 -06:00
Raul Jordan
313d3d0c73
fix travis tag
...
Former-commit-id: 7ea518aafc363df9f961fc4c08294ebd59cefece [formerly 5ac628cc15c2ea2bb9daf4012b9e679888f53e85]
Former-commit-id: 6c410a5607d0a6813a8dffd09bebc277d7f34b9f
2018-03-05 21:50:27 -06:00
Raul Jordan
e1f93b7779
added wip to top of sections
...
Former-commit-id: 6b6d3fd116d9d1cf33c28f69652939f1af7c9a92 [formerly 3804d1f8fa070c9f7f3c0ad5c73e19009b90dea0]
Former-commit-id: ffdf7351f8d671275b8cc76f928ccdb14bbceb54
2018-03-05 21:49:52 -06:00
Raul Jordan
684b053a9f
addressing code review comments
...
Former-commit-id: f57ddccc6d61e57da2543111c827e7057e0bf55f [formerly 69d57a3645ff85d81a942f6603bde6fd42197d06]
Former-commit-id: 75824c7c1d5f19197f12475305e19bf89166e38e
2018-03-05 21:46:28 -06:00
Raul Jordan
c9cfb23312
rename sharding proposer cli entrypoint, add travis
...
Former-commit-id: 9ef2e52fa98e4451baf611135740c82aeb52c092 [formerly 8623b637d7c8b4cb414329dcd753e322f79bf31d]
Former-commit-id: 6305062eeaf7074ef75d779bd69f4a1c7ae8999e
2018-03-05 21:25:34 -06:00
