Commit Graph

1204 Commits

Author SHA1 Message Date
obscuren
114e715e3c Merge branch 'ethersphere-feature/keys' into develop 2014-07-01 13:48:28 +02:00
obscuren
253c23240b Merge branch 'feature/keys' of https://github.com/ethersphere/go-ethereum into ethersphere-feature/keys
Conflicts:
	.gitignore
	README.md
2014-07-01 13:45:39 +02:00
obscuren
0ce9003ba7 Fix for creating a tx from an unknown account 2014-07-01 12:16:14 +02:00
obscuren
2bbc204328 Close pow chat. Fixes #95 2014-07-01 11:55:50 +02:00
obscuren
92693e4459 The dragon has been slain. Consensus reached! 2014-07-01 11:26:45 +02:00
obscuren
39263b674c Paranoia 2014-07-01 09:56:10 +02:00
obscuren
5f5910c603 Regression test for trie 2014-07-01 09:55:20 +02:00
obscuren
ed276cd7c2 Added Paranoia check for VM execution 2014-06-30 20:03:31 +02:00
obscuren
82272ee08a Iterator fix 2014-06-30 14:28:54 +02:00
obscuren
9ed0d389b2 Generic trie 2014-06-30 13:34:47 +02:00
obscuren
00bb68d7d2 Merge branch 'develop' into interop 2014-06-30 13:13:55 +02:00
obscuren
c23074d5ad Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop 2014-06-30 13:13:45 +02:00
obscuren
8ddd4c4c52 wip 2014-06-30 13:09:04 +02:00
obscuren
5a86892ecb Using remote for test cases 2014-06-30 13:08:00 +02: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
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
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