keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							afc4cd2785 
							
						 
					 
					
						
						
							
							Allow contract constructors in chain spec ( #3932 )  
						
						... 
						
						
						
						* constructor spec
* execute under wrong address
* create under correct address
* revert
* move genesis block lookup
* remove env_logger 
						
					 
					
						2016-12-23 18:44:39 +01:00 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Igor Artamonov 
							
						 
					 
					
						
						
						
						
							
						
						
							be75cbfaaa 
							
						 
					 
					
						
						
							
							set CHAIN_ID for Classic ( #3934 )  
						
						... 
						
						
						
						* configurable CHAIN_ID
* set CHAIN_ID for Ethereum Classic 
						
					 
					
						2016-12-22 13:10:58 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							552a772cc1 
							
						 
					 
					
						
						
							
							make fields defaulting to 0 optional  
						
						
						
					 
					
						2016-12-22 07:06:40 +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 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							18965be047 
							
						 
					 
					
						
						
							
							Merge pull request  #3903  from ethcore/test-mem-limit-deadlock  
						
						... 
						
						
						
						fix deadlock in queue drop 
						
					 
					
						2016-12-19 22:23:56 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							ae8f77bc7c 
							
						 
					 
					
						
						
							
							fix deadlock in queue drop  
						
						
						
					 
					
						2016-12-19 18:10:26 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							d3486b45c5 
							
						 
					 
					
						
						
							
							Allow retry for future blocks  
						
						
						
					 
					
						2016-12-19 14:47:48 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							e755c09446 
							
						 
					 
					
						
						
							
							Merge pull request  #3884  from ethcore/fix-diff-adj  
						
						... 
						
						
						
						Fix difficulty adjustment. 
						
					 
					
						2016-12-17 16:35:20 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							023d413610 
							
						 
					 
					
						
						
							
							Fix difficulty adjustment.  
						
						... 
						
						
						
						Closes  #3861  
					
						2016-12-17 15:53:06 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							b34d3ee5a2 
							
						 
					 
					
						
						
							
							Fixin racy test  
						
						
						
					 
					
						2016-12-17 12:28:31 +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 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							f967713d08 
							
						 
					 
					
						
						
							
							Added a test  
						
						
						
					 
					
						2016-12-16 13:27:14 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							6e5a583cb4 
							
						 
					 
					
						
						
							
							Merge pull request  #3505  from ethcore/check-updates  
						
						... 
						
						
						
						Auto-updating 
						
					 
					
						2016-12-16 13:01:49 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							d8470cc5ca 
							
						 
					 
					
						
						
							
							revert slack  
						
						
						
					 
					
						2016-12-16 00:07:07 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							447196398a 
							
						 
					 
					
						
						
							
							fix start_step  
						
						
						
					 
					
						2016-12-15 23:36:06 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ca0d87da10 
							
						 
					 
					
						
						
							
							125 -> 69.  
						
						
						
					 
					
						2016-12-15 22:05:54 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							060cc799a6 
							
						 
					 
					
						
						
							
							Minor tweaks  
						
						
						
					 
					
						2016-12-15 21:44:31 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							27580586e0 
							
						 
					 
					
						
						
							
							Minor tweaks  
						
						
						
					 
					
						2016-12-15 20:09:05 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							b7b531ca75 
							
						 
					 
					
						
						
							
							more slack in test  
						
						
						
					 
					
						2016-12-15 19:54:28 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							b88d50dc9b 
							
						 
					 
					
						
						
							
							fix naming collision  
						
						
						
					 
					
						2016-12-15 19:27:06 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							f8961484c1 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:ethcore/parity into tx-block  
						
						
						
					 
					
						2016-12-15 19:10:33 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c12702fc51 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into check-updates  
						
						
						
					 
					
						2016-12-15 18:23:02 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							2952ea1b85 
							
						 
					 
					
						
						
							
							Delayed transactions  
						
						
						
					 
					
						2016-12-15 18:19:19 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d455ac4a40 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc  
						
						
						
					 
					
						2016-12-15 17:12:18 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							db2e1dd01a 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into check-updates  
						
						
						
					 
					
						2016-12-15 17:11:22 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							2e02db2d3e 
							
						 
					 
					
						
						
							
							Merge pull request  #3860  from ethcore/fix-channel  
						
						... 
						
						
						
						Fix flaky test 
						
					 
					
						2016-12-15 17:10:41 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							ee653bc262 
							
						 
					 
					
						
						
							
							unused import  
						
						
						
					 
					
						2016-12-15 16:53:28 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							9bfa69c6bd 
							
						 
					 
					
						
						
							
							fix channel  
						
						
						
					 
					
						2016-12-15 16:52:39 +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 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							590428e7f2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into check-updates  
						
						
						
					 
					
						2016-12-15 15:12:09 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							20b2f84d48 
							
						 
					 
					
						
						
							
							Merge pull request  #3828  from ethcore/new-dirs  
						
						... 
						
						
						
						New directory structure 
						
					 
					
						2016-12-15 14:34:01 +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 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1ea521ea7d 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc  
						
						
						
					 
					
						2016-12-15 13:51:22 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							0b9ab0797f 
							
						 
					 
					
						
						
							
							fix build  
						
						
						
					 
					
						2016-12-15 13:45:22 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							943efc21bb 
							
						 
					 
					
						
						
							
							add tendermint seal  
						
						
						
					 
					
						2016-12-15 13:41:04 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							69eec105a7 
							
						 
					 
					
						
						
							
							Change default back to permissive for now.  
						
						
						
					 
					
						2016-12-15 13:40:44 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							db73b0d66f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc  
						
						
						
					 
					
						2016-12-15 13:28:37 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							a74bce2c06 
							
						 
					 
					
						
						
							
							Merge pull request  #3759  from ethcore/auth-bft  
						
						... 
						
						
						
						Tendermint Engine 
						
					 
					
						2016-12-15 13:18:15 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							a660024eac 
							
						 
					 
					
						
						
							
							Merge pull request  #3843  from ethcore/auth-round-seal  
						
						... 
						
						
						
						AuthorityRound seal and simplify Generic seal Spec 
						
					 
					
						2016-12-15 13:08:50 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							c4406c9198 
							
						 
					 
					
						
						
							
							Merge pull request  #3691  from ethcore/rotating-key  
						
						... 
						
						
						
						Signing transactions with rotating token 
						
					 
					
						2016-12-15 13:08:19 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							6e51b23e30 
							
						 
					 
					
						
						
							
							Adding traces tests  
						
						
						
					 
					
						2016-12-14 20:07:33 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							7eb9112613 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rotating-key  
						
						... 
						
						
						
						Conflicts:
	rpc/src/v1/traits/signer.rs 
						
					 
					
						2016-12-14 14:10:44 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							f686fa3d6f 
							
						 
					 
					
						
						
							
							update specs and generic conversion  
						
						
						
					 
					
						2016-12-14 12:50:32 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							e1d83d15b7 
							
						 
					 
					
						
						
							
							bump dev chain  
						
						
						
					 
					
						2016-12-14 11:34:19 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							be5fefe772 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:ethcore/parity into new-dirs  
						
						
						
					 
					
						2016-12-14 00:04:11 +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 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							805b8cab2c 
							
						 
					 
					
						
						
							
							Add missing file.  
						
						
						
					 
					
						2016-12-13 20:50:33 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							4424155d39 
							
						 
					 
					
						
						
							
							Similar checks on file changes to other tests.  
						
						
						
					 
					
						2016-12-13 20:49:26 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							c96826beaa 
							
						 
					 
					
						
						
							
							expect instead of index  
						
						
						
					 
					
						2016-12-13 18:22:56 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							5fd2e15313 
							
						 
					 
					
						
						
							
							Style and docs  
						
						
						
					 
					
						2016-12-12 23:21:44 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							f8ed5cf022 
							
						 
					 
					
						
						
							
							finalize unit tests  
						
						
						
					 
					
						2016-12-12 17:20:20 +01:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							6601fde328 
							
						 
					 
					
						
						
							
							New data paths with upgrade  
						
						
						
					 
					
						2016-12-12 16:51:07 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							988ac8a22d 
							
						 
					 
					
						
						
							
							Add forks supported.  
						
						
						
					 
					
						2016-12-12 16:47:57 +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 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							3c5d5856d2 
							
						 
					 
					
						
						
							
							nicer tracing  
						
						
						
					 
					
						2016-12-11 22:54:48 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							627b8a8414 
							
						 
					 
					
						
						
							
							Changing default policy  
						
						
						
					 
					
						2016-12-11 17:56:12 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							d4c9493b00 
							
						 
					 
					
						
						
							
							verification cache retrieval  
						
						
						
					 
					
						2016-12-11 17:50:12 +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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							c777362d02 
							
						 
					 
					
						
						
							
							Sync channel for consensus test  
						
						
						
					 
					
						2016-12-11 12:32:01 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							1f9adc8622 
							
						 
					 
					
						
						
							
							Merge branch 'master' into txqueue-gc  
						
						... 
						
						
						
						Conflicts:
	ethcore/src/miner/miner.rs 
						
					 
					
						2016-12-10 17:00:29 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							239ba61a99 
							
						 
					 
					
						
						
							
							move transition message to to_step  
						
						
						
					 
					
						2016-12-10 16:50:23 +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 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							27503e8e8c 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rotating-key  
						
						... 
						
						
						
						Conflicts:
	ethstore/src/ethstore.rs
	ethstore/src/secret_store.rs 
						
					 
					
						2016-12-10 15:13:58 +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 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							4696d7f606 
							
						 
					 
					
						
						
							
							Additional RPCs for dapps accounts management  
						
						
						
					 
					
						2016-12-10 12:36:04 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							e5f8044cad 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-12-10 11:01:23 +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 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							b15edd095e 
							
						 
					 
					
						
						
							
							Merge branch 'auth-bft' of  https://github.com/ethcore/parity  into auth-bft  
						
						
						
					 
					
						2016-12-09 20:51:42 +01:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c82754874c 
							
						 
					 
					
						
						
							
							Fix typo.  
						
						
						
					 
					
						2016-12-09 20:48:52 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							08e7e79bfd 
							
						 
					 
					
						
						
							
							more test  
						
						
						
					 
					
						2016-12-09 20:48: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 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							c91a614c3d 
							
						 
					 
					
						
						
							
							Fixing tests  
						
						
						
					 
					
						2016-12-09 20:24:33 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							3ccdb7c143 
							
						 
					 
					
						
						
							
							Fixing unused imports  
						
						
						
					 
					
						2016-12-09 10:52:42 +00:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							42c34b5c1b 
							
						 
					 
					
						
						
							
							ignore flaky test  
						
						
						
					 
					
						2016-12-09 10:53:38 +01:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							930183831b 
							
						 
					 
					
						
						
							
							Adding tests for ethstore  
						
						
						
					 
					
						2016-12-09 09:45:34 +00:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							8596134c0f 
							
						 
					 
					
						
						
							
							Clearer updates handling  
						
						
						
					 
					
						2016-12-09 08:31:58 +00:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							93230dd4c2 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rotating-key  
						
						... 
						
						
						
						Conflicts:
	ethcore/src/account_provider/mod.rs
	rpc/src/v1/types/mod.rs.in 
						
					 
					
						2016-12-09 07:37:34 +00:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							eec1929658 
							
						 
					 
					
						
						
							
							Merge branch 'master' into lightserv  
						
						
						
					 
					
						2016-12-09 01:29:46 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							7c42241466 
							
						 
					 
					
						
						
							
							remove merge code  
						
						
						
					 
					
						2016-12-08 22:00:26 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							74770e4773 
							
						 
					 
					
						
						
							
							better docstrings  
						
						
						
					 
					
						2016-12-08 21:49:55 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							cc284dd86f 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-12-08 21:35:08 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							79ef64349c 
							
						 
					 
					
						
						
							
							remove assert  
						
						
						
					 
					
						2016-12-08 21:27:49 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							9ecb07434f 
							
						 
					 
					
						
						
							
							fix informant  
						
						
						
					 
					
						2016-12-08 21:13:32 +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 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							dca752e9bb 
							
						 
					 
					
						
						
							
							docs, tweaks  
						
						
						
					 
					
						2016-12-08 20:09:30 +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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							347634ac6c 
							
						 
					 
					
						
						
							
							dont rebroadcast propose  
						
						
						
					 
					
						2016-12-07 16:42:58 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							b73689f041 
							
						 
					 
					
						
						
							
							Merge branch 'engine-password' into auth-bft  
						
						
						
					 
					
						2016-12-07 15:17:49 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							727ace0561 
							
						 
					 
					
						
						
							
							add test  
						
						
						
					 
					
						2016-12-07 15:14:21 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							e9743a3a75 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-12-07 14:50:17 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							4361cb53e7 
							
						 
					 
					
						
						
							
							Merge branch 'engine-password' into auth-bft  
						
						
						
					 
					
						2016-12-07 14:49:42 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							5faa4a85cb 
							
						 
					 
					
						
						
							
							remove dummy type  
						
						
						
					 
					
						2016-12-07 14:49:07 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							6440ca2f68 
							
						 
					 
					
						
						
							
							move stuff around  
						
						
						
					 
					
						2016-12-07 14:39:37 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							c582540746 
							
						 
					 
					
						
						
							
							Merge branch 'engine-password' into auth-bft  
						
						
						
					 
					
						2016-12-07 11:41:38 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							3ae09de019 
							
						 
					 
					
						
						
							
							restore is_new_best  
						
						
						
					 
					
						2016-12-07 11:40:46 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							a296c5e226 
							
						 
					 
					
						
						
							
							test client message handling  
						
						
						
					 
					
						2016-12-07 11:38:09 +01:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							b38d95328d 
							
						 
					 
					
						
						
							
							light: conditional compilation  
						
						
						
					 
					
						2016-12-07 10:50:24 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							da030fed51 
							
						 
					 
					
						
						
							
							Merge branch 'master' into auth-bft  
						
						
						
					 
					
						2016-12-07 10:41:07 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							5c333fce31 
							
						 
					 
					
						
						
							
							Merge branch 'engine-password' into auth-bft  
						
						
						
					 
					
						2016-12-07 10:35:52 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							71a96588b0 
							
						 
					 
					
						
						
							
							add the methods to engines  
						
						
						
					 
					
						2016-12-07 10:34:06 +01:00 
						 
				 
			
				
					
						
							
							
								keorn 
							
						 
					 
					
						
						
						
						
							
						
						
							d9eb5e7f1d 
							
						 
					 
					
						
						
							
							remove uncles  
						
						
						
					 
					
						2016-12-07 09:32:36 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							8f641e67f3 
							
						 
					 
					
						
						
							
							Merge branch 'engine-password' into auth-bft  
						
						
						
					 
					
						2016-12-06 13:13:02 +00: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