Commit Graph

8399 Commits

Author SHA1 Message Date
Preston Van Loon
200075f48c remove extra logging statement and comment
Former-commit-id: 56f2f83945769cf082032872d712f90c03977aa6 [formerly 7ad31d44fcea30fed41b387f44545bdc45adeb10]
Former-commit-id: a568c78aa5f8b19cdad699cac35ad2923a25b526
2018-01-22 07:31:38 -05:00
Raul Jordan
3e25cc8660 fix dynamic network id through json rpc
Former-commit-id: 2654b12335b4378c202ea854e27a8572ce17d20e [formerly 3ecb3593218566b84b4eec9c33d4252d4bc7681f]
Former-commit-id: ddd3b366f92b378eae94b7c37c529806391ba087
2018-01-22 07:30:06 -05: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
Raul Jordan
99068b8e5c fix dynamic network id through json rpc
Former-commit-id: 75c1f05973e1fd9cdaa86518c80b39517e0a21d3 [formerly 8279f4fa7f7ee34ad97ae332e281c89a89c5269b]
Former-commit-id: fe4066caab62419df0ca4e33fefb3539b4159335
2018-01-21 23:13:20 -06:00
Raul Jordan
da87a34718 Merge pull request #10 from rauljordan/master
change genesis to reflect new chainid and higher gas limit for vmc co…

