Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							80e5f50713 
							
						 
					 
					
						
						
							
							Merge branch 'develop'  
						
						
						
					 
					
						2015-08-05 18:08:52 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							26f838796b 
							
						 
					 
					
						
						
							
							Merge pull request  #1583  from obscuren/miner-price-order  
						
						... 
						
						
						
						miner, core: sort txs by price, nonce 
						
					 
					
						2015-08-05 09:03:18 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							35f271b264 
							
						 
					 
					
						
						
							
							miner, core: sort txs by price, nonce  
						
						
						
					 
					
						2015-08-05 17:44:19 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							f12e0161ca 
							
						 
					 
					
						
						
							
							Merge pull request  #1588  from obscuren/diff-bomb  
						
						... 
						
						
						
						core, miner: added difficulty bomb 
						
					 
					
						2015-08-05 04:26:57 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							71d32f54f7 
							
						 
					 
					
						
						
							
							core, miner: added difficulty bomb  
						
						
						
					 
					
						2015-08-05 13:09:09 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							1f4ac6b05a 
							
						 
					 
					
						
						
							
							Merge pull request  #1587  from obscuren/miner-race  
						
						... 
						
						
						
						miner: fixed worker race condition 
						
					 
					
						2015-08-05 01:50:49 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							d8590d9790 
							
						 
					 
					
						
						
							
							miner: fixed worker race condition  
						
						
						
					 
					
						2015-08-04 20:54:21 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							56219a5e7a 
							
						 
					 
					
						
						
							
							Merge pull request  #1578  from Gustav-Simonsson/frontier_thawing  
						
						... 
						
						
						
						miner: gas limit strategy, target 3141592 & def gas price 50 Shannon 
						
					 
					
						2015-08-04 11:53:39 -07:00 
						 
				 
			
				
					
						
							
							
								Gustav Simonsson 
							
						 
					 
					
						
						
						
						
							
						
						
							26c6e3b206 
							
						 
					 
					
						
						
							
							miner: gas limit strategy, target 3141592 & def gas price 50 Shannon  
						
						
						
					 
					
						2015-08-04 15:20:28 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							b01f2c29ae 
							
						 
					 
					
						
						
							
							Merge pull request  #1574  from fjl/fdtrack  
						
						... 
						
						
						
						fdtrack: hack to track file descriptor usage 
						
					 
					
						2015-08-04 03:51:16 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							ff66e8fa29 
							
						 
					 
					
						
						
							
							Merge pull request  #1562  from ethersphere/blankpasswd  
						
						... 
						
						
						
						jsre: leave out lines from history possibly containing passwords 
						
					 
					
						2015-08-04 03:10:59 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							17b481e3c3 
							
						 
					 
					
						
						
							
							Merge pull request  #1581  from obscuren/olympic  
						
						... 
						
						
						
						cmd, core, eth: support for the olympic network 
						
					 
					
						2015-08-04 00:54:07 -07:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							5c949d3b3b 
							
						 
					 
					
						
						
							
							fdtrack: temporary hack for tracking file descriptor usage  
						
						... 
						
						
						
						Package fdtrack logs statistics about open file descriptors.
This should help identify the source of #1549 . 
						
					 
					
						2015-08-04 03:10:27 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							dcdb7059cc 
							
						 
					 
					
						
						
							
							cmd, core, eth: support for the olympic network  
						
						... 
						
						
						
						Added a --olympic flag which initialiser the olympic protocol settings 
						
					 
					
						2015-08-03 18:15:48 +02:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							bf48ed32dd 
							
						 
					 
					
						
						
							
							metrics: fix file descriptor leak when reading disk stats on linux  
						
						... 
						
						
						
						The disk stats file was not closed after reading. 
						
					 
					
						2015-08-03 16:27:36 +02:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							ba14957cf3 
							
						 
					 
					
						
						
							
							rpc/comms: use ConnState to track HTTP connections  
						
						... 
						
						
						
						The JSON-RPC server wraps TCP connections in order to be able to shut
