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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							cee07fef74 
							
						 
					 
					
						
						
							
							Trigger remove_old on new block  
						
						 
						
						
						
					 
					
						2016-12-09 15:54:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							5d054f08c3 
							
						 
					 
					
						
						
							
							Clearing old transactions  
						
						 
						
						
						
					 
					
						2016-12-09 15:05:03 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							2d6656fc43 
							
						 
					 
					
						
						
							
							Merge pull request  #3725  from ethcore/engine-password  
						
						 
						
						... 
						
						
						
						Make engine hold AccountProvider 
						
					 
					
						2016-12-08 20:52:12 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							7c054d2da0 
							
						 
					 
					
						
						
							
							Remove unneeded block scope  
						
						 
						
						
						
					 
					
						2016-12-07 17:07:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaco Greeff 
							
						 
					 
					
						
						
						
						
							
						
						
							46840d36c9 
							
						 
					 
					
						
						
							
							Add parity_removeAddress RPC  
						
						 
						
						
						
					 
					
						2016-12-07 16:53:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							727ace0561 
							
						 
					 
					
						
						
							
							add test  
						
						 
						
						
						
					 
					
						2016-12-07 15:14:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							5faa4a85cb 
							
						 
					 
					
						
						
							
							remove dummy type  
						
						 
						
						
						
					 
					
						2016-12-07 14:49:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							1f0a02b638 
							
						 
					 
					
						
						
							
							Merge pull request  #3633  from ethcore/fix-tx-rpc  
						
						 
						
						... 
						
						
						
						Fix up the transaction JSON serialisation for RPC. 
						
					 
					
						2016-12-07 14:34:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							89726356a3 
							
						 
					 
					
						
						
							
							Merge pull request  #3709  from ethcore/opt-in-verifier-scaling  
						
						 
						
						... 
						
						
						
						queue: CLI for auto-scaling and num verifiers 
						
					 
					
						2016-12-07 13:40:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							3ae09de019 
							
						 
					 
					
						
						
							
							restore is_new_best  
						
						 
						
						
						
					 
					
						2016-12-07 11:40:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							b38d95328d 
							
						 
					 
					
						
						
							
							light: conditional compilation  
						
						 
						
						
						
					 
					
						2016-12-07 10:50:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							71a96588b0 
							
						 
					 
					
						
						
							
							add the methods to engines  
						
						 
						
						
						
					 
					
						2016-12-07 10:34:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							085b8ad553 
							
						 
					 
					
						
						
							
							Merge pull request  #3527  from ethcore/client-provider  
						
						 
						
						... 
						
						
						
						LES Part 2 
						
					 
					
						2016-12-07 09:31:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							398b94e6e2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into opt-in-verifier-scaling  
						
						 
						
						
						
					 
					
						2016-12-06 15:37:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							0a2ec319ac 
							
						 
					 
					
						
						
							
							rename to engine_signer  
						
						 
						
						
						
					 
					
						2016-12-05 21:31:38 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							92d566c900 
							
						 
					 
					
						
						
							
							Merge branch 'master' into engine-password  
						
						 
						
						
						
					 
					
						2016-12-05 19:30:08 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ff7b918d82 
							
						 
					 
					
						
						
							
							Fix build.  
						
						 
						
						
						
					 
					
						2016-12-05 10:55:53 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							5e1fdc4b11 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into fix-tx-rpc  
						
						 
						
						
						
					 
					
						2016-12-05 10:44:19 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							ad36743122 
							
						 
					 
					
						
						
							
							Merge pull request  #3719  from ethcore/engine-block-ordering  
						
						 
						
						... 
						
						
						
						Engine block ordering 
						
					 
					
						2016-12-05 10:37:36 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							01bf483b63 
							
						 
					 
					
						
						
							
							remove unnecessary impls  
						
						 
						
						
						
					 
					
						2016-12-05 17:29:47 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							1b6ebe1a6d 
							
						 
					 
					
						
						
							
							possible fix for queue drop deadlock ( #3702 )  
						
						 
						
						... 
						
						
						
						* possible fix for #3686 
* queue: simplify conclusion, don't block on joining
* queue: park verifiers with timeout to prevent race
* more robust verification loop
* queue: re-introduce wait for verifier joining 
						
					 
					
						2016-12-05 18:18:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							81a756394a 
							
						 
					 
					
						
						
							
							Merge branch 'master' into engine-password  
						
						 
						
						
						
					 
					
						2016-12-05 17:08:57 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							529a7fc33c 
							
						 
					 
					
						
						
							
							add password and AccountProvider  
						
						 
						
						
						
					 
					
						2016-12-05 17:08:16 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							a726472023 
							
						 
					 
					
						
						
							
							Merge pull request  #3713  from ethcore/fix-v-u64  
						
						 
						
						... 
						
						
						
						Encode networkid as a u64. 
						
					 
					
						2016-12-05 17:14:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							a6c2408562 
							
						 
					 
					
						
						
							
							IPC codegen in ethcore-light; remove network dependency  
						
						 
						
						
						
					 
					
						2016-12-05 16:56:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							61c3358447 
							
						 
					 
					
						
						
							
							move light to its own crate again  
						
						 
						
						
						
					 
					
						2016-12-05 16:55:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							53b479fb7a 
							
						 
					 
					
						
						
							
							pass engine to snapshot service  
						
						 
						
						
						
					 
					
						2016-12-05 15:43:46 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							94302f3f61 
							
						 
					 
					
						
						
							
							throw out difficulty checks  
						
						 
						
						
						
					 
					
						2016-12-05 15:27:44 +00:00