Former-commit-id: c33968c7a561231164a5f0fa17a9392894722e72 [formerly 44a0f2e7169c1ad781378b13d0e66f78eac740fb]
Former-commit-id: 3e2904fda408ba4668e3ad933c0ece8073d43621
2018-01-21 22:52:31 -06:00
Raul Jordan
01efb9f750 change genesis to reflect new chainid and higher gas limit for vmc contract
Former-commit-id: 611b151b2bb4aa4bead8b936e81c2686652b5748 [formerly f4afae19c8e9af3ec7cce80de1bf3189e0f8cf87]
Former-commit-id: 204f6285511c642f91287375dcdfeaddec878ed4
2018-01-21 22:51:58 -06:00
Raul Jordan
fb4e9855b9 fix up genesis to reflect 12345 chainid and higher gas limit for testing purposes
Former-commit-id: 1a9405e48ba06c502a26ea34fc81631b35a38026 [formerly d81bca01442f353fa89d57a5f939921a73d712a8]
Former-commit-id: 43ffa3a326f8d88e3994cdf8ba70563c395992e4
2018-01-21 22:47:58 -06:00
Raul Jordan
014a22c8f8 fetch upstream
Former-commit-id: c9c999eabd6a11476495790e801fbddc35418302 [formerly 5e30cfb3123073eb1c965a9305d18921eb066a6d]
Former-commit-id: 6c073bd166fd9bcb337b6842406f4b5b9baf37cf
2018-01-21 21:56:18 -06:00
Fynn
435901aa74 Better abstraction to Validator Address
Former-commit-id: e49c7dfc3769f960337c4a5085b34da5c0b29cea [formerly 32bf6a45f7a21be714c4c44d9d954a878b0e22f5]
Former-commit-id: 57a34ee1f3269dd764fbff18b4af3cba5e85faf7
2018-01-21 11:10:27 +01:00
Preston Van Loon
6ffb46a90a finish lookahead period comment
Former-commit-id: e9b45d6873a17f40b3e30bcea008278fadb6d865 [formerly 31ba86dba21639e64130e2add6b9c1cce2521020]
Former-commit-id: e041f8f601cdc54fe020a15a199c382a6b0f91e5
2018-01-20 19:10:12 -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
f139cb33e2 fix deps and allow passing the datadir as the first arg like geth attach
Former-commit-id: 6d2f0e329a63a06f08927d30717fa1fef2b82d74 [formerly 31a3ce5de98f6a9fdace9f972418ce38b5e265b9]
Former-commit-id: b7caa9b86ec4c75f9fce07200358315fb0c7f85b
2018-01-20 19:03:20 -05:00
Preston Van Loon
4a89464c91 cleanup / move methods
Former-commit-id: a3948262d6acc24f0f49c245593ab1cf10bb2962 [formerly a0d5b9186ba4faa89c7dc4bdcd8ad949f641ad1b]
Former-commit-id: 0635e28b194fa4de6b7bcdb819a524ebe44f2d9c
2018-01-20 18:58:09 -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
42af6aad7d Merge branch 'master' of github.com:prysmaticlabs/geth-sharding into sharding
Former-commit-id: d97669d782a1cad9ea53c42abd83bab7fa344d6b [formerly fb526e4296e653e035f48392891581d5ceeb86aa]
Former-commit-id: e36fd3c72997fda94b1c9b7e0689b8e1e96e5b72
2018-01-20 13:40:23 -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
1061ade1f8 Working on tests for sharding client
Former-commit-id: 71665407b28bbedc5d0fdf245d157ccdb373202f [formerly e37561747705f94c22f812528eb93abffe398b1e]
Former-commit-id: d805b464fdbee525e935543dc6d252962d634ecf
2018-01-20 12:01:05 -05:00
Preston Van Loon
8754a1de31 update error messages, update VMC addr with newly created, check bytecode (not working yet)
Former-commit-id: 5740a1fd78ab3d0c2641edaa99a0ed61b7f8472c [formerly 79079ffdc3782a2f58b6678f1d22a504a1125cf8]
Former-commit-id: a048daa18190deb46d924685657dccd737cb8003
2018-01-17 21:34:03 -05:00
Fynn
a3eb8fb155 withdraw implemented
Former-commit-id: f4ec0e7067ecc9406e7b3ef56659d5924b547c87 [formerly 6720442b533ed1bc406087452e5328363f1f01b9]
Former-commit-id: e2108b302ee39b6882c3de60b3ef19449c91e32b
2018-01-17 17:22:15 +01:00
Fynn
785d99de02 RLP implementation
Former-commit-id: 1a6144cb6f46b16281b79cb999acd838a01cd110 [formerly 42f939e8c110dd9982dbb7db25ef77d64219f2c2]
Former-commit-id: a0ebe69fd061ef85e26f87c02f7e1d4029d79133
2018-01-17 17:21:54 +01:00
Preston Van Loon
fa117e853f use common.hex2bytes
Former-commit-id: 1a43b0bfd1b8eed18c8f40c955b21f58a8e0a452 [formerly 2525b2d00d20fbb9dd1bb9581a9789dae74f6d76]
Former-commit-id: 192fdb6088b0d97a2f3b9222057e65ffb46ebba9
2018-01-16 23:20:04 -05:00
Preston Van Loon
1a0dcb955a update abi and bytecode
Former-commit-id: d12c81d3c5e40a2ed59eb8f5ca2b977dfa0cff0f [formerly 3cdb4b1860ab41e6a0608a2496ea675eb5d93606]
Former-commit-id: 2cd1c66534d1fe28124c771b78ff4c6613bdedbc
2018-01-16 23:09:16 -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
0194e1cc0c Properly support datadir
Former-commit-id: 80325290698bf7099f0e46cb48af46c9c197842a [formerly c036afc211c79e1134b4e42d5b79dd309d044eb4]
Former-commit-id: c2d592d61e4dde4d762253048e07fe54ff48e0a3
2018-01-16 21:37:01 -05:00
Raul Jordan
04271a89fe sharding transaction tests
Former-commit-id: 05978a0028b27bc99cdbd2cdf8f66c78a48444be [formerly c05cd8f789a0f2a3b24b4a41eda2d6d89c33e41b]
Former-commit-id: 04955bc0a35f4932b5ff28c98393ff79d0356d4a
2018-01-16 11:56:21 -06:00
Raul Jordan
cd9febd964 new sharding tx creation
Former-commit-id: 49c7d3ec20aef302a78d0b5cca429e82e6db723a [formerly 3226861cee91b190a384b920c97d40532ca35d25]
Former-commit-id: c4edba1470e8bc5d6e7cd67c1d9f9269ae6b589e
2018-01-16 11:21:28 -06:00
Raul Jordan
ccd6c446de creates a new sharding transaction
Former-commit-id: 878a8020d1e5311d0370c33602b529f1b6f3c1eb [formerly e1b83dfed44b0774d3d9da8022d1b095c9086e16]
Former-commit-id: de36b645a3d760556152cebf7c0906cec2f08058
2018-01-16 11:16:46 -06:00
Raul Jordan
b336b6adfa sharding tx base types override
Former-commit-id: b000e066b08f84dd40c251b30f36af125e2beaa8 [formerly 918447dfb6071e7346a737de737b510fad9607df]
Former-commit-id: 821ec50c9b6149362ef3f7d3994cd23b99f0ded1
2018-01-16 10:41:00 -06:00
Raul Jordan
26778d7a35 incl blocks, transactions, and vm protocol interface overrides
Former-commit-id: 4f7ea1013da8d6daefab63a0236b14fef66b5c1a [formerly 658e8d21091332ef2e25ba61ac839ed3af98822e]
Former-commit-id: 11677ca82e862dd20e0541ef196c17ebd38af856
2018-01-15 16:53:42 -06:00
Raul Jordan
c5764e2c8b Merge pull request #7 from prysmaticlabs/raul
Raul