down them down when RPC is stopped. This is rather scary code. Go 1.3
introduced the http.Server.ConnState hook for such purposes. We can use
this facility now that we depend on Go 1.4.
There are multiple reasons for the switch apart from making the code
less scary:
* the TCP listener no longer ticks every second to check a channel
* pending requests are allowed to finish after stopping the server
* we can time out idle keep-alive connections 
						
					 
					
						2015-08-03 16:27:36 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							97cdf84899 
							
						 
					 
					
						
						
							
							Merge pull request  #1479  from tgerring/ethtest  
						
						... 
						
						
						
						Update ethtest default path for BlockTests 
						
					 
					
						2015-08-03 07:18:48 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							98db08c42f 
							
						 
					 
					
						
						
							
							Merge pull request  #1548  from fjl/accounts-test-deflake  
						
						... 
						
						
						
						accounts: bump timeout in TestSignRace 
						
					 
					
						2015-08-03 07:16:36 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							cc6c5846e5 
							
						 
					 
					
						
						
							
							Merge pull request  #1568  from obscuren/issue-1559  
						
						... 
						
						
						
						core: added a running flag to prevent panics in the chainmanager 
						
					 
					
						2015-08-03 07:15:19 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							db988a46dd 
							
						 
					 
					
						
						
							
							Merge pull request  #1569  from obscuren/default-genesis  
						
						... 
						
						
						
						core: added default genesis block 
						
					 
					
						2015-08-03 04:49:30 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							7a75da63c6 
							
						 
					 
					
						
						
							
							core: added default genesis block  
						
						... 
						
						
						
						When a user runs a freshly setup geth w/o a database initialised the
default genesis block is decoded and inserted in to the database. 
						
					 
					
						2015-08-02 01:23:02 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							33efb3381c 
							
						 
					 
					
						
						
							
							Merge pull request  #1461  from bas-vk/eth_resend  
						
						... 
						
						
						
						Old transaction after resend was not removed from pool 
						
					 
					
						2015-08-01 16:18:54 -07:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							5aec1d94ad 
							
						 
					 
					
						
						
							
							accounts: bump timeout and spin less in TestSignRace  
						
						... 
						
						
						
						This should fix the flakeyness. 
						
					 
					
						2015-08-02 00:49:53 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							a8b39b5cc0 
							
						 
					 
					
						
						
							
							Merge pull request  #1541  from bas-vk/issue1518  
						
						... 
						
						
						
						Improved error handling for NewTransactionFromBytes 
						
					 
					
						2015-08-01 08:47:32 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							acd2c4e520 
							
						 
					 
					
						
						
							
							core: added a running flag to prevent panics in the chainmanager  
						
						... 
						
						
						
						The running flag will determine whether the chain manager is still
running or not. This will prevent the quit channel from being closed
twice resulting in a panic. This PR should fix this issue.
Closes  #1559  
						
					 
					
						2015-08-01 12:32:28 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							ab85a3593a 
							
						 
					 
					
						
						
							
							Merge pull request  #1545  from obscuren/log-index  
						
						... 
						
						
						
						core/state: Set log index. Closes  #1226  
						
					 
					
						2015-07-31 10:36:42 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							c1c06fffcb 
							
						 
					 
					
						
						
							
							Merge pull request  #1561  from karalabe/add-missing-autocompletes  
						
						... 
						
						
						
						rpc/api: add missing autocomplete commands 
						
					 
					
						2015-07-31 03:09:08 -07:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
						
						
							
						
						
							6628eeb6ca 
							
						 
					 
					
						
						
							
							jsre: leave out lines from history containing methods of the personal module  
						
						
						
					 
					
						2015-07-31 11:51:18 +02:00 
						 
				 
			
				
					
						
							
							
								Péter Szilágyi 
							
						 
					 
					
						
						
						
						
							
						
						
							0d3a8ad6dd 
							
						 
					 
					
						
						
							
							rpc/api: add missing autocomplete commands  
						
						
						
					 
					
						2015-07-31 12:46:16 +03:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							4231de3914 
							
						 
					 
					
						
						
							
							Merge pull request  #1553  from prusnak/develop  
						
						... 
						
						
						
						remove elliptic.P224 usage 
						
					 
					
						2015-07-30 03:59:25 -07:00 
						 
				 
			
				
					
						
							
							
								Pavol Rusnak 
							
						 
					 
					
						
						
						
						
							
						
						
							3f07afbbd2 
							
						 
					 
					
						
						
							
							remove elliptic.P224 usage  
						
						... 
						
						
						
						Fedora/RedHat distros comply with US patent law and remove this curve,
