Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							e170134d97 
							
						 
					 
					
						
						
							
							Merge branch 'master' into check-updates  
						
						
						
					 
					
						2016-12-12 22:45:12 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							c0a2d5c8f5 
							
						 
					 
					
						
						
							
							Merge pull request  #3796  from ethcore/tx-broadcast  
						
						... 
						
						
						
						Avoid broadcasting transactions to peers that send them 
						
					 
					
						2016-12-12 04:13:56 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							83d9bc189b 
							
						 
					 
					
						
						
							
							Fixing test  
						
						
						
					 
					
						2016-12-11 21:08:15 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e528ac9217 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into check-updates  
						
						
						
					 
					
						2016-12-11 20:20:09 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							94f5501c61 
							
						 
					 
					
						
						
							
							authors & homepage => Parity  
						
						
						
					 
					
						2016-12-11 19:43:58 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							58b72c521d 
							
						 
					 
					
						
						
							
							Rename ethcore -> parity in licenses.  
						
						
						
					 
					
						2016-12-11 19:31:31 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							17cc2be4b5 
							
						 
					 
					
						
						
							
							Rename ethcore -> parity in license.  
						
						
						
					 
					
						2016-12-11 19:30:54 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							10b0898bdf 
							
						 
					 
					
						
						
							
							Crate tidyups.  
						
						... 
						
						
						
						- Move Updater into its own crate.
