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 
						 
				 
			
				
					
						
							
							
								Marek Kotewicz 
							
						 
					 
					
						
						
						
						
							
						
						
							b731ccea18 
							
						 
					 
					
						
						
							
							triehash is separated from util ( #6428 )  
						
						
						
					 
					
						2017-09-03 09:11:14 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								debris 
							
						 
					 
					
						
						
						
						
							
						
						
							ba3b2712a1 
							
						 
					 
					
						
						
							
							fixed grumbles  
						
						
						
					 
					
						2017-08-31 12:38:53 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							4e1fefc8ea 
							
						 
					 
					
						
						
							
							test balance of spec-constructed account is kept  
						
						
						
					 
					
						2017-08-30 11:57:48 +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 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							c1c7d7a3e2 
							
						 
					 
					
						
						
							
							ensure balances of constructor accounts are kept  
						
						
						
					 
					
						2017-08-29 17:02:38 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							36d046f3ca 
							
						 
					 
					
						
						
							
							do not activate genesis epoch in immediate transition validator contract ( #6349 )  
						
						
						
					 
					
						2017-08-29 15:16:24 +02:00 
						 
				 
			
				
					
						
							
							
								Leo Arias 
							
						 
					 
					
						
						
						
						
							
						
						
							53401d6962 
							
						 
					 
					
						
						
							
							Use git for the snap version ( #6271 )  
						
						... 
						
						
						
						For commits with an annotated tag, that tag will be the version. For other commits, a git identifier will be used.
This way, there is no need to manually edit the snap version. 
						
					 
					
						2017-08-29 15:14:07 +02:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							e3666457cf 
							
						 
					 
					
						
						
							
							Consistent use of ,s  
						
						
						
					 
					
						2017-08-29 15:12:58 +02:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							50495c6898 
							
						 
					 
					
						
						
							
							Merge branch 'master' into Fix-4858  
						
						
						
					 
					
						2017-08-29 15:11:05 +02:00 
						 
				 
			
				
					
						
							
							
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							d520aa2633 
							
						 
					 
					
						
						
							
							Connection filter ( #6359 )  
						
						
						
					 
					
						2017-08-29 14:38:01 +02:00 
						 
				 
			
				
					
						
							
							
								debris 
							
						 
					 
					
						
						
						
						
							
						
						
							100d1c7bf6 
							
						 
					 
					
						
						
							
							make triedbmut lookup shorter  
						
						
						
					 
					
						2017-08-29 12:31:40 +02:00 
						 
				 
			
				
					
						
							
							
								debris 
							
						 
					 
					
						
						
						
						
							
						
						
							e390e6b0af 
							
						 
					 
					
						
						
							
							Merge branch 'master' into trie_recursion  
						
						
						
					 
					
						2017-08-29 12:23:37 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							96e9a73a1b 
							
						 
					 
					
						
						
							
							Merge pull request  #6408  from paritytech/txqueue  
						
						... 
						
						
						
						Don't accept transactions above block gas limit. 
						
					 
					
						2017-08-29 12:13:16 +02:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							b8e6799d67 
							
						 
					 
					
						
						
							
							Don't accept transactions above block gas limit.  
						
						
						
					 
					
						2017-08-29 10:50:13 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Kotewicz 
							
						 
					 
					
						
						
						
						
							
						
						
							e7cc0477fb 
							
						 
					 
					
						
						
							
							Merge pull request  #6399  from paritytech/evm-trace-fix  
						
						... 
						
						
						
						Fix memory tracing. 
						
					 
					
						2017-08-28 18:53:22 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Kotewicz 
							
						 
					 
					
						
						
						
						
							
						
						
							17fa7edbbf 
							
						 
					 
					
						
						
							
							Merge pull request  #6393  from paritytech/earlymergedb_optimizations  
						
						... 
						
						
						
						earlydb optimizations 
						
					 
					
						2017-08-28 18:46:41 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Kotewicz 
							
						 
					 
					
						
						
						
						
							
						
						
							c6b3faca64 
							
						 
					 
					
						
						
							
							Merge pull request  #6321  from paritytech/plain_hasher  
						
						... 
						
						
						
						Optimized PlainHasher hashing. Trie insertions are >15% faster 
						
					 
					
						2017-08-28 18:46:04 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Kotewicz 
							
						 
					 
					
						
						
						
						
							
						
						
							8ead8061ee 
							
						 
					 
					
						
						
							
							Merge pull request  #6389  from paritytech/trie  
						
						... 
						
						
						
						Trie optimizations 
						
					 
					
						2017-08-28 18:45:30 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Kotewicz 
							
						 
					 
					
						
						
						
						
							
						
						
							bf68c87a08 
							
						 
					 
					
						
						
							
							Merge pull request  #6392  from paritytech/triehash  
						
						... 
						
						
						
						small optimizations for triehash 
						
					 
					
						2017-08-28 18:44:47 +02:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							d90ec3d192 
							
						 
					 
					
						
						
							
							Bring back IPFS tests. ( #6398 )  
						
						
						
					 
					
						2017-08-28 15:22:59 +02:00 
						 
				 
			
				
					
						
							
							
								debris 
							
						 
					 
					
						
						
						
						
							
						
						
							322da07010 
							
						 
					 
					
						
						
							
							Merge branch 'master' into trie  
						
						
						
					 
					
						2017-08-28 15:08:22 +02:00 
						 
				 
			
				
					
						
							
							
								debris 
							
						 
					 
					
						
						
						
						
							
						
						
							8019d222a7 
							
						 
					 
					
						
						
							
							fixed TrieDb::seek accordingly to review suggestions  
						
						
						
					 
					
						2017-08-28 15:08:16 +02:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							f9a08e285c 
							
						 
					 
					
						
						
							
							Running state test using parity-evm ( #6355 )  
						
						... 
						
						
						
						* Initial version of state tests.
* Refactor state to support tracing.
* Unify TransactResult.
* Add test. 
						
					 
					
						2017-08-28 14:25:16 +02:00 
						 
				 
			
				
					
						
							
							
								Nikolay Volf 
							
						 
					 
					
						
						
						
						
							
						
						
							abecd80f54 
							
						 
					 
					
						
						
							
							Wasm math tests extended ( #6354 )  
						
						... 
						
						
						
						* extend math tests
* use latest wasm-tests
* cleanup
* avoid overflow
* use correct gas-
* and division 
						
					 
					
						2017-08-28 14:12:40 +02:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							3226e1ca33 
							
						 
					 
					
						
						
							
							Expose health status over RPC ( #6274 )  
						
						... 
						
						
						
						* Node-health to a separate crate.
* Initialize node_health outside of dapps.
* Expose health over RPC.
* Bring back 412 and fix JS.
* Add health to workspace and tests.
* Fix compilation without default features.
* Fix borked merge.
* Revert to generics to avoid virtual calls.
* Fix node-health tests.
* Add missing trailing comma. 
						
					 
					
						2017-08-28 14:11:55 +02:00 
						 
				 
			
				
					
						
							
							
								debris 
							
						 
					 
					
						
						
						
						
							
						
						
							752dad6829 
							
						 
					 
					
						
						
							
							commit plain_hasher to util  
						
						
						
					 
					
						2017-08-28 12:40:29 +02:00