Commit Graph

625 Commits

Author SHA1 Message Date
obscuren 74ef489fe2 Merge branch 'release/0.5.16' into develop 2014-07-01 16:24:54 +02:00
obscuren cb595fb63c Merge branch 'release/0.5.16' 2014-07-01 16:24:35 +02:00
obscuren 5d3259587f bump 2014-07-01 16:24:34 +02:00
Jeffrey Wilcke 5e02d2b586 Merge pull request #96 from ethersphere/feature/keys
Feature/keys
2014-07-01 16:15:59 +02:00
zelig ce88a73aa6 Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/keys 2014-07-01 15:01:28 +01:00
obscuren 41a03b29ab Merge branch 'ebuchman-miner_up_to_date' into develop 2014-07-01 11:28:11 +02:00
Ethan Buchman 0ed9528d76 fix: miner wait untill UpToDate 2014-07-01 04:25:42 -04:00
zelig 098f7f23ce changed name for ethutil hex functions; and access to keyring via keyManager 2014-06-29 20:39:45 +01:00
zelig 8aea468744 gui changes
- remove lib   *EthLib, expose gui itself to initial import window
- remove addr []byte instead use dynamic adress()
- use ethereum.KeyManager to retrieve address and privateKey
- add Session string (keyRing identifier)
- add and reimplement ImportAndSetPrivKey and CreateAndSetPrivKey
2014-06-29 20:38:26 +01:00
zelig 29cc1af2bc remove ui/library; instead expose gui itself for initial window 2014-06-29 20:34:07 +01:00
zelig e43e4ff2c1 main loop uses new flags and common methods in util: db, keymanager set up; passes KeyRing/Session string to gui 2014-06-29 20:32:31 +01:00
zelig 12fbb7ae5c new command line options
- keyring: keyring/session identifier used by key manager
- keystore: choice of db/file key storage
- import message updated
- export: name of directory to export keys to (was bool)
2014-06-29 20:31:00 +01:00
zelig ce4080faa7 Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/keys 2014-06-29 18:39:31 +01:00
zelig cf7fcadeca added utility functions to set up db, keymanager, ethereum init and simplify key tasks 2014-06-29 18:39:13 +01:00
zelig 9bd67de671 remove keys file, now subsumed under ethcrypto/key_manager 2014-06-29 18:38:17 +01:00
zelig 27e1352c85 main loop uses new flags and common methods in util: db, keymanager set up 2014-06-29 18:37:22 +01:00
zelig 0ea9595d41 new command line options
- keyring: keyring/session identifier used by key manager
- keystore: choice of db/file key storage
- import message updated
- export: name of directory to export keys to (was bool)
2014-06-29 18:33:22 +01:00
zelig e38b016547 changed name for ethutil hex functions 2014-06-29 18:32:48 +01:00
zelig 2d48fc1113 fix logmessage if data directory doesn't exist 2014-06-29 13:43:27 +01:00
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
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
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 fd89df4d38 Merge branch 'develop' into release/0.5.15 2014-06-26 19:53:03 +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
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 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
obscuren b3367ec0e3 Added option to not break eachline 2014-06-26 10:37:48 +02:00
zelig 9a06efd080 new logger API for upstream merge 2014-06-25 18:28:38 +01:00
zelig 6763d28a17 repl.Stop() to only if running, fixes panic after js> exit followed by interrupt 2014-06-25 18:18:22 +01:00
zelig bf57e9603b add newline to help usage msg 2014-06-25 18:09:42 +01:00
zelig 096427c3b1 Merge remote-tracking branch 'upstream/develop' into feature/logging 2014-06-25 16:56:03 +01:00
zelig 8ee1abecb9 update log levels to include DebugDetail; correct default datadir for ethereal 2014-06-25 16:54:29 +01:00
zelig 39c0f7f386 fix logSlider: now has 5 levels, initialized to gui.GetLogLevel which is set through command line flag (defaults to InfoLevel) 2014-06-25 16:53:19 +01:00
obscuren 1268413ba7 Removed old compile methods 2014-06-25 17:26:16 +02:00