| 
							
							
								 arkpar | 150d7c1c78 | Merge remote-tracking branch 'origin/master' into db-config-ext | 2016-06-27 20:33:07 +02:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | 60b70dada1 | Reduced IO messages; removed panics on IO notifications (#1457) | 2016-06-27 19:30:13 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 9f4bfd9e7a | fix tests | 2016-06-27 18:47:50 +02:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | 6859152c21 | Fixed losing queued blocks on ancient block error (#1453) | 2016-06-27 15:59:45 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 2e5d5f12dd | ethcore client config | 2016-06-27 13:58:12 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 6bbaced3cd | Merge branch 'master' into miner-no-default Conflicts:
	ethcore/src/miner/miner.rs
	parity/main.rs | 2016-06-26 22:44:34 +02:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | a72d8ee0e7 | v1.3.0 (#1421) | 2016-06-25 10:32:05 +02:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | 3c63244c00 | Merge pull request #1418 from ethcore/newblocknumber Update SF blocknumber to 1800000. | 2016-06-24 17:50:03 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 60d259c9d5 | Update SF blocknumber to 1800000. | 2016-06-24 14:20:50 +02:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | 4e0d6f735a | Merge pull request #1405 from ethcore/sfedgecase Configurable gas limit cap. | 2016-06-24 13:36:40 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 84ce5af2b0 | max/min incorrect | 2016-06-24 11:40:25 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | dc7c53d59a | Fixing json tests | 2016-06-24 10:57:44 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 34c89e5841 | fixing json_tests | 2016-06-24 10:49:13 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 6edb981bfa | Merge branch 'master' into miner-no-default Conflicts:
	sync/src/lib.rs | 2016-06-23 21:18:43 +02:00 |  | 
			
				
					| 
							
							
								 Nikolay Volf | 1d31cee524 | Merge pull request #1406 from ethcore/jit Fixing jit compilation | 2016-06-23 18:32:14 +03:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 19585947a5 | Fixing jit compilation | 2016-06-23 14:46:33 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | bca9e1f31a | Merge branch 'master' into sfedgecase | 2016-06-23 14:43:42 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 41e0769e63 | Fix tests, | 2016-06-23 14:43:20 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 8fcec20398 | Gas limit ceiling option. | 2016-06-23 14:29:16 +02:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | 082294fe81 | Merge pull request #1403 from ethcore/bump-clippy Bump clippy | 2016-06-23 14:23:46 +02:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | f3486c48ea | Merge pull request #1401 from ethcore/sfedgecase Shortcut SF condition when canon known | 2016-06-23 13:08:30 +02:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | fb7ca8539e | Merge pull request #1402 from ethcore/txqueue-assert Additional assertions for internal state of queue | 2016-06-23 12:52:56 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 5bf906625b | Fixing warnings | 2016-06-23 12:19:38 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 129ce97ad5 | Constants for SF# and update. | 2016-06-23 11:30:48 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 4f39fb2551 | Merge branch 'master' into sfedgecase | 2016-06-23 11:19:19 +02:00 |  | 
			
				
					| 
							
							
								 keorn | be8f922b3f | Replace deprecated hashdb trait names (#1394) * replace deprecated hashdb method names
* spaces -> tabs | 2016-06-23 11:16:11 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | a76e3a134f | Bumping clippy | 2016-06-23 10:54:25 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | fc9ceb9131 | Merge branch 'master' into sfedgecase | 2016-06-22 21:38:56 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 1602906b56 | Shortcut SF condition when canon known | 2016-06-22 21:37:29 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 230c6c889a | Ensure judging the SF trigger by relative branch (#1399) Rather than just the canon chain. | 2016-06-22 21:33:10 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 9a1e1b7c89 | Signer with Unlocked Account (#1398) | 2016-06-22 21:32:26 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 5302a7dd58 | Ensure judging the SF trigger by relative branch Rather than just the canon chain. | 2016-06-22 19:49:07 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 353b9e91e6 | Update SF to latest spec (#1386) * Introduce whitelist for softfork
* Use extradata for fork id.
* Fix condition. | 2016-06-22 15:37:25 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | e2de1987c7 | Fixing order of if statements to avoid overflows. (#1384) * Removing old transactions
* Explanation comment [ci skip] | 2016-06-22 11:15:22 +02:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | 7c94b1495e | Merge pull request #1329 from ethcore/softforktrigger Install trigger for DAO-rescue soft-fork. | 2016-06-21 22:25:24 +02:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | 613d4c95f6 | Merge pull request #1364 from ethcore/miner-lock Fix lock order when updating sealing | 2016-06-21 17:41:44 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | fe09d8d291 | Merge branch 'master' into txqueue-assert Conflicts:
	ethcore/src/miner/transaction_queue.rs | 2016-06-21 16:35:18 +02:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | b2891fcdda | Update sealing on new transactions (#1365) | 2016-06-21 16:00:34 +02:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | bca4e23df6 | Fixed panic on aborted connection (#1370) | 2016-06-21 15:56:00 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 840f961dc2 | don't bother assigning queue. | 2016-06-21 14:34:22 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | e0b4eab819 | Fixing replacing transaction with lower gas_price in one of the edge cases (#1343) | 2016-06-21 13:55:26 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 3de482a431 | Additional assertions for internal state of queue | 2016-06-21 12:31:50 +02:00 |  | 
			
				
					| 
							
							
								 arkpar | b667378820 | Release lock while pushing transactions | 2016-06-21 11:26:43 +02:00 |  | 
			
				
					| 
							
							
								 arkpar | c912bb8c17 | Fix lock order | 2016-06-20 23:48:47 +02:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | f58e211b11 | Merge pull request #1335 from ethcore/tx_perf Transaction processing queue | 2016-06-20 23:47:35 +02:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | 7e424d2713 | Merge pull request #1359 from ethcore/lastnonce-fix Fixing last nonce values in case transaction is replaced | 2016-06-20 23:03:09 +02:00 |  | 
			
				
					| 
							
							
								 Arkadiy Paronyan | 855ae91c4c | Merge pull request #1354 from ethcore/warnings-fix Fixing clippy warnings | 2016-06-20 21:21:51 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 72debeebcf | Update code hash. | 2016-06-20 20:47:07 +02:00 |  | 
			
				
					| 
							
							
								 arkpar | 09b8116cde | TX processing queue | 2016-06-20 18:42:50 +02:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 8fa9a240cc | Fixing last nonce values in case transaction is replaced | 2016-06-20 18:37:59 +02:00 |  |