Svyatoslav Nikolsky
							
						 
					 | 
					
						
						
						
						
							
						
						
							2df61d0a8c
							
						
					 | 
					
						
						
							
							Merge pull request #6411 from paritytech/secretstore_tests
						
						
						
						
						
						
						
						Added missing SecretStore tests - signing session 
						
					 | 
					
						2017-09-05 10:35:21 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Habermeier
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c60f99def
							
						
					 | 
					
						
						
							
							Merge pull request #6370 from paritytech/light-poa
						
						
						
						
						
						
						
						Light-client sync for contract-based PoA 
						
					 | 
					
						2017-09-04 21:20:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fredrik
							
						 
					 | 
					
						
						
						
						
							
						
						
							e54784bfeb
							
						
					 | 
					
						
						
							
							Merge branch 'master' into fo-6418-dont-export-bigint
						
						
						
						
						
						
						
						# Conflicts:
#	dapps/src/tests/helpers/registrar.rs
#	ethcore/evm/src/interpreter/shared_cache.rs
#	ethcore/light/src/client/header_chain.rs
#	ethcore/light/src/client/mod.rs
#	ethcore/light/src/net/mod.rs
#	ethcore/light/src/on_demand/request.rs
#	ethcore/light/src/on_demand/tests.rs
#	ethcore/light/src/provider.rs
#	ethcore/node_filter/src/lib.rs
#	ethcore/src/block.rs
#	ethcore/src/blockchain/blockchain.rs
#	ethcore/src/client/test_client.rs
#	ethcore/src/engines/authority_round/mod.rs
#	ethcore/src/engines/basic_authority.rs
#	ethcore/src/engines/mod.rs
#	ethcore/src/engines/tendermint/mod.rs
#	ethcore/src/engines/validator_set/contract.rs
#	ethcore/src/engines/validator_set/multi.rs
#	ethcore/src/engines/validator_set/safe_contract.rs
#	ethcore/src/engines/vote_collector.rs
#	ethcore/src/miner/external.rs
#	ethcore/src/miner/miner.rs
#	ethcore/src/miner/service_transaction_checker.rs
#	ethcore/src/miner/work_notify.rs
#	ethcore/src/pod_account.rs
#	ethcore/src/pod_state.rs
#	ethcore/src/snapshot/block.rs
#	ethcore/src/snapshot/consensus/work.rs
#	ethcore/src/snapshot/mod.rs
#	ethcore/src/snapshot/service.rs
#	ethcore/src/spec/spec.rs
#	ethcore/src/state/backend.rs
#	ethcore/src/trace/db.rs
#	ethcore/src/verification/queue/mod.rs
#	ethcore/src/verification/verification.rs
#	parity/informant.rs
#	rpc/src/v1/helpers/dispatch.rs
#	rpc/src/v1/helpers/light_fetch.rs
#	rpc/src/v1/helpers/signing_queue.rs
#	rpc/src/v1/impls/eth.rs
#	rpc/src/v1/impls/eth_filter.rs
#	rpc/src/v1/impls/eth_pubsub.rs
#	rpc/src/v1/impls/light/eth.rs
#	rpc/src/v1/impls/signing.rs
#	rpc/src/v1/tests/helpers/miner_service.rs
#	rpc/src/v1/tests/helpers/snapshot_service.rs
#	rpc/src/v1/tests/helpers/sync_provider.rs
#	rpc/src/v1/tests/mocked/eth.rs
#	stratum/src/lib.rs
#	sync/src/blocks.rs
#	sync/src/chain.rs
#	sync/src/light_sync/mod.rs
#	sync/src/tests/helpers.rs
#	sync/src/tests/snapshot.rs
#	updater/src/updater.rs
#	util/src/lib.rs
#	util/triehash/src/lib.rs 
						
					 | 
					
						2017-09-04 18:32:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fredrik
							
						 
					 | 
					
						
						
						
						
							
						
						
							308f36a532
							
						
					 | 
					
						
						
							
							Don't reexport bigint from util
						
						
						
						
						
					 | 
					
						2017-09-04 16:36:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jaco Greeff
							
						 
					 | 
					
						
						
						
						
							
						
						
							a5cc14ce8c
							
						
					 | 
					
						
						
							
							Signer plugin attachment
						
						
						
						
						
					 | 
					
						2017-09-04 16:17:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Habermeier
							
						 
					 | 
					
						
						
						
						
							
						
						
							06e97d107b
							
						
					 | 
					
						
						
							
							fix rwlock import
						
						
						
						
						
					 | 
					
						2017-09-04 14:52:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Habermeier
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ac3dd0889
							
						
					 | 
					
						
						
							
							Merge branch 'light-poa' of github.com:paritytech/parity into light-poa
						
						
						
						
						
					 | 
					
						2017-09-04 12:49:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Habermeier
							
						 
					 | 
					
						
						
						
						
							
						
						
							ffde22e711
							
						
					 | 
					
						
						
							
							move genesis_epoch_data function to spec
						
						
						
						
						
					 | 
					
						2017-09-04 12:46:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Habermeier
							
						 
					 | 
					
						
						
						
						
							
						
						
							e69e8254db
							
						
					 | 
					
						
						
							
							instantiate genesis epoch data if nonexistant in header_chain
						
						
						
						
						
					 | 
					
						2017-09-04 12:37:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Habermeier
							
						 
					 | 
					
						
						
						
						
							
						
						
							372779915f
							
						
					 | 
					
						
						
							
							Merge branch 'master' into light-poa
						
						
						
						
						
					 | 
					
						2017-09-04 12:30:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jaco Greeff
							
						 
					 | 
					
						
						
						
						
							
						
						
							7818ed98c7
							
						
					 | 
					
						
						
							
							Add status bar extension plugins
						
						
						
						
						
					 | 
					
						2017-09-04 12:24:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikVolf
							
						 
					 | 
					
						
						
						
						
							
						
						
							e00de28556
							
						
					 | 
					
						
						
							
							proper update
						
						
						
						
						
					 | 
					
						2017-09-03 19:54:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Kotewicz
							
						 
					 | 
					
						
						
						
						
							
						
						
							b731ccea18
							
						
					 | 
					
						
						
							
							triehash is separated from util (#6428)
						
						
						
						
						
					 | 
					
						2017-09-03 09:11:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							0309462b36
							
						
					 | 
					
						
						
							
							Update signing_session.rs
						
						
						
						
						
					 | 
					
						2017-09-03 09:06:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							b4cd7ca49a
							
						
					 | 
					
						
						
							
							Update consensus_session.rs
						
						
						
						
						
					 | 
					
						2017-09-03 09:06:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hawstein
							
						 
					 | 
					
						
						
						
						
							
						
						
							7b8af30590
							
						
					 | 
					
						
						
							
							remove re-export of parking_lot in util (#6435)
						
						
						
						
						
					 | 
					
						2017-09-02 20:09:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hawstein
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d95fe481f
							
						
					 | 
					
						
						
							
							fix modexp bug: return 0 if base=0 (#6424)
						
						
						
						
						
					 | 
					
						2017-09-02 20:08:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hawstein
							
						 
					 | 
					
						
						
						
						
							
						
						
							2faa28ce9b
							
						
					 | 
					
						
						
							
							separate semantic_version from util (#6438)
						
						
						
						
						
					 | 
					
						2017-09-02 13:14:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hawstein
							
						 
					 | 
					
						
						
						
						
							
						
						
							0b5285c282
							
						
					 | 
					
						
						
							
							move timer.rs to ethcore (#6437)
						
						
						
						
						
					 | 
					
						2017-09-02 10:54:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							ffae847b48
							
						
					 | 
					
						
						
							
							spacing around comas
						
						
						
						
						
					 | 
					
						2017-09-02 09:57:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								GitLab Build Bot
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b8c9cac23
							
						
					 | 
					
						
						
							
							[ci skip] js-precompiled 20170901-161931
						
						
						
						
						
					 | 
					
						2017-09-01 16:33:31 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Kotewicz
							
						 
					 | 
					
						
						
						
						
							
						
						
							6d98f6fc9a
							
						
					 | 
					
						
						
							
							Merge pull request #6433 from Hawstein/not-reexport-ansi_term
						
						
						
						
						
						
						
						remove re-export of ansi_term in util 
						
					 | 
					
						2017-09-01 17:43:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hawstein
							
						 
					 | 
					
						
						
						
						
							
						
						
							cf366bdb29
							
						
					 | 
					
						
						
							
							util should not reexport ansi_term
						
						
						
						
						
					 | 
					
						2017-09-01 22:57:57 +08:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jaco Greeff
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb7b11553a
							
						
					 | 
					
						
						
							
							Test-drive extensions, status first
						
						
						
						
						
					 | 
					
						2017-09-01 14:29:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jaco Greeff
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1bde406de
							
						
					 | 
					
						
						
							
							Don't clobber window.parity, extend
						
						
						
						
						
					 | 
					
						2017-09-01 13:03:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Craig O'Connor
							
						 
					 | 
					
						
						
						
						
							
						
						
							56f46edab8
							
						
					 | 
					
						
						
							
							Pub sub blocks (#6139)
						
						
						
						
						
						
						
						* fun start
* playin
* linting
* cleanup kk 1
* cleanup kk 2
* package
* oops
* grumbles
* lint
* lint 2
* all-possible-cases
* conflict resolution
* conflict resolution
* ready
* lint
* remove package-lock
* Restart subscription on transport close.
* Bring back the formatter.
* Fix formatter. 
						
					 | 
					
						2017-09-01 12:23:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Habermeier
							
						 
					 | 
					
						
						
						
						
							
						
						
							47f7366a5c
							
						
					 | 
					
						
						
							
							Merge pull request #6423 from paritytech/keccak_fn
						
						
						
						
						
						
						
						replace trait Hashable with fn keccak 
						
					 | 
					
						2017-08-31 17:20:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jaco Greeff
							
						 
					 | 
					
						
						
						
						
							
						
						
							d0d8002b66
							
						
					 | 
					
						
						
							
							Override uiUrl
						
						
						
						
						
					 | 
					
						2017-08-31 15:36:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9cc4c848b
							
						
					 | 
					
						
						
							
							replace sha3 with keccak in few comments
						
						
						
						
						
					 | 
					
						2017-08-31 15:25:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hawstein
							
						 
					 | 
					
						
						
						
						
							
						
						
							d31b7d8968
							
						
					 | 
					
						
						
							
							add more hash backward compatibility test for bloom (#6425)
						
						
						
						
						
					 | 
					
						2017-08-31 14:50:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jaco Greeff
							
						 
					 | 
					
						
						
						
						
							
						
						
							d957a10f47
							
						
					 | 
					
						
						
							
							Update to cater for token URL
						
						
						
						
						
					 | 
					
						2017-08-31 14:08:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba3b2712a1
							
						
					 | 
					
						
						
							
							fixed grumbles
						
						
						
						
						
					 | 
					
						2017-08-31 12:38:53 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jaco Greeff
							
						 
					 | 
					
						
						
						
						
							
						
						
							0238295654
							
						
					 | 
					
						
						
							
							Merge branch 'master' into ui-2
						
						
						
						
						
					 | 
					
						2017-08-31 12:16:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							94f717a255
							
						
					 | 
					
						
						
							
							Merge branch 'master' into keccak_fn
						
						
						
						
						
					 | 
					
						2017-08-31 11:53:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							7849fff41e
							
						
					 | 
					
						
						
							
							finished
						
						
						
						
						
					 | 
					
						2017-08-31 11:35:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0e8abb07b
							
						
					 | 
					
						
						
							
							Hashable::sha3 -> fn keccak for ethcore
						
						
						
						
						
					 | 
					
						2017-08-30 19:18:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Hawstein
							
						 
					 | 
					
						
						
						
						
							
						
						
							e04d58f647
							
						
					 | 
					
						
						
							
							use one hasher in Bloom (#6404)
						
						
						
						
						
						
						
						* remove the redundant hasher in Bloom
* add the test to check the hash backward compatibility 
						
					 | 
					
						2017-08-30 18:38:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Habermeier
							
						 
					 | 
					
						
						
						
						
							
						
						
							abfa8e95a2
							
						
					 | 
					
						
						
							
							Merge branch 'master' into light-poa
						
						
						
						
						
					 | 
					
						2017-08-30 18:18:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							e120c75d17
							
						
					 | 
					
						
						
							
							Hashable::sha3 -> fn keccak for ethcore-network
						
						
						
						
						
					 | 
					
						2017-08-30 17:14:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e088d783d
							
						
					 | 
					
						
						
							
							Hashable::sha3 -> fn keccak for ethcore-util
						
						
						
						
						
					 | 
					
						2017-08-30 16:20:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Axel Chalon
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b5ad69c22
							
						
					 | 
					
						
						
							
							Remove reexport of HeapSizeOf in util (#6419)
						
						
						
						
						
					 | 
					
						2017-08-30 16:04:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Kotewicz
							
						 
					 | 
					
						
						
						
						
							
						
						
							f7e15f2450
							
						
					 | 
					
						
						
							
							Merge pull request #6194 from paritytech/Fix-4858
						
						
						
						
						
						
						
						Rewards on closing blocks 
						
					 | 
					
						2017-08-30 15:07:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a420d6580
							
						
					 | 
					
						
						
							
							fixed merge
						
						
						
						
						
					 | 
					
						2017-08-30 14:37:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							88200a1193
							
						
					 | 
					
						
						
							
							Merge branch 'master' into Fix-4858
						
						
						
						
						
					 | 
					
						2017-08-30 14:30:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jaco Greeff
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b8236cdbd
							
						
					 | 
					
						
						
							
							Update for non HTTP use
						
						
						
						
						
					 | 
					
						2017-08-30 12:47:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Kotewicz
							
						 
					 | 
					
						
						
						
						
							
						
						
							b47e76a1a5
							
						
					 | 
					
						
						
							
							Merge pull request #6413 from paritytech/immediate-transitions-fix-2
						
						
						
						
						
						
						
						ensure balances of constructor accounts are kept 
						
					 | 
					
						2017-08-30 12:27:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jaco Greeff
							
						 
					 | 
					
						
						
						
						
							
						
						
							be56a06790
							
						
					 | 
					
						
						
							
							Basic electron interface
						
						
						
						
						
					 | 
					
						2017-08-30 11:59:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robert Habermeier
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e1fefc8ea
							
						
					 | 
					
						
						
							
							test balance of spec-constructed account is kept
						
						
						
						
						
					 | 
					
						2017-08-30 11:57:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jaco Greeff
							
						 
					 | 
					
						
						
						
						
							
						
						
							d7de40ab4c
							
						
					 | 
					
						
						
							
							Init history in dapp module
						
						
						
						
						
					 | 
					
						2017-08-30 11:29:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Kotewicz
							
						 
					 | 
					
						
						
						
						
							
						
						
							da91a07906
							
						
					 | 
					
						
						
							
							Merge pull request #6394 from paritytech/trie_recursion
						
						
						
						
						
						
						
						removed recursion from triedbmut::lookup 
						
					 | 
					
						2017-08-30 10:07:44 +02:00 | 
					
					
						
						
							
							
							
						
					 |