Preston Van Loon
4e7d00c361
Merge branch 'master' into fix-travis
...
Former-commit-id: 7f089d6aa2b2784d74521ee104d1a7b0ad90eccd [formerly b0550f6b6bac0e7c7de867b745fd2a1148212859]
Former-commit-id: 12eea39cf4a4421889b29f851681fa188d894267
2018-02-09 20:08:00 -05:00
Preston Van Loon
de9a14b0db
disable client test
...
Former-commit-id: 19f022ec752f75056ecca70a05fb16308951cd9f [formerly 3e68da8b40eb9e2c0bcd08b9f268c9a6ff371912]
Former-commit-id: bb56149172ba3db3df56971f3abff31b581e46ad
2018-02-09 19:37:47 -05:00
Preston Van Loon
e148927171
clean up code
...
Former-commit-id: 61bab1957ec678ccbb4c25971dda3f49e3a111d4 [formerly 5bc437ec7d168e4c62363a808a22f9f0f78e1577]
Former-commit-id: fb8e6f31b9c1baf8aede8bd3b007c84dcde2d842
2018-02-09 19:37:30 -05:00
Preston Van Loon
a92945577a
lint: remove unnecessary switch statement
...
Former-commit-id: 831551f32fcce774174ff991a3b3d83b6cda8b84 [formerly 561a47aa73d04ff60994cadb8ff149fe88ae2dc0]
Former-commit-id: da00c165621ad399486474e4298c0acff76a3779
2018-02-09 19:07:51 -05:00
Preston Van Loon
49161d6fb3
Disable distributable travis tasks
...
Former-commit-id: 1a08abffde1f2026b853cd99f30ba1d140ce853f [formerly 9c285fb06658ecaba9a201f3e1a5aea55be7b2de]
Former-commit-id: 98c1200f658248301987fe7e051348aecf820980
2018-02-09 19:06:24 -05:00
Preston Van Loon
a91ef3d516
fix typo
...
Former-commit-id: a53a87832df4bf9ade11fbc1a37fe05d23a08590 [formerly 9e485b9ee07748bcab0d0fea33f483fdd5e75845]
Former-commit-id: 7ab90df1a1a6e67952b1ee15b1398ab9a9a7fcbe
2018-02-09 18:57:25 -05:00
Preston Van Loon
b840bdb1a4
return error and clean up test
...
Former-commit-id: bd81cffdb82ce3849486b03be4bf6a3088bb2986 [formerly d808676e6c9871ad55d6576e2ef86c3ed13da22b]
Former-commit-id: 5cc96395c90c27d6b792d570b6d2f44844180110
2018-02-09 18:47:36 -05: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
Preston Van Loon
411d749b19
Merge pull request #19 from nisdas/IPCPath
...
Add IPC Path Flag to sharding client
Former-commit-id: 44474d0f4633caadcc9287aaad4aca98881d2854 [formerly be2ad87d6f8cf2d9f0011d9c397f3541c7897183]
Former-commit-id: b5093c0c63326d847f0df32177a1ef8f7fee5466
2018-02-08 10:59:28 -05: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
Preston Van Loon
b153986145
Merge pull request #22 from nisdas/genesis
...
Remove genesis.json
Former-commit-id: ef097edd1617afb2f08e0f7f5326f8a53ffb7505 [formerly e0b384cd0df368fe1f8c817b56a428121a6970b0]
Former-commit-id: 342ffbec10145a9ae82d2bb9e7e530fa75b29269
2018-02-07 19:15:10 -05:00
nisdas
675fa964a9
Deleted genesis completely
...
Former-commit-id: c7802d9801476fca780f203bc46907de2e5af0cd [formerly 5bac3df6b4fa50846a5e2e5ec828795c14ecf97a]
Former-commit-id: ca681be45ea8fff5200ad35930ae8b1d12c7e7be
2018-02-08 06:30:41 +08:00
Preston Van Loon
84ff4c5b14
Merge pull request #23 from ethereum/master
...
Upstream changes from ethereum/go-ethereum
Former-commit-id: b40212f60d4e0a11e783a362886c7db8fb9c54f9 [formerly a2112a830d4047afa18c31243c2a506f80d4de12]
Former-commit-id: 4c9a4d5662038dd26bda5d3343f231795c702b02
2018-02-07 10:27:01 -05:00
nisdas
d727b6270e
Remove Accounts
...
Former-commit-id: 35ecfe25f877c245b9495bc0e01e0ec2c76471ae [formerly 1b1bc1688ee71cd17027555353457d3704d696a3]
Former-commit-id: fc246254a27e1ea2b118290816882db50a1807e9
2018-02-07 22:55:41 +08:00
nisdas
5ed53ce510
Update Genesis
...
Former-commit-id: 0a782d19ded546d0535ba46f8039e7e2b936ce44 [formerly 0eb81b87dc40c14342cd31ae0d12b7d413d28be7]
Former-commit-id: eff374541b2eac9efac83086465c39ee1d6cbc9c
2018-02-07 22:41:40 +08:00
nisdas
573a22986e
Add IPC Path Flag to sharding client
...
Former-commit-id: 7d596e8ef95e71f7381dc27b25e1a4a2c0fa9a47 [formerly 76650eb37ce1755839ed23d8b1fe36d2dbdadffd]
Former-commit-id: b518e5a1de2615dbf5d16a819b057920df65dc60
2018-02-07 15:52:42 +08:00
Raul Jordan
887a4865d2
Merge pull request #15 from rauljordan/txpool
...
Subscribe to block headers from running geth node to propose collations
Former-commit-id: d7dc186afaab44e43436a4bfbdce9c681a147a1e [formerly a038be9a6572a3797ee2fd41f034d605ad18b9bb]
Former-commit-id: 76113ca9c383cbc115e009a3f5f9871b6d90f0b3
2018-02-07 00:07:02 -06:00
Raul Jordan
2a612de3c5
adjust all for review, create test files
...
Former-commit-id: ff13be57aab24129a97f359464fb5b8154c5a206 [formerly ff9566d3bd5653b23fc2846b26e1b07a15fdc159]
Former-commit-id: 371821f0ad0bb76640eed2199f5dc49f979d14d8
2018-02-06 17:06:47 -08:00
Raul Jordan
a092f8d19d
include latest changes with txops and everything running smoothly
...
Former-commit-id: 4367137b9310a7c7a74e569499def685c06c1c09 [formerly 3947fb77747b13e5bb61c0bfc51127a0df4f5796]
Former-commit-id: 0abf3e2beaffc399d53a1f1919a9b5a7b7512aee
2018-02-06 14:22:19 -06:00
Raul Jordan
279ca11940
wait func
...
Former-commit-id: f5c1e413d1ab851d7875830c91755556b1a38467 [formerly b687a2462ba18e2e1d3d6db7297ae9f48e904d27]
Former-commit-id: e595ef78375e736609a554101066896929f04521
2018-02-06 14:08:28 -06:00
Raul Jordan
6fe43bd446
adjust code to reviews, abstract funcs, clean up files
...
Former-commit-id: ec19a9de17ec38c54af49684426345056fa3fb07 [formerly a8533d2bcc036bde18583abc4a157d63e552ee06]
Former-commit-id: b085ecaec184ad2c2370388c2717d1e6f8a2e04f
2018-02-06 14:04:45 -06:00
Raul Jordan
a9afdd90ef
propose collation called on geteligibleproposer
...
Former-commit-id: 0a23d54aa3006d103bb7123bcfe0ac2ca3a2b027 [formerly 7266cc53ca4d6826b4a54d30391f9c5e5b0b7d10]
Former-commit-id: 6b33ca471ede8696fc83285ae426645308a4c6fe
2018-02-05 22:41:40 -06: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
ad2a5a655b
proper error handling in collator.go
...
Former-commit-id: b2b5a4602f2767dfdd8b3de3b2a9cf4994f8e2fa [formerly 1b764bc06d5d5eff79ffc197d89c3614313d7bb3]
Former-commit-id: ec5a587e262d81211ba525afaf603a89fc1916f6
2018-02-05 12:00:29 -06: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
ed6e77b24f
propose collation called if addr from sample is coinbase
...
Former-commit-id: 95d9c92597ded3ddb607370f43702122c44b5f56 [formerly f19f1fd28b1f8d44b27e054cfccf39b37110149a]
Former-commit-id: 1364ac025a86fd1b489255646efeb0b09c1c3cb0
2018-02-01 18:01:21 -06: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
Raul Jordan
ea885e97ea
get shard list programmatically
...
Former-commit-id: 17272ff42a6e802584171c230634b690168a8800 [formerly f733e0760493d8d784bd68cfba648c2ea62fdb43]
Former-commit-id: 7ebe6cf22b8193302bc1270a2fd52df21b97c136
2018-01-31 22:41:11 -06:00
Raul Jordan
319ba38250
rename to collator.go and implement the watchShards func
...
Former-commit-id: a408cce4805fab38dd0d52d8743c4d00b82133ee [formerly 01b8b29da9443a10ba632f386385e4bc9fc86a84]
Former-commit-id: a88f703397c4f0a90414b1769a499bd108dcff05
2018-01-31 22:33:38 -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
5ce2be8aeb
merged and included latest contract code and bindings
...
Former-commit-id: b661bb5ead2c16045c57a4834d6f4a1a3abb68b9 [formerly 4015afdebbfe1729ff3e87d49fd0a8741b71e5b5]
Former-commit-id: 430b7ddec633d60e591041d1e381c781174147e7
2018-01-29 13:41:21 -06: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
Fynn
b68db42854
Simplify validator's logic
...
Remove validator's code and use the transaction's signature
to verify the validator's identity
Former-commit-id: 4c30667db429a46986dd82a0ac80dbe0d64bd8be [formerly fae9ab5be5e78493a497543512a42368f52f8de1]
Former-commit-id: a8d78246d61b62d936257d2f48a8ea77c4c06792
2018-01-29 17:43:45 +01:00
Raul Jordan
db26c86f2e
add question
...
Former-commit-id: 3c7dac62cab0fe7987af3ead5c2d94d551ff201d [formerly 8b55773c96e30c3e1b54f978addc47be4e27b257]
Former-commit-id: 7866488bf1777a56d87d21c3f0f7fa670342d0a1
2018-01-28 23:54:10 -06:00
Raul Jordan
d636b84527
deposit eth into vmc
...
Former-commit-id: 3e33f6d0795ecb55081fadbc7316f1ba607cbd56 [formerly 5b90a5bfa48df92b07940173c5cf12ae449e1d28]
Former-commit-id: 2edb6c8e4a4441d3616d5a790ea6e2942687227a
2018-01-28 23:41:40 -06:00
