| 
							
							
								 Gav Wood | a74bce2c06 | Merge pull request #3759 from ethcore/auth-bft Tendermint Engine | 2016-12-15 13:18:15 +01:00 |  | 
			
				
					| 
							
							
								 Vincent Serpoul | 339b889ac4 | spelling (#3839) | 2016-12-14 15:15:19 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 80d6e49070 | Merge pull request #3812 from ethereumproject/splix/classic-replay-protection Network configuration for Ethereum Classic | 2016-12-13 17:39:33 +01:00 |  | 
			
				
					| 
							
							
								 keorn | fa504e510f | Merge branch 'master' into auth-bft | 2016-12-12 21:28:46 +01:00 |  | 
			
				
					| 
							
							
								 Igor Artamonov | e61d14d7f7 | reuse Morden for Classic Testnet | 2016-12-12 19:50:32 +00: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 |  | 
			
				
					| 
							
							
								 Igor Artamonov | aed633d7df | Testnet for Ethereum Classic | 2016-12-11 19:25:02 +06:00 |  | 
			
				
					| 
							
							
								 arkpar | a56443aa6c | Tolerate error is user_defaults | 2016-12-11 13:00:49 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | c777362d02 | Sync channel for consensus test | 2016-12-11 12:32:01 +01:00 |  | 
			
				
					| 
							
							
								 keorn | f3af0f46be | Merge branch 'master' into auth-bft | 2016-12-10 18:14:35 +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 |  | 
			
				
					| 
							
							
								 keorn | fb71caffbd | remove double registration | 2016-12-09 11:05:44 +01:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | eec1929658 | Merge branch 'master' into lightserv | 2016-12-09 01:29:46 +01:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | 6f5f1f5e26 | light: integrate with sync + serve_light CLI | 2016-12-08 23:21:47 +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 | aa9caac750 | revert cli default | 2016-12-07 15:36:20 +01:00 |  | 
			
				
					| 
							
							
								 keorn | e9743a3a75 | Merge branch 'master' into auth-bft | 2016-12-07 14:50:17 +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 |  | 
			
				
					| 
							
							
								 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 | b089aa7a6b | fix password loading | 2016-12-06 08:38:41 +00:00 |  | 
			
				
					| 
							
							
								 keorn | 0a2ec319ac | rename to engine_signer | 2016-12-05 21:31:38 +00:00 |  | 
			
				
					| 
							
							
								 keorn | 5e7c21ad4a | add a cli flag | 2016-12-05 19:23:03 +00: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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Robert Habermeier | 767d486014 | fix config test | 2016-12-05 14:12:40 +01:00 |  | 
			
				
					| 
							
							
								 keorn | c946ffebf3 | Merge branch 'master' into auth-bft | 2016-12-05 11:30:11 +00:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 2911c549e3 | Encode networkid as a u64. | 2016-12-04 10:48:26 -08:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | 80f98bc8b7 | fix tests | 2016-12-02 18:52:02 +01:00 |  | 
			
				
					| 
							
							
								 Robert Habermeier | cd5b6fdf59 | queue: CLI for auto-scaling and num verifiers | 2016-12-02 18:21:54 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 1dd13372b6 | Merge remote-tracking branch 'origin/master' into rpc-middleware | 2016-12-01 19:43:31 -08:00 |  | 
			
				
					| 
							
							
								 keorn | 155da50fcd | Merge branch 'master' into auth-bft | 2016-11-30 13:06:21 +00:00 |  | 
			
				
					| 
							
							
								 keorn | 4ef5badcea | fix parity tests merge | 2016-11-30 12:58:45 +00:00 |  | 
			
				
					| 
							
							
								 Gav Wood | d525a6d7f0 | Merge pull request #3654 from ethcore/clippy-bump Bumping clippy | 2016-11-29 18:00:13 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 9115214cea | Merge pull request #3636 from ethcore/fatdb Return of the Fat DB | 2016-11-29 16:47:09 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | c97c59f62f | returning errors with extra fields in config file (#3663) | 2016-11-29 13:23:28 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 2b3d100de2 | Fixing some clippy warnings | 2016-11-28 15:54:22 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | dfd17949ef | Added a test | 2016-11-28 12:08:12 +01:00 |  | 
			
				
					| 
							
							
								 keorn | 5c0e89ae9a | Merge branch 'master' into auth-bft | 2016-11-28 09:50:22 +00:00 |  | 
			
				
					| 
							
							
								 arkpar | fa45413a90 | Extened API | 2016-11-28 01:37:25 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | c7b359fcee | Style | 2016-11-28 01:37:25 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | d0c80a6903 | Updated tests | 2016-11-28 01:37:25 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 3aceac60de | Use sha3 for fat key | 2016-11-28 01:37:24 +01:00 |  |