zelig 
							
						 
					 
					
						
						
							
						
						b6aa88c099 
					 
					
						
						
							
							private network support  
						
						... 
						
						
						
						- protocolversion, networkid global int flags to cli and mist
- fix bug with protocolversion check using wrong db
- log protocolversion & networkid in backend 
						
						
					 
					
						2015-03-18 14:44:58 +07:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						5e7702fd05 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/develop' into frontier/js  
						
						... 
						
						
						
						Conflicts:
	cmd/ethereum/js.go
	javascript/types.go 
						
						
					 
					
						2015-03-16 22:46:29 +07:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						b523441361 
					 
					
						
						
							
							Moved ethutil => common  
						
						
						
						
					 
					
						2015-03-16 11:27:38 +01:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						7279a485c2 
					 
					
						
						
							
							CLI:  
						
						... 
						
						
						
						- js subcommand for vm
- console for Frontier console interactive REPL
- jspath in cli
- integrate jeth apiBindings 
						
						
					 
					
						2015-03-15 13:31:40 +07:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						d9966d6158 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2015-03-14 23:37:21 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						58d9d98daf 
					 
					
						
						
							
							cmd/utils: GetEthereum -> MakeEthConfig  
						
						... 
						
						
						
						This allows changing the config before starting Ethereum
with it. 
						
						
					 
					
						2015-03-13 18:41:09 +01:00 
						 
				 
			
				
					
						
							
							
								Taylor Gerring 
							
						 
					 
					
						
						
							
						
						485e37e889 
					 
					
						
						
							
							Move MakeName to ethutil  
						
						
						
						
					 
					
						2015-03-11 14:29:07 -05:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						629f4b1d3c 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2015-03-11 17:46:58 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						6b63759ded 
					 
					
						
						
							
							Reverted global  
						
						
						
						
					 
					
						2015-03-11 16:33:04 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						99bc44cf52 
					 
					
						
						
							
							cmd/ethereum: add a flag to switch to unencrytped keystore  
						
						... 
						
						
						
						This is mostly for automated tests. The tests can use the following
commands to start the node:
    ethereum --unencrypted-keys account new
    ...
    ethereum --unencrypted-keys 
						
						
					 
					
						2015-03-11 13:58:01 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						7e0ccc9de5 
					 
					
						
						
							
							Merge branch 'develop' into rpcfrontier  
						
						... 
						
						
						
						Conflicts:
	rpc/api.go
	rpc/args.go 
						
						
					 
					
						2015-03-11 01:08:42 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						972e2c1e31 
					 
					
						
						
							
							cmd/utils: improve CLI help templates  
						
						... 
						
						
						
						Help for a specific command now shows available subcommands. 
						
						
					 
					
						2015-03-10 16:44:48 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						0bb7377ebe 
					 
					
						
						
							
							cmd/ethereum: show more helpful message if no accounts exist  
						
						
						
						
					 
					
						2015-03-10 15:44:05 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						487f68ec48 
					 
					
						
						
							
							accounts: add {Timed,}Unlock, remove SignLocked  
						
						
						
						
					 
					
						2015-03-10 00:19:01 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						9bf513e993 
					 
					
						
						
							
							Merge ethereum/poc-9 into accounts-integration  
						
						... 
						
						
						
						Conflicts:
	cmd/utils/cmd.go
	cmd/utils/flags.go
	core/manager.go
	eth/backend.go
	rpc/http/server.go
	xeth/xeth.go 
						
						
					 
					
						2015-03-09 23:25:46 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						a11f1d6a7e 
					 
					
						
						
							
							rpc: add dataDir parameter and JSON-RPC handler  
						
						
						
						
					 
					
						2015-03-09 23:08:46 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						73d1ebe244 
					 
					
						
						
							
							cmd/utils: add NewApp  
						
						
						
						
					 
					
						2015-03-09 23:08:46 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						fb53a9362e 
					 
					
						
						
							
							accounts: AccountManager -> Manager  
						
						
						
						
					 
					
						2015-03-08 01:58:35 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						a2810c06d7 
					 
					
						
						
							
							cmd/ethereum: add account commands  
						
						
						
						
					 
					
						2015-03-07 12:39:52 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						cd856cb213 
					 
					
						
						
							
							Separated block db from state db. Partial fix for  #416  
						
						
						
						
					 
					
						2015-03-06 18:26:16 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						ed84b58af5 
					 
					
						
						
							
							Debug option for VM & command line flag  
						
						
						
						
					 
					
						2015-03-06 16:58:52 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						bae7e93a9c 
					 
					
						
						
							
							cmd/ethereum: improve command line interface  
						
						... 
						
						
						
						The ethereum command line interface is now structured using subcommands.
These separate the different tasks it can perform.
Almost all flag names are backwards compatible.
The key tasks have not been ported to subcommands since they will be
replaced by the new accounts infrastructure very soon. 
						
						
					 
					
						2015-03-06 03:57:13 +01:00