Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							d4d63a5688 
							
						 
					 
					
						
						
							
							Merge branches 'kill_unwraps' and 'dynamic-gas-price' of github.com:ethcore/parity into dynamic-gas-price  
						
						 
						
						
						
					 
					
						2016-07-09 12:29:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							9b1d1dc336 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into kill_unwraps  
						
						 
						
						
						
					 
					
						2016-07-08 20:42:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							c648171f91 
							
						 
					 
					
						
						
							
							Fix the HTTP client for getting price.  
						
						 
						
						
						
					 
					
						2016-07-08 20:01:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							ef0a41c7b3 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into dynamic-gas-price  
						
						 
						
						
						
					 
					
						2016-07-08 17:36:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							9afbc9816d 
							
						 
					 
					
						
						
							
							Merge branch 'master' into kill_unwraps  
						
						 
						
						
						
					 
					
						2016-07-08 17:31:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							25e6b2b827 
							
						 
					 
					
						
						
							
							Initial implementation of dynamic gas pricer.  
						
						 
						
						
						
					 
					
						2016-07-08 17:26:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							eef9586c57 
							
						 
					 
					
						
						
							
							Fixing deadlock in miner ( #1569 )  
						
						 
						
						... 
						
						
						
						* Fixing deadlock in miner
* Adding more comments [ci skip] 
						
					 
					
						2016-07-08 17:19:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							d7077c8ef7 
							
						 
					 
					
						
						
							
							Fix build.  
						
						 
						
						
						
					 
					
						2016-07-07 11:28:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							3c046556b5 
							
						 
					 
					
						
						
							
							fix test url  
						
						 
						
						
						
					 
					
						2016-07-07 11:14:37 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							9f43526c88 
							
						 
					 
					
						
						
							
							Merge branch 'master' into kill_unwraps  
						
						 
						
						
						
					 
					
						2016-07-07 09:40:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nikolay Volf 
							
						 
					 
					
						
						
						
						
							
						
						
							8282c7dd50 
							
						 
					 
					
						
						
							
							Client IPC Interface ( #1493 )  
						
						 
						
						... 
						
						
						
						* btree map serializer
* serde tests
* state diff serialization
* basic layout
* more missing serializaers
* uncle returns rlp
* block queue info
* sorting with transaction result
* sorting out util imports
* transaction import result sorting also
* sorting filters & ranges
* error sorting out
* deriving ipc service compiling
* rpc & sync recompile
* sorting rpc using uncles
* fix compilation
* fix merging bugs
* fix unused imports
* fix all warnings
* tests stub
* some merge bugs
* ethcore compilation
* fix rpc compilation
* deriving attribute
* tests (and fixes)
* rpc test working
* fix warnings again
* rs.in -> rs
* missing attribute
* refactored tree changes
* paste reformat mess fix
* pub mod actually
* intendation fix 
						
					 
					
						2016-07-07 09:39:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							3b662c285f 
							
						 
					 
					
						
						
							
							Switch out .X().unwrap() for .unwrapped_X  
						
						 
						
						
						
					 
					
						2016-07-07 09:37:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							1f1b420230 
							
						 
					 
					
						
						
							
							Merge branch 'client-ipc-refact' into client-ipc-tests  
						
						 
						
						
						
					 
					
						2016-07-07 10:00:41 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							456ad9e21b 
							
						 
					 
					
						
						
							
							Remove .lock().unwrap() idiom into locked().  
						
						 
						
						
						
					 
					
						2016-07-06 19:52:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							f06cff48b9 
							
						 
					 
					
						
						
							
							intendation fix  
						
						 
						
						
						
					 
					
						2016-07-06 20:33:20 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							b1ca41dea8 
							
						 
					 
					
						
						
							
							pub mod actually  
						
						 
						
						
						
					 
					
						2016-07-06 20:31:48 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							5dd5983568 
							
						 
					 
					
						
						
							
							paste reformat mess fix  
						
						 
						
						
						
					 
					
						2016-07-06 20:25:42 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							2abf1df667 
							
						 
					 
					
						
						
							
							Merge branch 'master' into client-ipc-refact  
						
						 
						
						
						
					 
					
						2016-07-06 20:20:44 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							1ac2987437 
							
						 
					 
					
						
						
							
							refactored tree changes  
						
						 
						
						
						
					 
					
						2016-07-06 20:07:24 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							cd7b046d80 
							
						 
					 
					
						
						
							
							Fix and add info messages ( #1552 )  
						
						 
						
						... 
						
						
						
						* Display information on journal database on startup.
* Minor restyling.
* Client handles the enode message to avoid repeats.
* Avoid unneeded copies *and* reduce code.
* Fix up typo. 
						
					 
					
						2016-07-06 18:28:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							095e51c39c 
							
						 
					 
					
						
						
							
							Fix indent of  #1541  ( #1555 )  
						
						 
						
						
						
					 
					
						2016-07-06 17:42:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nipunn Koorapati 
							
						 
					 
					
						
						
						
						
							
						
						
							4a9b9dc305 
							
						 
					 
					
						
						
							
							Update sealing just once when  externally importing many blocks ( #1541 )  
						
						 
						
						... 
						
						
						
						Fixes Issue #1372  
						
					 
					
						2016-07-06 17:15:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							baababea02 
							
						 
					 
					
						
						
							
							missing attribute  
						
						 
						
						
						
					 
					
						2016-07-06 14:49:27 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							b25a37eb38 
							
						 
					 
					
						
						
							
							Merge branch 'master' into client-ipc-refact  
						
						 
						
						
						
					 
					
						2016-07-06 14:43:36 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							f8b56317b4 
							
						 
					 
					
						
						
							
							Merge pull request  #1548  from ethcore/remove-soft  
						
						 
						
						... 
						
						
						
						Remove soft-fork stuff. 
						
					 
					
						2016-07-06 13:05:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							b7d243368b 
							
						 
					 
					
						
						
							
							Extend migration framework ( #1546 )  
						
						 
						
						... 
						
						
						
						* partially done alternate migration scheme
* finish altering migration framework
* migrate tests to new migration framework
* address comments
* remove superfluous newline
[ci skip]
* TempIdx -> TempIndex
[ci skip] 
						
					 
					
						2016-07-06 12:05:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							9783c93564 
							
						 
					 
					
						
						
							
							Merge branch 'master' into client-ipc-refact  
						
						 
						
						
						
					 
					
						2016-07-06 12:47:52 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							29de69e39d 
							
						 
					 
					
						
						
							
							failing blockid test  
						
						 
						
						
						
					 
					
						2016-07-06 12:40:10 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marek Kotewicz 
							
						 
					 
					
						
						
						
						
							
						
						
							bcb63bce12 
							
						 
					 
					
						
						
							
							serde is no longer util dependency ( #1534 )  
						
						 
						
						... 
						
						
						
						* removed old json-tests
* simplify folds in triehash.rs
* removed unused json_aid
* removed unused squeeze.rs
* json branching tests for trie
* removing todos from util
* separated UsingQueue and Table
* further cleanup, removing unused code
* serde serialization of hash moved to rpc module
* uint wrapper for rpc in progress
* serialization of uint moved to rpc module
* updated eth-secp256k1
* updated igd, serde is no longer dependency of util
* loading trie consensus tests
* renamed aliases in rpc imports 
						
					 
					
						2016-07-06 11:23:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							a084969d55 
							
						 
					 
					
						
						
							
							Fix tests.  
						
						 
						
						
						
					 
					
						2016-07-06 10:40:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							488ff88562 
							
						 
					 
					
						
						
							
							Remove soft-fork stuff.  
						
						 
						
						
						
					 
					
						2016-07-05 18:18:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							b8b55be0be 
							
						 
					 
					
						
						
							
							Skipping transactions with invalid nonces when pushing to block. ( #1545 )  
						
						 
						
						... 
						
						
						
						* Changing some logging levels
* Skipping invalid nonce errors 
						
					 
					
						2016-07-05 17:51:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							c26cfc1c5a 
							
						 
					 
					
						
						
							
							Silent running operating modes ( #1477 )  
						
						 
						
						... 
						
						
						
						* Command=line options.
* Keep alive for the eth protocol.
* Wire up final pieces.
* No network when dark.
* Passive and dark mode work.
* Ensure all RPCs keep alive.
* Fix tests.
* Fix minor bug.
* Minor whitespace.
* Split out some of the sleep-state.
* Fix help text. 
						
					 
					
						2016-07-05 17:50:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							747818a349 
							
						 
					 
					
						
						
							
							rs.in -> rs  
						
						 
						
						
						
					 
					
						2016-07-05 17:12:06 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marek Kotewicz 
							
						 
					 
					
						
						
						
						
							
						
						
							62b9c1b14f 
							
						 
					 
					
						
						
							
							util cleanup ( #1474 )  
						
						 
						
						... 
						
						
						
						* removed old json-tests
* simplify folds in triehash.rs
* removed unused json_aid
* removed unused squeeze.rs
* json branching tests for trie
* loading trie consensus tests 
						
					 
					
						2016-07-05 15:16:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							4c1b74a42e 
							
						 
					 
					
						
						
							
							Calculating gas using usize (if supplied gaslimit fits in usize) ( #1518 )  
						
						 
						
						... 
						
						
						
						* Spliting gasometer out of interpreter
* Choosing right gas calculations implementation based on supplied gas
* Moving verification out of gasometer
* MemGasCost benchmark.
Conflicts:
	ethcore/src/evm/benches/mod.rs
* Some simple benchmarks
* Benchmark for simple loop
* Calculating gas_for_memory only when it's actually needed
* Removing superfluous newline [ci skip] 
						
					 
					
						2016-07-05 15:15:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							fb0076d262 
							
						 
					 
					
						
						
							
							fix warnings again  
						
						 
						
						
						
					 
					
						2016-07-05 12:50:42 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							78e7101f85 
							
						 
					 
					
						
						
							
							rpc test working  
						
						 
						
						
						
					 
					
						2016-07-05 12:48:32 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							8052824f3f 
							
						 
					 
					
						
						
							
							tests (and fixes)  
						
						 
						
						
						
					 
					
						2016-07-05 12:23:56 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							c96686620a 
							
						 
					 
					
						
						
							
							deriving attribute  
						
						 
						
						
						
					 
					
						2016-07-05 11:49:29 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							a9a671dfc0 
							
						 
					 
					
						
						
							
							ethcore compilation  
						
						 
						
						
						
					 
					
						2016-07-05 11:45:31 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							b58754cd26 
							
						 
					 
					
						
						
							
							some merge bugs  
						
						 
						
						
						
					 
					
						2016-07-05 11:33:38 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							b873d3befb 
							
						 
					 
					
						
						
							
							Merge branch 'master' into client-ipc-refact  
						
						 
						
						
						
					 
					
						2016-07-05 11:29:46 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nikolay Volf 
							
						 
					 
					
						
						
						
						
							
						
						
							bbf20c3637 
							
						 
					 
					
						
						
							
							Merge pull request  #1538  from ethcore/bc-restore  
						
						 
						
						... 
						
						
						
						Attempt to fix blochchain/extras DBs sync 
						
					 
					
						2016-07-05 12:16:15 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nikolay Volf 
							
						 
					 
					
						
						
						
						
							
						
						
							a2b4997888 
							
						 
					 
					
						
						
							
							Merge pull request  #1525  from ethcore/client-api-refact2  
						
						 
						
						... 
						
						
						
						Client API refactoring - limiting errors to crate-level error types 
						
					 
					
						2016-07-05 12:15:38 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							548b4e164e 
							
						 
					 
					
						
						
							
							Attempt to fix blochchain DB sync  
						
						 
						
						
						
					 
					
						2016-07-04 18:24:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							cfcf061e41 
							
						 
					 
					
						
						
							
							tests stub  
						
						 
						
						
						
					 
					
						2016-07-04 14:51:50 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							5c438cc58a 
							
						 
					 
					
						
						
							
							Bumping clippy ( #1532 )  
						
						 
						
						
						
					 
					
						2016-07-04 11:52:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							8f6e48e4c3 
							
						 
					 
					
						
						
							
							fix tests  
						
						 
						
						
						
					 
					
						2016-07-02 20:08:52 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							43027b36ea 
							
						 
					 
					
						
						
							
							Merge branch 'master' into client-api-refact2  
						
						 
						
						
						
					 
					
						2016-07-01 22:43:51 +03:00