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 
							
						 
					 
					
						
						
							
						
						29f613ef84 
					 
					
						
						
							
							Merge pull request  #28  from ethersphere/feature/keys  
						
						... 
						
						
						
						Feature/keys 
						
						
							
						
					 
					
						2014-07-01 16:16:05 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
							
						
						5e02d2b586 
					 
					
						
						
							
							Merge pull request  #96  from ethersphere/feature/keys  
						
						... 
						
						
						
						Feature/keys 
						
						
							
						
					 
					
						2014-07-01 16:15:59 +02:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						ff5703fd9b 
					 
					
						
						
							
							ethutil -> ethtrie.NewTrie  
						
						
						
						
							
						
					 
					
						2014-07-01 15:09:43 +01:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						89630d2826 
					 
					
						
						
							
							merge upstream  
						
						
						
						
							
						
					 
					
						2014-07-01 15:03:02 +01:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						ce88a73aa6 
					 
					
						
						
							
							Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/keys  
						
						
						
						
							
						
					 
					
						2014-07-01 15:01:28 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						550407b0ec 
					 
					
						
						
							
							Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop  
						
						
						
						
							
						
					 
					
						2014-07-01 15:44:43 +02:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						d0959063d5 
					 
					
						
						
							
							Up  
						
						
						
						
							
						
					 
					
						2014-07-01 15:28:12 +02:00 
						 
				 
			
				
					
						
							
							
								Maran 
							
						 
					 
					
						
						
							
						
						d294dedfad 
					 
					
						
						
							
							Merge branch 'develop' of github.com:ethereum/eth-go into develop  
						
						
						
						
							
						
					 
					
						2014-07-01 15:26:18 +02:00 
						 
				 
			
				
					
						
							
							
								Maran 
							
						 
					 
					
						
						
							
						
						e798294a4b 
					 
					
						
						
							
							Update min GasLimit  
						
						
						
						
							
						
					 
					
						2014-07-01 15:25:57 +02:00 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						41a03b29ab 
					 
					
						
						
							
							Merge branch 'ebuchman-miner_up_to_date' into develop  
						
						
						
						
							
						
					 
					
						2014-07-01 11:28:11 +02:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						92693e4459 
					 
					
						
						
							
							The dragon has been slain. Consensus reached!  
						
						
						
						
							
						
					 
					
						2014-07-01 11:26:45 +02:00 
						 
				 
			
				
					
						
							
							
								Ethan Buchman 
							
						 
					 
					
						
						
							
						
						0ed9528d76 
					 
					
						
						
							
							fix: miner wait untill UpToDate  
						
						
						
						
							
						
					 
					
						2014-07-01 04:25:42 -04: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 
							
						 
					 
					
						
						
							
						
						12972b4b65 
					 
					
						
						
							
							DBKeyStore.Load returns no error if keyring not found in db  
						
						
						
						
							
						
					 
					
						2014-06-29 20:53:26 +01: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 
							
						 
					 
					
						
						
							
						
						2920795168 
					 
					
						
						
							
							using keyPair.Mnemonic() in file key store Save method  
						
						
						
						
							
						
					 
					
						2014-06-29 20:28:54 +01:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						25314313f8 
					 
					
						
						
							
							added Mnemonic() and AsStrings() methods, added memoization for address  
						
						
						
						
							
						
					 
					
						2014-06-29 20:28:04 +01:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						a8be0d9f48 
					 
					
						
						
							
							add InitFromString method to be used in gui  
						
						
						
						
							
						
					 
					
						2014-06-29 20:26:55 +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 
							
						 
					 
					
						
						
							
						
						dabaa4cce0 
					 
					
						
						
							
							change all modified calls to ethtrie, ethutil and ethcrypto functions  
						
						
						
						
							
						
					 
					
						2014-06-29 18:30:05 +01:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						707d413761 
					 
					
						
						
							
							refactor ethutil/trie to ethtrie  
						
						
						
						
							
						
					 
					
						2014-06-29 16:26:58 +01:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						4be3521727 
					 
					
						
						
							
							import math/big  
						
						
						
						
							
						
					 
					
						2014-06-29 16:17:33 +01:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						e3b911652d 
					 
					
						
						
							
							move CreateAddress from ethutil/common to ethcrypto  
						
						
						
						
							
						
					 
					
						2014-06-29 16:08:33 +01:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						5e50b50dc3 
					 
					
						
						
							
							no strconv import needed  
						
						
						
						
							
						
					 
					
						2014-06-29 16:06:54 +01:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						772e7e8c8d 
					 
					
						
						
							
							Key Manager  
						
						... 
						
						
						
						- keypair, keyring:
-- consistent naming of methods
-- error propagation
-- no panic
- keyManager: persist, import, export, initialize and (re)set keyring
- no global public "singleton" keyring, instead interface via keyManager
- keys test
- KeyStore interface, DB and File store implementations 
						
						
							
						
					 
					
						2014-06-29 16:02:23 +01:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						e1ea41ee9c 
					 
					
						
						
							
							remove ethutil helpers (refactored), and keypair (key management under ethcrypto package)  
						
						
						
						
							
						
					 
					
						2014-06-29 16:01:57 +01:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						d87857ffdb 
					 
					
						
						
							
							config Pubkey removed (unused)  
						
						
						
						
							
						
					 
					
						2014-06-29 15:59:57 +01:00