Jeffrey Wilcke 
							
						 
					 
					
						
						
							
						
						3133372a6a 
					 
					
						
						
							
							Merge pull request  #536  from zsfelfoldi/develop  
						
						... 
						
						
						
						using robertkrimen/otto, godeps updated 
						
						
					 
					
						2015-03-22 21:45:56 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						8b1b9fc99d 
					 
					
						
						
							
							Merge branch 'jsonlog' of  https://github.com/ethersphere/go-ethereum  into ethersphere-jsonlog  
						
						... 
						
						
						
						Conflicts:
	eth/backend.go 
						
						
					 
					
						2015-03-22 21:43:36 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						e349fb9350 
					 
					
						
						
							
							bump  
						
						
						
						
					 
					
						2015-03-22 12:20:27 +01:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						78cff9e3a4 
					 
					
						
						
							
							independent flag for json structured logging  
						
						... 
						
						
						
						- logjson flag remove logformat flag
- passed to eth Config
- logsystem not a field of Ethereum
- LogSystem does not need to expose GetLogLevel/SetLogLevel
- message struct just implements more generic LogMsg interface
- LogMsg is a fmt.Stringer with Level()
- jsonMsg ([]byte) implements LogMsg
- remove "raw" systems
- move level logic inside StdLogSystem
- logsystems only print their kind of msg: jsonLogSystem prints jsonMsg, StdLogSystem prints stdMsg 
						
						
					 
					
						2015-03-22 02:16:54 +00:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						a7ad9c309b 
					 
					
						
						
							
							Merge branch 'develop' into conversion  
						
						
						
						
					 
					
						2015-03-21 14:52:42 +01:00 
						 
				 
			
				
					
						
							
							
								zsfelfoldi 
							
						 
					 
					
						
						
							
						
						8324b683b4 
					 
					
						
						
							
							using robertkrimen/otto, godeps updated  
						
						
						
						
					 
					
						2015-03-20 13:22:01 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						4f5b362bda 
					 
					
						
						
							
							%#x => %x  
						
						
						
						
					 
					
						2015-03-20 12:52:03 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						91f9f355b2 
					 
					
						
						
							
							test  
						
						
						
						
					 
					
						2015-03-20 12:17:57 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						b5a71d955c 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2015-03-19 16:59:13 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						93ba3df4ff 
					 
					
						
						
							
							Removed frontier from version :-(  
						
						
						
						
					 
					
						2015-03-19 15:36:38 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						f0bb136099 
					 
					
						
						
							
							Merge branch 'develop' into conversion  
						
						
						
						
					 
					
						2015-03-18 18:42:01 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						79f90bf7c1 
					 
					
						
						
							
							added frontier to version  
						
						
						
						
					 
					
						2015-03-18 18:39:24 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						bc5ae94384 
					 
					
						
						
							
							Merge branch 'frontier/cli-private-network' of  https://github.com/ethersphere/go-ethereum  into ethersphere-frontier/cli-private-network  
						
						
						
						
					 
					
						2015-03-18 18:37:20 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						f9a6038f5b 
					 
					
						
						
							
							merge  
						
						
						
						
					 
					
						2015-03-18 18:23:37 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						064279c0ec 
					 
					
						
						
							
							cmd/ethereum, cmd/utils: partial fix for chain import  
						
						
						
						
					 
					
						2015-03-18 14:04:44 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						0a1eeca41e 
					 
					
						
						
							
							conversions. -compilable-  
						
						
						
						
					 
					
						2015-03-18 13:00:01 +01:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						53104b09fa 
					 
					
						
						
							
							bump  
						
						
						
						
					 
					
						2015-03-17 21:23:05 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						b422835a59 
					 
					
						
						
							
							cmd/ethereum: add makedag command for testing  
						
						
						
						
					 
					
						2015-03-17 14:12:34 +01:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						17cd7a5817 
					 
					
						
						
							
							remove long-running mining test, ethutil -> common  
						
						
						
						
					 
					
						2015-03-16 22:56:05 +07:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						b3e133dd15 
					 
					
						
						
							
							Merge branch 'frontier/js' into frontier/nodeadmin.js  
						
						
						
						
					 
					
						2015-03-16 22:50:29 +07:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						73af0302be 
					 
					
						
						
							
							we do not use the name Frontier Console  
						
						
						
						
					 
					
						2015-03-16 22:49:39 +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 
							
						 
					 
					
						
						
							
						
						132e87a707 
					 
					
						
						
							
							node admin interface for Frontier Console, see spec  https://github.com/ethereum/go-ethereum/wiki/Frontier-Console  
						
						
						
						
					 
					
						2015-03-15 13:43:48 +07: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 
						 
				 
			
				
					
						
							
							
								Maran 
							
						 
					 
					
						
						
							
						
						9754e7aca7 
					 
					
						
						
							
							Support for addresses with or without 0x.  Fixes   #472  
						
						
						
						
					 
					
						2015-03-14 11:40:13 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						67f8f83a1b 
					 
					
						
						
							
							cmd/ethereum: add blocktest command  
						
						
						
						
					 
					
						2015-03-13 18:41:09 +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 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						d5aaf413e0 
					 
					
						
						
							
							cmd/ethereum: remove extra check for 'no accounts' error  
						
						... 
						
						
						
						This error can no longer be returned from eth.New. 
						
						
					 
					
						2015-03-11 23:43:27 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						d7b5a87b3b 
					 
					
						
						
							
							miner: provide coinbase when starting the miner  
						
						... 
						
						
						
						This avoids having to query the coinbase when creating the miner, which
in turn eliminates the dreaded startup error when no accounts are set
up. Later, this will also allow us to simply restart the miner when the
user picks a different coinbase.
This causes a lot of changes in other packages. These are included in
this commit because they're impossible to separate. 
						
						
					 
					
						2015-03-11 23:43:27 +01: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 
							
						 
					 
					
						
						
							
						
						269cfbb8ac 
					 
					
						
						
							
							Merge branch origin/develop into accounts-integration  
						
						... 
						
						
						
						Conflicts:
	cmd/blocktest/main.go
	cmd/mist/debugger.go
	cmd/utils/cmd.go 
						
						
					 
					
						2015-03-10 17:14:31 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						221fae4112 
					 
					
						
						
							
							cmd/ethereum: show some help before prompting for encryption passphrase  
						
						
						
						
					 
					
						2015-03-10 16:44:22 +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 
							
						 
					 
					
						
						
							
						
						0395c174ca 
					 
					
						
						
							
							cmd/ethereum: fix line editing setup and history  
						
						
						
						
					 
					
						2015-03-10 14:31:54 +01:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
							
						
						c9b6d268b4 
					 
					
						
						
							
							Merge pull request  #438  from ethersphere/poc9/cli  
						
						... 
						
						
						
						Poc9/cli (exportchain) 
						
						
					 
					
						2015-03-10 11:24:47 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						ae38871a54 
					 
					
						
						
							
							cmd/ethereum: remove "prompter" in identifiers  
						
						
						
						
					 
					
						2015-03-10 02:33:59 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						9f0e3bd286 
					 
					
						
						
							
							cmd/ethereum: unlock accounts on JS REPL  
						
						
						
						
					 
					
						2015-03-10 02:00:57 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
							
						
						d1e04f7388 
					 
					
						
						
							
							cmd/ethereum: allow multiple js files  
						
						
						
						
					 
					
						2015-03-10 00:24:11 +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 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
							
						
						20741a96ac 
					 
					
						
						
							
							Updated xeth instances to take extra param for ui.Interface  
						
						... 
						
						
						
						Please be aware that if any of the instances on xeth.frontend are called
the program will crash due to the default, temporarily, frontend
interface. 
						
						
					 
					
						2015-03-09 13:50:05 +01:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						41a89e18f6 
					 
					
						
						
							
							version output  
						
						... 
						
						
						
						- make version output more verbose
- include NetworkId
- go version and os not displayed like env vars (confusing) 
						
						
					 
					
						2015-03-08 22:50:27 +07:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
							
						
						51eed7964e 
					 
					
						
						
							
							add export blockchain subcommand, remove BlockDo  
						
						
						
						
					 
					
						2015-03-08 22:44:48 +07:00