Commit Graph

5924 Commits

Author SHA1 Message Date
obscuren
328ee9a3ec Merge branch 'master' into develop 2014-06-29 10:44:03 +02:00
obscuren
4fc60f340f Wait for catchup when starting the miner 2014-06-29 10:43:56 +02:00
Jeffrey Wilcke
9ea3a60291 Fixed roots 2014-06-28 18:48:28 +02:00
Gav Wood
5fc3ac0e92 Simple hex test. 2014-06-28 18:40:06 +02:00
Gav Wood
edd3a00c2a Additional test for jeff. Now use the 0x... notation. 2014-06-28 18:22:18 +02:00
Jeffrey Wilcke
2eae52ebd1 Merge pull request #27 from ethersphere/bugfix/ethchain-test
transitional ethutil.ReadConfig fixes in ethchain tests (they still fail...
2014-06-28 10:22:23 +02:00
Gav Wood
5021e0dd83 VM test framework updated. 2014-06-27 21:35:26 +02:00
Gav Wood
c818d13202 Removed arrays from Trie tests JSON as per conformance guide and changed
vocabulary to match other tests.
VM test updates.
2014-06-27 18:18:24 +02:00
zelig
79009ca074 transitional ethutil.ReadConfig fixes in ethchain tests (they still fail! FIXME :) 2014-06-27 15:56:45 +01:00
obscuren
8151858e70 Merge branch 'master' of github.com-obscure:ethereum/eth-go 2014-06-27 00:17:15 +02:00
obscuren
6c7e58643c Merge branch 'develop' 2014-06-27 00:17:04 +02:00
obscuren
423beddf57 nil check 2014-06-27 00:16:49 +02:00
Jeffrey Wilcke
30f5642c62 Merge pull request #26 from ethersphere/master
bump v5.15
2014-06-27 00:11:55 +02:00
obscuren
e3ad2a3969 Merge branch 'develop' 2014-06-27 00:08:29 +02:00
obscuren
8119d77a21 :-( 2014-06-27 00:08:19 +02:00
obscuren
1b74b98f90 Check if go install succeed 2014-06-26 23:31:07 +02:00
obscuren
d57b7e8d5f Fix for installer 2014-06-26 23:25:17 +02:00
obscuren
2d274003b8 Merge branch 'develop'
Conflicts:
	install.sh
2014-06-26 23:14:50 +02:00
obscuren
52ddf044ae Initialization of Qt should happen before anything else 2014-06-26 23:14:17 +02:00
obscuren
214721ca01 update 2014-06-26 23:07:20 +02:00
obscuren
cad98dc4d5 update 2014-06-26 23:06:04 +02:00
obscuren
e46e7e7a9c Added install script 2014-06-26 23:04:46 +02:00
obscuren
bf2ac5acc5 Added install script 2014-06-26 23:01:35 +02:00
zelig
d551a75c35 bump v5.15 2014-06-26 21:20:02 +01:00
obscuren
8935a93cf8 Merge branch 'release/0.5.15' into develop 2014-06-26 19:55:19 +02:00
obscuren
9d5a3f0131 Merge branch 'release/0.5.15' 2014-06-26 19:55:14 +02:00
obscuren
42414cadaa Merge branch 'release/0.5.15' into develop 2014-06-26 19:54:23 +02:00
obscuren
3777ead25e Merge branch 'release/0.5.15' 2014-06-26 19:54:09 +02:00
obscuren
a68bfd215f bump 2014-06-26 19:54:00 +02:00
obscuren
a98e6a262a Merge branch 'develop' into release/0.5.15 2014-06-26 19:53:08 +02:00
obscuren
fd89df4d38 Merge branch 'develop' into release/0.5.15 2014-06-26 19:53:03 +02:00
obscuren
491925b71e Merge branch 'ethersphere-feature/logging' into develop 2014-06-26 19:52:31 +02:00
obscuren
91bdf9e801 Merge branch 'ethersphere-feature/logging' into develop 2014-06-26 19:52:23 +02:00
zelig
ae5ace1619 go fmt 2014-06-26 18:48:08 +01:00
zelig
853053a3b2 go fmt 2014-06-26 18:45:57 +01:00
obscuren
21e389bec5 bump 2014-06-26 19:04:57 +02:00
obscuren
b57ee87485 bump 2014-06-26 19:04:53 +02:00
obscuren
8100903d92 Increase width of asm instruction 2014-06-26 18:58:37 +02:00
zelig
da38faa8f7 merge upstream; fix port in use warning; new logger API 2014-06-26 16:37:56 +01:00
zelig
648c418fcd Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/logging 2014-06-26 16:33:40 +01:00
zelig
21d86ca486 gui stop
- introduce gui.Stop()
- remember state with open
- stopping ethereum stack is not gui concern, moved to main
- stopping mining, gui and ethereum handled via interrupt callbacks
- ^C triggers exactly the same behaviour as quit via menu
2014-06-26 16:26:14 +01:00
zelig
c0a05fcf89 log slider
- only add the gui logger after window is shown otherwise slider wont be shown
- need to silence gui logger after window closed otherwise logsystem hangs
- gui.GetLogLevelInt() extra function needed to give correcty int typecast value to gui widget that sets initial loglevel to default
2014-06-26 12:13:31 +01:00
obscuren
b89076faa2 Added amount to contract during debugging 2014-06-26 12:10:11 +02:00
zelig
2f96652bb4 interrupt handlers now ordered 2014-06-26 10:47:45 +01:00
zelig
098136b681 ethereum logs server started/stopped message 2014-06-26 10:43:02 +01:00
obscuren
0ed19d9f20 Logging, variable rearrangement 2014-06-26 11:26:42 +02:00
obscuren
39cb34850a Added instruction numbers 2014-06-26 11:25:43 +02:00
obscuren
b3367ec0e3 Added option to not break eachline 2014-06-26 10:37:48 +02:00
zelig
782f780476 space in miner logging message 2014-06-25 18:43:35 +01:00
zelig
9a06efd080 new logger API for upstream merge 2014-06-25 18:28:38 +01:00