- Change ethcore -> parity in authors, homepages and licenses. 
						
					 
					
						2016-12-11 19:14:42 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							b56f12adc6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into tx-broadcast  
						
						... 
						
						
						
						Conflicts:
	ethcore/light/src/net/context.rs
	ethcore/light/src/net/tests/mod.rs 
						
					 
					
						2016-12-11 17:31:56 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e09b1faf20 
							
						 
					 
					
						
						
							
							Fix semver version issues.  
						
						
						
					 
					
						2016-12-11 17:13:26 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							22cb5753d0 
							
						 
					 
					
						
						
							
							Improve capability information and disable old clients.  
						
						
						
					 
					
						2016-12-11 16:52:41 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							74a6203f72 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into check-updates  
						
						
						
					 
					
						2016-12-11 15:43:28 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							6724f574d6 
							
						 
					 
					
						
						
							
							Light server improvements and protocol adjustments ( #3801 )  
						
						... 
						
						
						
						* light: basic transaction pool
* light: network timeouts
* fix dead code warnings
* les: update to new message format
* fix indentation
* les: hash or number in headers req, not both 
						
					 
					
						2016-12-11 15:40:31 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							b28537aa9a 
							
						 
					 
					
						
						
							
							Merge pull request  #3809  from ethcore/mining-min-gas-limit  
						
						... 
						
						
						
						block: enforce gas limit falls within engine bounds 
						
					 
					
						2016-12-11 15:08:30 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							9252ebf93d 
							
						 
					 
					
						
						
							
							block: enforce gas limit falls within engine bounds  
						
						
						
					 
					
						2016-12-11 12:50:48 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0a494962e4 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into check-updates  
						
						
						
					 
					
						2016-12-11 02:13:52 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							120564ff29 
							
						 
					 
					
						
						
							
							Avoid pulling in hash_fetch.  
						
						
						
					 
					
						2016-12-11 02:12:52 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0302d582d2 
							
						 
					 
					
						
						
							
							Fix build.  
						
						
						
					 
					
						2016-12-11 02:02:40 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fa30dfd4b9 
							
						 
					 
					
						
						
							
							Refactor into system service, add exe redirect.  
						
						
						
					 
					
						2016-12-10 23:58:39 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							1e8638608c 
							
						 
					 
					
						
						
							
							fixing tests  
						
						
						
					 
					
						2016-12-10 22:59:35 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							b5020d3c8d 
							
						 
					 
					
						
						
							
							Fixing Light context API  
						
						
						
					 
					
						2016-12-10 21:25:28 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							19ca9ad460 
							
						 
					 
					
						
						
							
							Prevent broadcasting transactions to peer that send them.  
						
						
						
					 
					
						2016-12-10 21:22:19 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							1f9adc8622 
							
						 
					 
					
						
						
							
							Merge branch 'master' into txqueue-gc  
						
						... 
						
						
						
						Conflicts:
	ethcore/src/miner/miner.rs 
						
					 
					
						2016-12-10 17:00:29 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							aaf6da4c00 
							
						 
					 
					
						
						
							
							Returning persistent node id  
						
						
						
					 
					
						2016-12-10 16:55:29 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							a6fcd8a0d9 
							
						 
					 
					
						
						
							
							Merge pull request  #3794  from ethcore/net-fix  
						
						... 
						
						
						
						Network connectivity fixes 
						
					 
					
						2016-12-10 16:55:17 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							704054ef40 
							
						 
					 
					
						
						
							
							Merge branch 'master' into tx-broadcast  
						
						... 
						
						
						
						Conflicts:
	ethcore/src/client/traits.rs 
						
					 
					
						2016-12-10 15:23:53 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							e1ade5b375 
							
						 
					 
					
						
						
							
							Maintaining a list of transactions propagated from other peers  
						
						
						
					 
					
						2016-12-10 15:18:44 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							02c788a403 
							
						 
					 
					
						
						
							
							Network connectivity fixes  
						
						
						
					 
					
						2016-12-10 14:20:34 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							316c25d9f8 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into check-updates  
						
						
						
					 
					
						2016-12-10 14:08:41 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0977b82eeb 
							
						 
					 
					
						
						
							
							More fixes.  
						
						
						
					 
					
						2016-12-10 13:54:17 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7eb30b1249 
							
						 
					 
					
						
						
							
							Fix build.  
						
						
						
					 
					
						2016-12-10 13:52:43 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							82efa2675e 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into consistent-id  
						
						
						
					 
					
						2016-12-10 13:36:30 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							5f09eb9d04 
							
						 
					 
					
						
						
							
							update tests to new spec ( #3790 )  
						
						
						
					 
					
						2016-12-10 10:38:10 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							edd5e76050 
							
						 
					 
					
						
						
							
							Merge branch 'consistent-id' into check-updates  
						
						
						
					 
					
						2016-12-09 23:12:36 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5f1fcf95e0 
							
						 
					 
					
						
						
							
							Make *ID names consistent with std Rust (Id)  
						
						
						
					 
					
						2016-12-09 23:01:43 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							503b126c93 
							
						 
					 
					
						
						
							
							Merge branch 'master' into lightserv  
						
						
						
					 
					
						2016-12-09 21:37:55 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							2226324495 
							
						 
					 
					
						
						
							
							Merge pull request  #3778  from ethcore/auth-round-test  
						
						... 
						
						
						
						AuthorityRound network simulation test 
						
					 
					
						2016-12-09 20:58:05 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c82754874c 
							
						 
					 
					
						
						
							
							Fix typo.  
						
						
						
					 
					
						2016-12-09 20:48:52 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							46af3d18da 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into check-updates  
						
						
						
					 
					
						2016-12-09 20:45:15 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e5e6b77984 
							
						 
					 
					
						
						
							
							Cleanups and avoid redownloading.  
						
						
						
					 
					
						2016-12-09 20:40:24 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							97f358ced9 
							
						 
					 
					
						
						
							
							AuthorityRound network simulation test  
						
						
						
					 
					
						2016-12-09 20:38:06 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							c91a614c3d 
							
						 
					 
					
						
						
							
							Fixing tests  
						
						
						
					 
					
						2016-12-09 20:24:33 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c2b6be95c8 
							
						 
					 
					
						
						
							
							Fetch and place in updates path.  
						
						
						
					 
					
						2016-12-09 19:02:42 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							cee07fef74 
							
						 
					 
					
						
						
							
							Trigger remove_old on new block  
						
						
						
					 
					
						2016-12-09 15:54:13 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							415fccfffb 
							
						 
					 
					
						
						
							
							add ethcore-light cov target  
						
						
						
					 
					
						2016-12-09 15:20:45 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							5d054f08c3 
							
						 
					 
					
						
						
							
							Clearing old transactions  
						
						
						
					 
					
						2016-12-09 15:05:03 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							5f37c93659 
							
						 
					 
					
						
						
							
							les: use negotiated protocol version  
						
						
						
					 
					
						2016-12-09 15:04:54 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							cc8c2ea58d 
							
						 
					 
					
						
						
							
							Reject existing tx  
						
						
						
					 
					
						2016-12-09 14:37:11 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							eec1929658 
							
						 
					 
					
						
						
							
							Merge branch 'master' into lightserv  
						
						
						
					 
					
						2016-12-09 01:29:46 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							07d7a37319 
							
						 
					 
					
						
						
							
							les: make peer buffer flow params optional  
						
						
						
					 
					
						2016-12-09 01:06:51 +01:00