obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							f0bb136099 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into conversion  
						
						
						
					 
					
						2015-03-18 18:42:01 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							064279c0ec 
							
						 
					 
					
						
						
							
							cmd/ethereum, cmd/utils: partial fix for chain import  
						
						
						
					 
					
						2015-03-18 14:04:44 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							d15f90645d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'ethereum/conversion' into conversion  
						
						
						
					 
					
						2015-03-18 13:39:01 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							b5b83db450 
							
						 
					 
					
						
						
							
							core: use package rlp to encode blocks  
						
						... 
						
						
						
						This also changes the chain export format so there is no
enclosing list around the blocks, which enables streaming export. 
						
					 
					
						2015-03-18 13:36:48 +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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							c3f94a4341 
							
						 
					 
					
						
						
							
							cmd/utils: remove extra space in fatal error message  
						
						
						
					 
					
						2015-03-10 15:42:25 +01:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							0542df941f 
							
						 
					 
					
						
						
							
							Merge pull request  #449  from Gustav-Simonsson/add_blockchain_tests2  
						
						... 
						
						
						
						Add empty total difficulty to test blocks and clean up stopping the node 
						
					 
					
						2015-03-10 12:07:34 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							cd51860bf0 
							
						 
					 
					
						
						
							
							cmd/utils: delete InitConfig, KeyTasks  
						
						
						
					 
					
						2015-03-09 23:08:47 +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 
						 
				 
			
				
					
						
							
							
								Gustav Simonsson 
							
						 
					 
					
						
						
						
						
							
						
						
							27c42ea934 
							
						 
					 
					
						
						
							
							Add empty total difficulty to test blocks and clean up stopping the node  
						
						
						
					 
					
						2015-03-09 18:03:35 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							51eed7964e 
							
						 
					 
					
						
						
							
							add export blockchain subcommand, remove BlockDo  
						
						
						
					 
					
						2015-03-08 22:44:48 +07: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 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							bb152612e0 
							
						 
					 
					
						
						
							
							Merge branch 'develop' into poc-9  
						
						... 
						
						
						
						Conflicts:
	cmd/utils/cmd.go 
						
					 
					
						2015-03-03 20:34:48 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							40ff3cac39 
							
						 
					 
					
						
						
							
							merge  
						
						
						
					 
					
						2015-03-03 17:56:36 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							313fe3861b 
							
						 
					 
					
						
						
							
							fixed pow stuff  
						
						
						
					 
					
						2015-03-03 17:55:23 +01:00 
						 
				 
			
				
					
						
							
							
								Taylor Gerring 
							
						 
					 
					
						
						
						
						
							
						
						
							4cb0bfe939 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:ethereum/go-ethereum into removews  
						
						... 
						
						
						
						Conflicts:
	cmd/ethereum/flags.go
	cmd/mist/flags.go 
						
					 
					
						2015-03-02 07:06:08 -06:00 
						 
				 
			
				
					
						
							
							
								Taylor Gerring 
							
						 
					 
					
						
						
						
						
							
						
						
							cfe0370280 
							
						 
					 
					
						
						
							
							Remove Websockets RPC transport  
						
						
						
					 
					
						2015-03-01 16:19:06 +01:00 
						 
				 
			
				
					
						
							
							
								Taylor Gerring 
							
						 
					 
					
						
						
						
						
							
						
						
							f6e821fd33 
							
						 
					 
					
						
						
							
							Add flag to set RPC port  
						
						
						
					 
					
						2015-02-28 01:00:42 +01:00 
						 
				 
			
				
					
						
							
							
								Taylor Gerring 
							
						 
					 
					
						
						
						
						
							
						
						
							739b7cc2ac 
							
						 
					 
					
						
						
							
							Cleanup imports  
						
						
						
					 
					
						2015-02-26 02:36:06 +01:00 
						 
				 
			
				
					
						
							
							
								Taylor Gerring 
							
						 
					 
					
						
						
						
						
							
						
						
							d5aed82b11 
							
						 
					 
					
						
						
							
							DRY DefaultAssetPath()  
						
						
						
					 
					
						2015-02-26 02:32:27 +01:00 
						 
				 
			
				
					
						
							
							
								Taylor Gerring 
							
						 
					 
					
						
						
						
						
							
						
						
							8eeab7ea3f 
							
						 
					 
					
						
						
							
							Update osext import path  
						
						
						
					 
					
						2015-02-26 02:24:20 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							483d96a89d 
							
						 
					 
					
						
						
							
							Added eth_logs & fixed issue with manual log filtering  
						
						... 
						
						
						
						* Implemented `eth_logs`
* Fixed issue with `filter.Find()` where logs were appended to an
  incorrect, non-returned slice resulting in no logs found 
						
					 
					
						2015-02-22 13:12:01 +01:00 
						 
				 
			
				
					
						
							
							
								Maran 
							
						 
					 
					
						
						
						
						
							
						
						
							5aff8bfb59 
							
						 
					 
					
						
						
							
							Implement command line argument to set the amount of agents created by the miner  
						
						... 
						
						
						
						Defaults to the amount of cores available on the CPU 
						
					 
					
						2015-02-19 10:38:36 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							028775a086 
							
						 
					 
					
						
						
							
							cmd/ethereum, cmd/mist: add flag for discovery bootstrap nodes  
						
						
						
					 
					
						2015-02-07 00:52:49 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							56f777b2fc 
							
						 
					 
					
						
						
							
							cmd/ethereum, cmd/mist, core, eth, javascript, xeth: fixes for new p2p API  
						
						
						
					 
					
						2015-02-06 00:03:59 +01:00 
						 
				 
			
				
					
						
							
							
								obscuren 
							
						 
					 
					
						
						
						
						
							
						
						
							2f30a27b2b 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop  
						
						
						
					 
					
						2015-02-05 12:22:44 -08:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							99a1551b20 
							
						 
					 
					
						
						
							
							Merge pull request  #287  from ethereum/system-testing  
						
						... 
						
						
						
						Seednode CLI param updates 
						
					 
					
						2015-02-05 11:09:13 -08:00 
						 
				 
			
				
					
						
							
							
								Taylor Gerring 
							
						 
					 
					
						
						
						
						
							
						
						
							07590196a5 
							
						 
					 
					
						
						
							
							Merge branch 'develop' of github.com:tgerring/go-ethereum into develop  
						
						
						
					 
					
						2015-02-03 17:18:20 -06:00