Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							5a3c3bcb45 
							
						 
					 
					
						
						
							
							Sync reorg up to history size ( #3874 )  
						
						... 
						
						
						
						* Allow sync reorg up to pruning history size
* Peer difficulty tracking
* Abort downloading block if received with NewBlock
* Set pruning history to 1200
* Renamed history size field 
						
					 
					
						2016-12-23 18:43:40 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							65f07e5aa7 
							
						 
					 
					
						
						
							
							Renamed some functions  
						
						
						
					 
					
						2016-12-16 14:54:26 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							6c9de9e6f8 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:ethcore/parity into tx-block  
						
						
						
					 
					
						2016-12-16 13:36:07 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ca0d87da10 
							
						 
					 
					
						
						
							
							125 -> 69.  
						
						
						
					 
					
						2016-12-15 22:05:54 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							f8961484c1 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:ethcore/parity into tx-block  
						
						
						
					 
					
						2016-12-15 19:10:33 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							2952ea1b85 
							
						 
					 
					
						
						
							
							Delayed transactions  
						
						
						
					 
					
						2016-12-15 18:19:19 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							db2e1dd01a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into check-updates  
						
						
						
					 
					
						2016-12-15 17:11:22 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							817a58cf64 
							
						 
					 
					
						
						
							
							Merge pull request  #3844  from ethcore/trace-macros  
						
						... 
						
						
						
						Converting traces API to AutoArgs 
						
					 
					
						2016-12-15 15:21:35 +01:00 
						 
				 
			
				
					
						
							
							
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							054a6a9daf 
							
						 
					 
					
						
						
							
							Merge branch 'master' into check-updates  
						
						... 
						
						
						
						# Conflicts:
#	.gitlab-ci.yml
#	js/webpack/dev.server.js 
						
					 
					
						2016-12-15 13:52:28 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							6e51b23e30 
							
						 
					 
					
						
						
							
							Adding traces tests  
						
						
						
					 
					
						2016-12-14 20:07:33 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							597c3a4770 
							
						 
					 
					
						
						
							
							Ensure chain state is at threshold security level before looking for updates.  
						
						
						
					 
					
						2016-12-13 21:21:07 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							fa504e510f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-12-12 21:28:46 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ab4d666681 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into check-updates  
						
						
						
					 
					
						2016-12-12 16:35:11 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							a4bf914683 
							
						 
					 
					
						
						
							
							Merge branch 'auth-bft' of  https://github.com/ethcore/parity  into auth-bft  
						
						
						
					 
					
						2016-12-11 18:23:54 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							22cb5753d0 
							
						 
					 
					
						
						
							
							Improve capability information and disable old clients.  
						
						
						
					 
					
						2016-12-11 16:52:41 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							c777362d02 
							
						 
					 
					
						
						
							
							Sync channel for consensus test  
						
						
						
					 
					
						2016-12-11 12:32:01 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							19ca9ad460 
							
						 
					 
					
						
						
							
							Prevent broadcasting transactions to peer that send them.  
						
						
						
					 
					
						2016-12-10 21:22:19 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							b6c7ed24b7 
							
						 
					 
					
						
						
							
							Client trait reorg  
						
						
						
					 
					
						2016-12-10 18:35:29 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							f3af0f46be 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-12-10 18:14:35 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							b9909da8b1 
							
						 
					 
					
						
						
							
							move Sealing methods to MiningBlockChainClient  
						
						
						
					 
					
						2016-12-10 17:40:20 +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 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							316c25d9f8 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into check-updates  
						
						
						
					 
					
						2016-12-10 14:08:41 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							82efa2675e 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into consistent-id  
						
						
						
					 
					
						2016-12-10 13:36:30 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							e5f8044cad 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-12-10 11:01:23 +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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							ca7406773f 
							
						 
					 
					
						
						
							
							AuthorityRound network simulation test  
						
						
						
					 
					
						2016-12-09 19:27:16 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c2b6be95c8 
							
						 
					 
					
						
						
							
							Fetch and place in updates path.  
						
						
						
					 
					
						2016-12-09 19:02:42 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							56e9dab9de 
							
						 
					 
					
						
						
							
							add Engine stop method  
						
						
						
					 
					
						2016-12-09 14:52:08 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							cc8c2ea58d 
							
						 
					 
					
						
						
							
							Reject existing tx  
						
						
						
					 
					
						2016-12-09 14:37:11 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							74770e4773 
							
						 
					 
					
						
						
							
							better docstrings  
						
						
						
					 
					
						2016-12-08 21:49:55 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							9ecb07434f 
							
						 
					 
					
						
						
							
							fix informant  
						
						
						
					 
					
						2016-12-08 21:13:32 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							efd66f566d 
							
						 
					 
					
						
						
							
							ethsync: optional ipc codegen  
						
						
						
					 
					
						2016-12-08 19:52:48 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							8d16f73795 
							
						 
					 
					
						
						
							
							first few LES tests, fix get_header logic bug  
						
						
						
					 
					
						2016-12-08 12:20:18 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							3ebfa1481d 
							
						 
					 
					
						
						
							
							better proposal block handling  
						
						
						
					 
					
						2016-12-08 12:03:34 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8903384840 
							
						 
					 
					
						
						
							
							Merge branch 'master' into check-updates  
						
						
						
					 
					
						2016-12-07 19:19:44 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							a296c5e226 
							
						 
					 
					
						
						
							
							test client message handling  
						
						
						
					 
					
						2016-12-07 11:38:09 +01:00