Former-commit-id: 66601bf9e7556210757766b521d03f840d877231 [formerly d1f7f5ffba3384abfe0882611f5128714617b398]
Former-commit-id: f5ea4817cc82f43d25b95debded388c1da33c7d8
2018-01-15 16:47:20 -06:00
Raul Jordan
e11dceeec1 rm log
Former-commit-id: 739b0ede91589652f12417eb6a1d42faf62cd41c [formerly db7ab57475fdec3ae356ac7795f6e61aaff12586]
Former-commit-id: 35c44edca4213046fd77fe4b7672ca3ee2e1bcbe
2018-01-15 16:46:07 -06:00
Raul Jordan
94368cbdd9 added README and entry point specifications
Former-commit-id: a538db47a820ea4c317ed23f2cdbc7e4e7bb737a [formerly 1499bab1308c0c25675b4b33100a29d898af57f0]
Former-commit-id: ee02769ea60fb9abcc316eb0bfa57437bc9a4614
2018-01-15 16:43:36 -06:00
Fynn
4c2180be1d WIP: Validator manager contract in solidity
Former-commit-id: 98483e7425feed46ae2a946e7d86461cbcf28d21 [formerly 334390368a91c34c1d66b0e262fcaef293cd6409]
Former-commit-id: 7f5f7dc5385c8cef6ecea39040f915554472a736
2018-01-15 23:01:24 +01:00
Preston Van Loon
92a48ed5a7 remove collation type not part of this PR/branch
Former-commit-id: 62179e39610ce42eae3f2e716c01be8a5dda1c42 [formerly cf4fe8cf7839f178f3d3d27da0b92fe1f83746a5]
Former-commit-id: 8199f36a3b617a55c1fd0ad63b79223e095b0665
2018-01-15 16:46:33 -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
21d7f3b529 merge
Former-commit-id: 048bc76c41bf9c9d617474843971140b6f57ca94 [formerly a64442dca80de64e1fadf9e77fcad8c3480c232a]
Former-commit-id: 35a6deb60998c8fe7c5394d9bc4a5a08737585bd
2018-01-15 11:57:05 -06:00
Raul Jordan
31d4fd0678 fix
Former-commit-id: 46792bf21cbfd109e0a912577c47e7c68c1fe09b [formerly 14503cf42f8cb0d70f7b09c9fdefd15a3deefaf7]
Former-commit-id: 72a23597a36b67bd2babb278132fc64807e86ea0
2018-01-15 11:56:50 -06:00
Raul Jordan
6d78659f2f Merge pull request #2 from prysmaticlabs/develop
incl sharding and readme

Former-commit-id: c31a60f6d931f1924cea700d3a660dccd771a0d5 [formerly 4ef03b7e748938ceabf425c3387b7bf2e51d4a07]
Former-commit-id: 2661dec87af1f0187b54c959f0375e81ac4a47e5
2018-01-15 11:49:44 -06:00
Raul Jordan
5442387060 incl sharding and readme
Former-commit-id: c5df26191476ac1fde46c262717d424466d21977 [formerly ed054b1fd30c24a430472ffa2be3c3ba81f1aeae]
Former-commit-id: ed346fd5eb7a50a9b7e8f0557a2245a37d56fb03
2018-01-15 11:41:27 -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
Preston Van Loon
95efe2c78d Merge branch 'master' of github.com:prysmaticlabs/geth-sharding into sharding
Former-commit-id: 4e759ee7bae40cd720f533e46fadc8593244a855 [formerly fa345b14cdec6e15c53a332e0e71663d448fdf71]
Former-commit-id: b3c2fc04a5b397e49b7239410369dc0af55e4b5d
2018-01-14 17:41:05 -05:00
Raul Jordan
13f6d24f3b Merge pull request #1 from gitter-badger/gitter-badge-1
Add a Gitter chat badge to README.md

Former-commit-id: 32668d77a6dee920182a9a2c22f74a8a40708cf3 [formerly d09f4ad03ff9b2ad8f1be986f245319d021a3cb4]
Former-commit-id: 1cfd01134be134267dec61650c68261794334612
2018-01-13 17:32:33 -05:00
Raul Jordan
e63320f199 Merge branch 'master' into gitter-badge-1
Former-commit-id: 00382a8e1f2682d4dc99fa8de81cdcce98c262cc [formerly c6d60b00dbab45372afd6d80d3e6cda54c5aeee6]
Former-commit-id: 6c367257e8e009af1387bfc0996379155bdc32da
2018-01-13 17:32:13 -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