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 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							d0194f3ad3 
							
						 
					 
					
						
						
							
							Merge branch 'master' into lightsync  
						
						
						
					 
					
						2016-12-23 13:39:06 +01:00 
						 
				 
			
				
					
						
							
							
								Nikolay Volf 
							
						 
					 
					
						
						
						
						
							
						
						
							af501e6467 
							
						 
					 
					
						
						
							
							Custom attribute for binary serialization  ( #3922 )  
						
						... 
						
						
						
						* derive(Binary) -> binary
* ethcore types refact
* fixup ethcore
* make binary optional
* fix common types
* fix updater
* remove condition 
						
					 
					
						2016-12-21 15:09:35 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							a48435ca60 
							
						 
					 
					
						
						
							
							Merge branch 'master' into lightsync  
						
						
						
					 
					
						2016-12-19 13:15:37 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							d765611050 
							
						 
					 
					
						
						
							
							allow queue to drain fully when idle  
						
						
						
					 
					
						2016-12-19 12:41:00 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							ccdf5d5873 
							
						 
					 
					
						
						
							
							increase tick timer and limit peers to one req  
						
						
						
					 
					
						2016-12-19 12:28:42 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							893892ca12 
							
						 
					 
					
						
						
							
							remove request limiting from sync service  
						
						
						
					 
					
						2016-12-17 00:31:21 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							be914ddfc7 
							
						 
					 
					
						
						
							
							fix check for moving backwards  
						
						
						
					 
					
						2016-12-16 23:53:36 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							e57ab96731 
							
						 
					 
					
						
						
							
							fix reverse start block check  
						
						
						
					 
					
						2016-12-16 23:21:59 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							08587a1f56 
							
						 
					 
					
						
						
							
							fix subchain request ordering  
						
						
						
					 
					
						2016-12-16 23:21:51 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							653363c572 
							
						 
					 
					
						
						
							
							limit to one pending request per peer  
						
						
						
					 
					
						2016-12-16 23:21:17 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							a7505be627 
							
						 
					 
					
						
						
							
							fix deadlocks  
						
						
						
					 
					
						2016-12-16 22:09:29 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							8b88ef1844 
							
						 
					 
					
						
						
							
							add light sync service to ethsync  
						
						
						
					 
					
						2016-12-16 17:38:16 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							f85313fbff 
							
						 
					 
					
						
						
							
							Merge branch 'master' into lightsync  
						
						
						
					 
					
						2016-12-16 15:29:11 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							ce84215d93 
							
						 
					 
					
						
						
							
							naive and bad request dispatcher  
						
						
						
					 
					
						2016-12-16 15:26:39 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							65f07e5aa7 
							
						 
					 
					
						
						
							
							Renamed some functions  
						
						
						
					 
					
						2016-12-16 14:54:26 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							0d7b638a2d 
							
						 
					 
					
						
						
							
							ancestor search  response handler  
						
						
						
					 
					
						2016-12-16 14:53:36 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							6e5a583cb4 
							
						 
					 
					
						
						
							
							Merge pull request  #3505  from ethcore/check-updates  
						
						... 
						
						
						
						Auto-updating 
						
					 
					
						2016-12-16 13:01:49 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b437265082 
							
						 
					 
					
						
						
							
							Fix build.  
						
						
						
					 
					
						2016-12-16 11:27:00 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							396ab5b361 
							
						 
					 
					
						
						
							
							Refactor and make is_syncing.  
						
						
						
					 
					
						2016-12-16 10:31:10 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							a1f32de2d9 
							
						 
					 
					
						
						
							
							Merge branch 'master' into lightsync  
						
						
						
					 
					
						2016-12-15 23:55:04 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							447196398a 
							
						 
					 
					
						
						
							
							fix start_step  
						
						
						
					 
					
						2016-12-15 23:36:06 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							8622ab66dc 
							
						 
					 
					
						
						
							
							skeleton for maintain_sync: all but dispatch  
						
						
						
					 
					
						2016-12-15 22:42:24 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							9c7340307e 
							
						 
					 
					
						
						
							
							handle events, minimal state machine  
						
						
						
					 
					
						2016-12-15 21:51:08 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							f8961484c1 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:ethcore/parity into tx-block  
						
						
						
					 
					
						2016-12-15 19:10:33 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							5346539ef8 
							
						 
					 
					
						
						
							
							minimal header import and client service  
						
						
						
					 
					
						2016-12-15 18:47:26 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							2952ea1b85 
							
						 
					 
					
						
						
							
							Delayed transactions  
						
						
						
					 
					
						2016-12-15 18:19:19 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							f776f48023 
							
						 
					 
					
						
						
							
							drain prepared headers from sync round  
						
						
						
					 
					
						2016-12-15 17:33:25 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							71e96aca10 
							
						 
					 
					
						
						
							
							handle abandoned requests  
						
						
						
					 
					
						2016-12-15 16:19:28 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							ec88a992e3 
							
						 
					 
					
						
						
							
							provide response context to response handler  
						
						
						
					 
					
						2016-12-15 15:50:36 +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 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							5d8bfd8758 
							
						 
					 
					
						
						
							
							handle responses for round scaffold and frames  
						
						
						
					 
					
						2016-12-15 13:05:38 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							0768a61944 
							
						 
					 
					
						
						
							
							light: add LightChainClient trait  
						
						
						
					 
					
						2016-12-14 23:26:15 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							1bcfc9348d 
							
						 
					 
					
						
						
							
							light: specialize Downloader to SyncRound  
						
						
						
					 
					
						2016-12-14 23:25:51 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							91b8fa7039 
							
						 
					 
					
						
						
							
							light: downloader state machine stub  
						
						
						
					 
					
						2016-12-14 22:57:30 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							0d466fa8d0 
							
						 
					 
					
						
						
							
							light: tests for response module  
						
						
						
					 
					
						2016-12-14 20:27:03 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							887bcfb88a 
							
						 
					 
					
						
						
							
							light: response decoding and verification module  
						
						
						
					 
					
						2016-12-14 19:36:48 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							359d433292 
							
						 
					 
					
						
						
							
							light: pass incoming responses to peer state machine  
						
						
						
					 
					
						2016-12-13 22:26:06 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							6fb71527e4 
							
						 
					 
					
						
						
							
							light: search for common ancestor with peers  
						
						
						
					 
					
						2016-12-13 21:09:57 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							8c64400654 
							
						 
					 
					
						
						
							
							light: change sync module name  
						
						
						
					 
					
						2016-12-13 21:09:43 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							49ae375605 
							
						 
					 
					
						
						
							
							Don't coneect peers on each sync  
						
						
						
					 
					
						2016-12-13 13:23:10 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							c2264bed27 
							
						 
					 
					
						
						
							
							light: skeleton for sync service  
						
						
						
					 
					
						2016-12-13 00:08:39 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							fa504e510f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-12-12 21:28:46 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							19adb84527 
							
						 
					 
					
						
						
							
							TestNet flushing and cleanup  
						
						
						
					 
					
						2016-12-12 19:44:24 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							722cd4d086 
							
						 
					 
					
						
						
							
							AuthorityRound fork test  
						
						
						
					 
					
						2016-12-12 17:24:48 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ab4d666681 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into check-updates  
						
						
						
					 
					
						2016-12-12 16:35:11 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							8ed89bb74f 
							
						 
					 
					
						
						
							
							propagate proposal to all peers  
						
						
						
					 
					
						2016-12-12 13:00:51 +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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							a4bf914683 
							
						 
					 
					
						
						
							
							Merge branch 'auth-bft' of  https://github.com/ethcore/parity  into auth-bft  
						
						
						
					 
					
						2016-12-11 18:23:54 +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 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							c777362d02 
							
						 
					 
					
						
						
							
							Sync channel for consensus test  
						
						
						
					 
					
						2016-12-11 12:32:01 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							19ca9ad460 
							
						 
					 
					
						
						
							
							Prevent broadcasting transactions to peer that send them.  
						
						
						
					 
					
						2016-12-10 21:22:19 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							f3af0f46be 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-12-10 18:14:35 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							1611d190ba 
							
						 
					 
					
						
						
							
							initial tendetmint consensus test  
						
						
						
					 
					
						2016-12-10 17:40:53 +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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							762e5f1e3e 
							
						 
					 
					
						
						
							
							proposed block sync tests  
						
						
						
					 
					
						2016-12-09 12:05:56 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							e7ce8c9558 
							
						 
					 
					
						
						
							
							light: broadcast status updates to peers  
						
						
						
					 
					
						2016-12-08 23:57:09 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							6f5f1f5e26 
							
						 
					 
					
						
						
							
							light: integrate with sync + serve_light CLI  
						
						
						
					 
					
						2016-12-08 23:21:47 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							efd66f566d 
							
						 
					 
					
						
						
							
							ethsync: optional ipc codegen  
						
						
						
					 
					
						2016-12-08 19:52:48 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							3ebfa1481d 
							
						 
					 
					
						
						
							
							better proposal block handling  
						
						
						
					 
					
						2016-12-08 12:03:34 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							cdc758368a 
							
						 
					 
					
						
						
							
							les: flesh out event handler  
						
						
						
					 
					
						2016-12-07 13:52:45 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							6fc943ca6d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-12-05 16:37:35 +00:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							43ec3d8f79 
							
						 
					 
					
						
						
							
							network_id -> u64  
						
						
						
					 
					
						2016-12-05 06:54:31 -08:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							c946ffebf3 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-12-05 11:30:11 +00:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							4eca687bbb 
							
						 
					 
					
						
						
							
							Fixed network context  
						
						
						
					 
					
						2016-12-01 15:49:26 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							b7dc60ace5 
							
						 
					 
					
						
						
							
							Don't share the snapshot while downloading old blocks  
						
						
						
					 
					
						2016-11-30 23:33:17 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							84cf27c3ef 
							
						 
					 
					
						
						
							
							Advertise protocol version 2  
						
						
						
					 
					
						2016-11-30 16:48:30 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							61f1699c0e 
							
						 
					 
					
						
						
							
							fix merge  
						
						
						
					 
					
						2016-11-30 13:39:28 +00:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							155da50fcd 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-11-30 13:06:21 +00:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							d525a6d7f0 
							
						 
					 
					
						
						
							
							Merge pull request  #3654  from ethcore/clippy-bump  
						
						... 
						
						
						
						Bumping clippy 
						
					 
					
						2016-11-29 18:00:13 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							95f81b2a2f 
							
						 
					 
					
						
						
							
							Moved consensus networking into Parity handler  
						
						
						
					 
					
						2016-11-29 16:54:30 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							7c2cccc60c 
							
						 
					 
					
						
						
							
							Merge pull request  #3655  from ethcore/sync  
						
						... 
						
						
						
						Disable peer if no common block found 
						
					 
					
						2016-11-29 12:10:19 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							44314c5d02 
							
						 
					 
					
						
						
							
							Merge branch 'master' into clippy-bump  
						
						... 
						
						
						
						Conflicts:
	rpc/src/v1/types/filter.rs 
						
					 
					
						2016-11-29 11:56:55 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							64b1b898f1 
							
						 
					 
					
						
						
							
							Fixing compilation on stable  
						
						
						
					 
					
						2016-11-28 17:43:38 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							bae8acee74 
							
						 
					 
					
						
						
							
							Allow pv62 peers  
						
						
						
					 
					
						2016-11-28 17:24:02 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							cf5b409fed 
							
						 
					 
					
						
						
							
							Disaable peer if no common block found  
						
						
						
					 
					
						2016-11-28 16:30:36 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							2b3d100de2 
							
						 
					 
					
						
						
							
							Fixing some clippy warnings  
						
						
						
					 
					
						2016-11-28 15:54:22 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							e1e7886918 
							
						 
					 
					
						
						
							
							Bumping clippy  
						
						
						
					 
					
						2016-11-28 12:23:06 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							a143da2cb8 
							
						 
					 
					
						
						
							
							fix complete build  
						
						
						
					 
					
						2016-11-25 11:36:25 +00:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							1692c07ba6 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-11-25 10:51:06 +00:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							7da8f019d5 
							
						 
					 
					
						
						
							
							--no-ancient-blocks  
						
						
						
					 
					
						2016-11-22 18:15:55 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							6e0bd4072b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-11-21 12:17:00 +00:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							0848a9ec3c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into transactions-propagate  
						
						
						
					 
					
						2016-11-20 13:24:08 +01:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							9c62dd3916 
							
						 
					 
					
						
						
							
							Limit sync reorg to 20 blocks ( #3519 )  
						
						... 
						
						
						
						* Limit sync reorg
* Fixed tests 
						
					 
					
						2016-11-18 19:17:35 +01:00