Commit Graph

19 Commits

Author SHA1 Message Date
Preston Van Loon
276f6c739b gofmt shardingcmd.go
Former-commit-id: ae3114325198530646bd0b377cce4fd68c33ec13 [formerly 1c646da464b0dbb3fcdeb49cea6d7c6678135ae6]
Former-commit-id: a1a98cd93b882f10dd212885b0f327cf5a44935c
2018-02-09 20:09: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
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
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
279ca11940 wait func
Former-commit-id: f5c1e413d1ab851d7875830c91755556b1a38467 [formerly b687a2462ba18e2e1d3d6db7297ae9f48e904d27]
Former-commit-id: e595ef78375e736609a554101066896929f04521
2018-02-06 14:08:28 -06:00
Preston Van Loon
dbbd510e87 Merge branch 'master' of github.com:ethereum/go-ethereum into sharding
Former-commit-id: 67bbf74c5d56eb00019897556e98cb601f9bfa15 [formerly 499490a5fc98e3a41b409067c5f24d1ccc740976]
Former-commit-id: 725e6eecda7e624b7f0341582a26a6492fa6cc0f
2018-01-22 07:25:11 -05:00
Preston Van Loon
ad2384c6f6 Add a basic command description
Former-commit-id: 6576abbb33b8c01be58ebc1da7242328dd1d94a1 [formerly e5cfd3298f1fc8ba706e5a8575c69e7b17fcb6e2]
Former-commit-id: 9effda921bce995454aa815698b131a1de2c8c3d
2018-01-20 19:07:41 -05:00
Preston Van Loon
167cdf7914 Add sharding alias
Former-commit-id: d733b0990ea46cbcdd321599be7448f085388fbc [formerly a68721a6073690fd578e26fb1a83f0dc46837836]
Former-commit-id: 2381d5d021b641023aede79f77c446254b954d17
2018-01-20 18:45:40 -05:00
Preston Van Loon
9ba9274ea5 Use network id from command line
Former-commit-id: 78c94954b281ba8b12802e7b54c0d1ceeda36a30 [formerly 907fdb09efcd3b4cc31aee5d9a2e354dfb84e093]
Former-commit-id: a9e66d5a14df26edbb4e2eedc1416e29284677cc
2018-01-20 12:17:59 -05:00
Preston Van Loon
f877297737 using password file, some method comments, working getCode for contract
Former-commit-id: 087f9d471291ba6361c8d8e905935227849d57ea [formerly 79568804120e8aa8914977967e3233ba5397b26c]
Former-commit-id: aeabcb2d2ca2622defd3f04420cde73df42be53f
2018-01-16 22:59:35 -05:00
Preston Van Loon
2315677271 Merge branch 'master' of github.com:prysmaticlabs/geth-sharding into sharding
Former-commit-id: 9f8c0926411a1f11d0f7c438065a2034d3fc2198 [formerly ebe0e4bedb9c2f92c386e2d52faccdcfb858c8f6]
Former-commit-id: f07aba40e5272616287b078b0ac61046201c70e0
2018-01-15 16:40:35 -05:00
Preston Van Loon
7e09ed395b contract deploy somewhat working
Former-commit-id: 2bccce337d29f12b7a96d5d79be6528c1ddfe6e6 [formerly 853da49db264a445f955c21294909909c59b56f7]
Former-commit-id: d67aece06f67fc24d0a7036646ded876218ce84f
2018-01-15 16:39:00 -05:00
Raul Jordan
31d4fd0678 fix
Former-commit-id: 46792bf21cbfd109e0a912577c47e7c68c1fe09b [formerly 14503cf42f8cb0d70f7b09c9fdefd15a3deefaf7]
Former-commit-id: 72a23597a36b67bd2babb278132fc64807e86ea0
2018-01-15 11:56:50 -06:00
Preston Van Loon
50e92a018e add test boilerplate for sharding client
Former-commit-id: 7cbd81db9421e1517ad92829a2dbbdfcf5f38699 [formerly 76607161435699e18a970c82f9838d20e94f04d7]
Former-commit-id: f6db97246aa70eda35e59a2a05fa55316289bd76
2018-01-14 21:59:51 -05:00
Preston Van Loon
9b6f224f83 working on sharding entrypoint
Former-commit-id: 50c0ab4bad92d27bf980e83e64088940544e94c2 [formerly 5dbfb91e925f14a743390f7da6bb2db1a30371db]
Former-commit-id: 66fb852ec273f74baaaf25b5a80987ac284c56ee
2018-01-14 19:10:02 -05:00
Raul Jordan
da20785685 Merge branch 'master' into gitter-badge-1
Former-commit-id: 23f542f43b4b493e38f5aa4c29788ed93a63b43b [formerly 71b23a6a28eb045fcfeab6329de69f1e5455486b]
Former-commit-id: d12b3a6decc876f010a71f98e11df7387c1aaf2a
2018-01-13 17:31:28 -05:00
Preston Van Loon
a41e372b39 First pass collation
Former-commit-id: fa0dc873367b92a06b10fd989e3fec960c03065a [formerly e98efffa565ea6aa3eadeb19c2f9a66a56eb5ddd]
Former-commit-id: ce6e4f01d12015e67a51aa7d928a6ab8e8eedeee
2018-01-12 22:59:17 -05:00
The Gitter Badger
f0d28b9a86 Add Gitter badge
Former-commit-id: 149baffe14f39f06a11819bad8cb5f8c39eb7219 [formerly 8af027a6cf4200c6f9eff6ebe309842699b1f896]
Former-commit-id: 7b136b3c018049f368d8d3ce437e56d4ca8623d7
2018-01-11 21:42:34 +00:00
Fynn
8bf9cd853f FreeBSD support
Former-commit-id: ff5dba816571945e8c0837f3ef52485da5fd7314 [formerly 2f23f618fd8f01331b593ab4e064138047fe7c77]
Former-commit-id: 1ec5e7440481e307be5e131ac0a416fd7d2fea9f
2015-07-28 19:16:16 -03:00