Commit Graph

4325 Commits

Author SHA1 Message Date
Maran
07734c1e1c Merge conflicts 2014-03-17 10:42:36 +01:00
Maran
095d5baaed Merge conflicts 2014-03-17 10:41:05 +01:00
Maran
8ea7e21f64 Merge 2014-03-17 10:37:37 +01:00
Maran
3274e0a249 Removed extra invalid nonce return 2014-03-17 10:37:29 +01:00
obscuren
b15a4985e8 Moved on to the state manager 2014-03-17 10:33:03 +01:00
obscuren
85e0447684 Fixed asset path error. Fixes #29 2014-03-16 18:34:34 +01:00
Cayman Nava
13e18e1d8f working linux makefile
when building develop branch, checkout of eth-go develop branch is required
2014-03-15 16:46:10 -07:00
Maran
1c983ed80c More mining stuff 2014-03-11 15:17:23 +01:00
Maran
96fcc1da32 Initial smart-miner stuff 2014-03-10 12:38:31 +01:00
Maran
d5efeab8f9 Initial smart-miner stuff 2014-03-10 11:53:02 +01:00
obscuren
54bcee512d Merge branch 'develop' of https://github.com/jarradh/eth-go into jarradh-develop 2014-03-07 11:26:46 +01:00
obscuren
685ea3e9a9 Wip keychains 2014-03-07 11:26:35 +01:00
Jarrad Hope
694ef47041 gofmt -w ethereum.go 2014-03-07 11:11:11 +01:00
Jarrad Hope
9d887234ea Small Optimization on port 2014-03-06 19:11:38 +01:00
Jarrad Hope
e2e338929f Fix Whitespace 2014-03-06 19:03:26 +01:00
Jarrad Hope
8162aff8cf Add DNS Bootstrapping 2014-03-06 19:01:38 +01:00
obscuren
ea873304ca No longer dev 2014-03-06 13:10:39 +01:00
obscuren
f80984491a Removed comments 2014-03-06 13:09:55 +01:00
obscuren
e7770b2332 Added miner state 2014-03-06 13:06:54 +01:00
obscuren
be543a6d17 Removed comments 2014-03-06 13:03:24 +01:00
obscuren
6c6e8b0fd7 Renamed block manager to state manager 2014-03-05 10:57:32 +01:00
obscuren
fbd53f0e34 Renamed block manager to state manager 2014-03-05 10:57:14 +01:00
obscuren
79320e2868 Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop 2014-03-05 10:44:57 +01:00
obscuren
f7fb5b902c Conform to the new server model 2014-03-05 10:44:43 +01:00
obscuren
8275059856 Moved qml files, conform to the new server model.
QML files got moved to their own directories. QML now has a ui helper
which should find assets in the correct resource directory
2014-03-05 10:44:33 +01:00
obscuren
92f2abdf76 Partially refactored server/txpool/block manager/block chain
The Ethereum structure now complies to a EthManager interface which is
being used by the tx pool, block manager and block chain in order to
gain access to each other. It's become simpeler.
TODO: BlockManager => StateManager
2014-03-05 10:42:51 +01:00
Jeffrey Wilcke
c1de7bcec5 Merge pull request #10 from mquandalle/patch-1
Rename .travil.yml to .travis.yml
2014-03-04 11:28:01 +01:00
Maxime Quandalle
8577e9116e Rename .travil.yml to .travis.yml 2014-03-03 18:13:08 +01:00
obscuren
5b1613d65b Merge branch 'master' into develop 2014-03-03 11:35:35 +01:00
obscuren
c1d0ea7366 Updated protocol version to 7 2014-03-03 11:34:04 +01:00
obscuren
833a1a4eab Block mining log 2014-03-03 11:32:58 +01:00
obscuren
9d492b0509 Renamed Address to Account 2014-03-03 11:05:12 +01:00
obscuren
bfed1c7cac Trie's are no longer referenced directly but through State instead 2014-03-03 11:03:16 +01:00
obscuren
d2bc57cd34 PoC reactor pattern 2014-03-03 00:55:10 +01:00
obscuren
3d2c3b0107 Using asset path helper (includes a debug path atm) 2014-03-03 00:54:41 +01:00
obscuren
a482b0cc1b WIP Makefile 2014-03-03 00:54:05 +01:00
obscuren
00533003b7 Get rid of the xpm files 2014-03-03 00:53:24 +01:00
obscuren
b0be847416 Updated to use the state on the blocks 2014-03-03 00:53:10 +01:00
obscuren
d65b4cd0dd Updated block to use state instead of trie directly 2014-03-02 20:42:05 +01:00
obscuren
f1b354e6aa Reactor implemented 2014-03-02 02:22:20 +01:00
obscuren
570ab249b3 Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop 2014-03-01 19:53:24 +01:00
Jeffrey Wilcke
c6d6ca283d Update README.md 2014-02-28 17:04:45 +01:00
Jeffrey Wilcke
30c5922aa4 Update README.md 2014-02-28 17:02:38 +01:00
Jeffrey Wilcke
59a68b316f Update README.md 2014-02-28 17:02:24 +01:00
Jeffrey Wilcke
893da20ead Merge pull request #21 from jarradh/master
Search bin directory for qml
2014-02-28 16:46:34 +01:00
obscuren
d7c5936ac4 Merge branch 'hotfix/0.3.1' into develop 2014-02-28 16:46:12 +01:00
obscuren
ceada15290 Merge branch 'hotfix/0.3.1' 2014-02-28 16:45:54 +01:00
obscuren
b462ca4aad Bump 2014-02-28 16:45:46 +01:00
obscuren
601340bd46 Fixed shutting down 2014-02-28 16:45:29 +01:00
Jarrad Hope
aa7c53b7ef Search bin directory for qml 2014-02-28 16:41:30 +01:00