which makes it impossible to run ethereum with distro provided Golang.
File crypto/ecies/README claims it is unsupported anyway. 
						
					 
					
						2015-07-30 12:47:45 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							64e2f52c2e 
							
						 
					 
					
						
						
							
							Merge pull request  #1534  from obscuren/issue-1040  
						
						... 
						
						
						
						rpc: to in eth_call no longer required. Fixed eth_estimateGas 
						
					 
					
						2015-07-30 03:25:47 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							d261c3f455 
							
						 
					 
					
						
						
							
							rpc: to in Call no longer required. Fixed eth_estimateGas  
						
						
						
					 
					
						2015-07-29 15:12:12 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							e7f4232b10 
							
						 
					 
					
						
						
							
							Merge pull request  #1544  from karalabe/fix-stall-detector  
						
						... 
						
						
						
						eth, eth/downloader: don't report stall if fetcher filled the block 
						
					 
					
						2015-07-29 06:11:43 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							f715547fc7 
							
						 
					 
					
						
						
							
							core/state: Set log index.  Closes   #1226  
						
						
						
					 
					
						2015-07-29 15:08:59 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							fa286688ab 
							
						 
					 
					
						
						
							
							Merge pull request  #1546  from obscuren/tests-update  
						
						... 
						
						
						
						tests: updated 
						
					 
					
						2015-07-29 06:07:19 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							03c39d4fc0 
							
						 
					 
					
						
						
							
							tests: updated  
						
						
						
					 
					
						2015-07-29 15:01:42 +02:00 
						 
				 
			
				
					
						
							
							
								Péter Szilágyi 
							
						 
					 
					
						
						
						
						
							
						
						
							6adbaabc65 
							
						 
					 
					
						
						
							
							eth, eth/downloader: don't report stall if fetcher filled the block  
						
						
						
					 
					
						2015-07-29 15:39:08 +03:00 
						 
				 
			
				
					
						
							
							
								Bas van Kervel 
							
						 
					 
					
						
						
						
						
							
						
						
							81e2124ea2 
							
						 
					 
					
						
						
							
							improved error detection and handling for NewTransactionFromBytes  
						
						... 
						
						
						
						integrated review comments 
						
					 
					
						2015-07-29 10:30:00 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							cc27be9d44 
							
						 
					 
					
						
						
							
							Merge pull request  #1543  from enriquefynn/develop  
						
						... 
						
						
						
						FreeBSD support 
						
					 
					
						2015-07-28 16:20:13 -07:00 
						 
				 
			
				
					
						
							
							
								Fynn 
							
						 
					 
					
						
						
						
						
							
						
						
							7065ebd2ed 
							
						 
					 
					
						
						
							
							FreeBSD support  
						
						
						
					 
					
						2015-07-28 19:16:16 -03:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							a281df783d 
							
						 
					 
					
						
						
							
							Merge pull request  #1533  from ethersphere/frontier/etherbase  
						
						... 
						
						
						
						Etherbase defaults to first account even if it is created during the session 
						
					 
					
						2015-07-28 05:11:43 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							1fad8798ec 
							
						 
					 
					
						
						
							
							Merge pull request  #1515  from fjl/license-fixes  
						
						... 
						
						
						
						all: fix license headers one more time 
						
					 
					
						2015-07-28 04:29:42 -07:00 
						 
				 
			
				
					
						
							
							
								Bas van Kervel 
							
						 
					 
					
						
						
						
						
							
						
						
							7e31df3987 
							
						 
					 
					
						
						
							
							bugfix, pending transaction was resend with new gas price/limit but not removed from transaction pool  
						
						
						
					 
					
						2015-07-28 10:42:31 +02:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							572e78cee0 
							
						 
					 
					
						
						
							
							Merge pull request  #1536  from fjl/fix-go1.5-build  
						
						... 
						
						
						
						crypto: fix build with Go 1.5 
						
					 
					
						2015-07-28 00:59:52 +02:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							453d2c9ce1 
							
						 
					 
					
						
						
							
							crypto: fix build with Go 1.5  
						
						
						
					 
					
						2015-07-27 19:13:45 +02:00 
						 
				 
			
				
					
						
							
							
								zelig 
							
						 
					 
					
						
						
						
						
							
						
						
							1356daad27 
							
						 
					 
					
						
						
							
							etherbase defaults to first account even if created during the session  
						
						
						
					 
					
						2015-07-27 10:50:29 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							d18d256442 
							
						 
					 
					
						
						
							
							Merge pull request  #1529  from obscuren/extra-data-fix  
						
						... 
						
						
						
						core: genesis extra data field fix 
						
					 
					
						2015-07-26 15:15:36 -07:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							3530acb9e2 
							
						 
					 
					
						
						
							
							core: genesis extra data field fix  
						
						
						
					 
					
						2015-07-26 14:44:54 +02:00 
						 
				 
			
				
					
						
							
							
								Jeffrey Wilcke 
							
						 
					 
					
						
						
						
						
							
						
						
							8a5ea466e4 
							
						 
					 
					
						
						
							
							Merge pull request  #1528  from obscuren/reduce-extra-data  
						
						... 
						
						
						
						params: reduce extra data to 32 bytes & target block time 
						
					 
					
						2015-07-26 04:04:10 -07:00