Gav Wood
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							d455ac4a40
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc
						
						
						
						
						
					 | 
					
						2016-12-15 17:12:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							20b2f84d48
							
						
					 | 
					
						
						
							
							Merge pull request #3828 from ethcore/new-dirs
						
						
						
						
						
						
						
						New directory structure 
						
					 | 
					
						2016-12-15 14:34:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							1ea521ea7d
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc
						
						
						
						
						
					 | 
					
						2016-12-15 13:51: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							f686fa3d6f
							
						
					 | 
					
						
						
							
							update specs and generic conversion
						
						
						
						
						
					 | 
					
						2016-12-14 12:50:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							ae98a56e8b
							
						
					 | 
					
						
						
							
							revert submodule
						
						
						
						
						
					 | 
					
						2016-12-14 11:42:47 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Artamonov
							
						 
					 | 
					
						
						
						
						
							
						
						
							e61d14d7f7
							
						
					 | 
					
						
						
							
							reuse Morden for Classic Testnet
						
						
						
						
						
					 | 
					
						2016-12-12 19:50:32 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							6601fde328
							
						
					 | 
					
						
						
							
							New data paths with upgrade
						
						
						
						
						
					 | 
					
						2016-12-12 16:51:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Artamonov
							
						 
					 | 
					
						
						
						
						
							
						
						
							6742b080f5
							
						
					 | 
					
						
						
							
							use decimals for block numbers in config
						
						
						
						
						
					 | 
					
						2016-12-11 20:38:37 +06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Artamonov
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e3c49c809
							
						
					 | 
					
						
						
							
							revert ETC to correct Network ID
						
						
						
						
						
					 | 
					
						2016-12-11 20:34:46 +06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Artamonov
							
						 
					 | 
					
						
						
						
						
							
						
						
							aed633d7df
							
						
					 | 
					
						
						
							
							Testnet for Ethereum Classic
						
						
						
						
						
					 | 
					
						2016-12-11 19:25:02 +06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Artamonov
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b5bc115e9
							
						
					 | 
					
						
						
							
							EIP-160 configuration for Ethereum Classic
						
						
						
						
						
					 | 
					
						2016-12-11 18:29:40 +06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Artamonov
							
						 
					 | 
					
						
						
						
						
							
						
						
							592ff53bab
							
						
					 | 
					
						
						
							
							EIP-155 configuration for Ethereum Classic
						
						
						
						
						
					 | 
					
						2016-12-11 18:28:37 +06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							f3af0f46be
							
						
					 | 
					
						
						
							
							Merge branch 'master' into auth-bft
						
						
						
						
						
					 | 
					
						2016-12-10 18:14:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							02c788a403
							
						
					 | 
					
						
						
							
							Network connectivity fixes
						
						
						
						
						
					 | 
					
						2016-12-10 14:20:34 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							6fc943ca6d
							
						
					 | 
					
						
						
							
							Merge branch 'master' into auth-bft
						
						
						
						
						
					 | 
					
						2016-12-05 16:37:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							db59bd8731
							
						
					 | 
					
						
						
							
							update genesis seal
						
						
						
						
						
					 | 
					
						2016-12-05 14:28:50 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							c39d504167
							
						
					 | 
					
						
						
							
							Merge branch 'spec-rlp-loading' into auth-bft
						
						
						
						
						
					 | 
					
						2016-12-05 14:11:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							22632e6324
							
						
					 | 
					
						
						
							
							make generic seal take valid rlp
						
						
						
						
						
					 | 
					
						2016-12-05 14:07:31 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							b30c1d5602
							
						
					 | 
					
						
						
							
							fix tests
						
						
						
						
						
					 | 
					
						2016-12-05 13:24:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							c946ffebf3
							
						
					 | 
					
						
						
							
							Merge branch 'master' into auth-bft
						
						
						
						
						
					 | 
					
						2016-12-05 11:30:11 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							f1542b5612
							
						
					 | 
					
						
						
							
							better genesis seal rlp
						
						
						
						
						
					 | 
					
						2016-12-03 16:19:51 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							1dd13372b6
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into rpc-middleware
						
						
						
						
						
					 | 
					
						2016-12-01 19:43:31 -08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c0e89ae9a
							
						
					 | 
					
						
						
							
							Merge branch 'master' into auth-bft
						
						
						
						
						
					 | 
					
						2016-11-28 09:50:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							ffa123c949
							
						
					 | 
					
						
						
							
							Set default tx price to 0.0025 USD
						
						
						
						
						
					 | 
					
						2016-11-25 15:13:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							d0312b89ad
							
						
					 | 
					
						
						
							
							Update test, fix number. (#3612)
						
						
						
						
						
					 | 
					
						2016-11-25 13:03:15 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							1692c07ba6
							
						
					 | 
					
						
						
							
							Merge branch 'master' into auth-bft
						
						
						
						
						
					 | 
					
						2016-11-25 10:51:06 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							da499b0a4a
							
						
					 | 
					
						
						
							
							self contained test proposal
						
						
						
						
						
					 | 
					
						2016-11-24 19:59:08 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							a3730b3042
							
						
					 | 
					
						
						
							
							change proposer address
						
						
						
						
						
					 | 
					
						2016-11-24 13:56:27 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							d5b15d4560
							
						
					 | 
					
						
						
							
							change authorities for testing
						
						
						
						
						
					 | 
					
						2016-11-22 17:15:42 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							340d377930
							
						
					 | 
					
						
						
							
							Revert "dont keep account provider in miner"
						
						
						
						
						
						
						
						This reverts commit 11ccacd6d0. 
						
					 | 
					
						2016-11-22 16:05:27 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							818e54d44e
							
						
					 | 
					
						
						
							
							Merge pull request #3547 from ethcore/fix-flaky-auth
						
						
						
						
						
						
						
						Fix flaky test 
						
					 | 
					
						2016-11-22 00:01:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jaco Greeff
							
						 
					 | 
					
						
						
						
						
							
						
						
							af0db9f80e
							
						
					 | 
					
						
						
							
							New registry contract address for ropsten (#3549)
						
						
						
						
						
						
						
						* New registry for ropsten
* Registry address
* Registry with payable modifier 
						
					 | 
					
						2016-11-21 18:14:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							6e0bd4072b
							
						
					 | 
					
						
						
							
							Merge branch 'master' into auth-bft
						
						
						
						
						
					 | 
					
						2016-11-21 12:17:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							c6db157554
							
						
					 | 
					
						
						
							
							fix flaky test, clean up specs
						
						
						
						
						
					 | 
					
						2016-11-21 12:06:14 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							efd1d9bd0e
							
						
					 | 
					
						
						
							
							Ropsten network (#3539)
						
						
						
						
						
						
						
						* Ropsten network
* Sorted premine
* Comas
* Removed trailing coma 
						
					 | 
					
						2016-11-20 16:38:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Konstantin
							
						 
					 | 
					
						
						
						
						
							
						
						
							d870b71636
							
						
					 | 
					
						
						
							
							updated the european warp bootnode addresses (#3528)
						
						
						
						
						
					 | 
					
						2016-11-18 19:41:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							e45fa62ed5
							
						
					 | 
					
						
						
							
							Fixing tests, fixing refreshing precompiled (#3483)
						
						
						
						
						
						
						
						* Fixing tests, fixing refreshing precompiled
* Commit only js and Cargo.lock
* Moving commands to the right place
* Adding js content as well 
						
					 | 
					
						2016-11-17 10:58:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GitLab Build Bot
							
						 
					 | 
					
						
						
						
						
							
						
						
							a7574a1108
							
						
					 | 
					
						
						
							
							[ci skip] js-precompiled 20161116-161024
						
						
						
						
						
					 | 
					
						2016-11-16 16:12:55 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								keorn
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ac989cbeb
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'parity/master' into bft
						
						
						
						
						
					 | 
					
						2016-11-16 10:29:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							a5c6cc34cf
							
						
					 | 
					
						
						
							
							Merge pull request #3466 from ethcore/hf2-block-num
						
						
						
						
						
						
						
						Set HF2 block number 
						
					 | 
					
						2016-11-16 11:21:59 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							1daba384cc
							
						
					 | 
					
						
						
							
							Merge pull request #3426 from ethcore/auth-round
						
						
						
						
						
						
						
						Authority round consensus engine 
						
					 | 
					
						2016-11-16 11:18:01 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							be4311540d
							
						
					 | 
					
						
						
							
							Set HF block number
						
						
						
						
						
					 | 
					
						2016-11-15 22:04:25 +01:00 | 
					
					
						
						
							
							
							
						
					 |