Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							4b93773c4f 
							
						 
					 
					
						
						
							
							Merge pull request  #1550  from ethcore/fix-warning  
						
						... 
						
						
						
						fix codegen warning 
						
					 
					
						2016-07-06 12:46:06 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							aaad0e87ae 
							
						 
					 
					
						
						
							
							merge with latest master  
						
						
						
					 
					
						2016-07-06 12:26:03 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							a7103e2870 
							
						 
					 
					
						
						
							
							different migrations based on pruning  
						
						
						
					 
					
						2016-07-06 12:15:03 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							e151fbb071 
							
						 
					 
					
						
						
							
							fix comments and hash address instead of hash  
						
						
						
					 
					
						2016-07-06 12:15:03 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							e411399f13 
							
						 
					 
					
						
						
							
							handle metadata keys in migration and preserve first 96 bits  
						
						
						
					 
					
						2016-07-06 12:15:03 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							0bbdcb13b3 
							
						 
					 
					
						
						
							
							preserve first 96 bits of keys when combining  
						
						
						
					 
					
						2016-07-06 12:15:03 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							9b28e97ca8 
							
						 
					 
					
						
						
							
							add a database migration for new accountdb  
						
						
						
					 
					
						2016-07-06 12:15:03 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							7df0aa2b60 
							
						 
					 
					
						
						
							
							modify account_db to work on address hash, not address  
						
						
						
					 
					
						2016-07-06 12:15:03 +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 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							21d5e105c1 
							
						 
					 
					
						
						
							
							TempIdx -> TempIndex  
						
						... 
						
						
						
						[ci skip] 
						
					 
					
						2016-07-06 11:56:36 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							908104e365 
							
						 
					 
					
						
						
							
							remove superfluous newline  
						
						... 
						
						
						
						[ci skip] 
						
					 
					
						2016-07-06 11:49:22 +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 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							a8b26e2cb5 
							
						 
					 
					
						
						
							
							Refactoring dapps to support API endpoints. ( #1542 )  
						
						... 
						
						
						
						* Refactoring dapps to support API endpoints.
* Using ContentHandler for unauthorized requests 
						
					 
					
						2016-07-06 11:24:29 +02: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 
						 
				 
			
				
					
						
							
							
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							fa44532a1e 
							
						 
					 
					
						
						
							
							span unused variable  
						
						
						
					 
					
						2016-07-06 12:15:00 +03:00 
						 
				 
			
				
					
						
							
							
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							a084969d55 
							
						 
					 
					
						
						
							
							Fix tests.  
						
						
						
					 
					
						2016-07-06 10:40:45 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Kotewicz 
							
						 
					 
					
						
						
						
						
							
						
						
							cb1808d53d 
							
						 
					 
					
						
						
							
							Merge pull request  #1549  from ethcore/wiki-readme  
						
						... 
						
						
						
						mention wiki in README 
						
					 
					
						2016-07-05 19:43:34 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							eb6617f9d4 
							
						 
					 
					
						
						
							
							mention wiki in README  
						
						... 
						
						
						
						[ci skip] 
						
					 
					
						2016-07-05 19:26:22 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							fd62944efc 
							
						 
					 
					
						
						
							
							address comments  
						
						
						
					 
					
						2016-07-05 18:54:58 +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 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							d4c9c7cc23 
							
						 
					 
					
						
						
							
							migrate tests to new migration framework  
						
						
						
					 
					
						2016-07-05 17:15:01 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							1b759c1462 
							
						 
					 
					
						
						
							
							finish altering migration framework  
						
						
						
					 
					
						2016-07-05 17:15:01 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							2ea7a8d666 
							
						 
					 
					
						
						
							
							partially done alternate migration scheme  
						
						
						
					 
					
						2016-07-05 17:15:01 +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 
						 
				 
			
				
					
						
							
							
								Nikolay Volf 
							
						 
					 
					
						
						
						
						
							
						
						
							45d532368d 
							
						 
					 
					
						
						
							
							Merge pull request  #1536  from rphmeier/nibblevec  
						
						... 
						
						
						
						add owning NibbleVec 
						
					 
					
						2016-07-05 14:20:22 +04: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 
							
						 
					 
					
						
						
						
						
							
						
						
							ce1a4c8952 
							
						 
					 
					
						
						
							
							fix rpc compilation  
						
						
						
					 
					
						2016-07-05 11:47:23 +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 
						 
				 
			
				
					
						
							
							
								Nikolay Volf 
							
						 
					 
					
						
						
						
						
							
						
						
							1ab2060afa 
							
						 
					 
					
						
						
							
							add void method support ( #1540 )  
						
						
						
					 
					
						2016-07-05 10:11:09 +02:00 
						 
				 
			
				
					
						
							
							
								Marek Kotewicz 
							
						 
					 
					
						
						
						
						
							
						
						
							a25eb4b046 
							
						 
					 
					
						
						
							
							Merge pull request  #1539  from ethcore/dapps-windows-fix  
						
						... 
						
						
						
						Fixing serving nested files for dapps. 
						
					 
					
						2016-07-05 09:55:57 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							d1e6e3d642 
							
						 
					 
					
						
						
							
							Merge pull request  #1537  from ethcore/public-address  
						
						... 
						
						
						
						Fixed public address config 
						
					 
					
						2016-07-04 22:37:37 +02:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							0242c66a1b 
							
						 
					 
					
						
						
							
							Bump parity-dapps  
						
						
						
					 
					
						2016-07-04 19:21:40 +02:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							548b4e164e 
							
						 
					 
					
						
						
							
							Attempt to fix blochchain DB sync  
						
						
						
					 
					
						2016-07-04 18:24:14 +02:00 
						 
				 
			
				
					
						
							
							
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							24f09de60e 
							
						 
					 
					
						
						
							
							Fixed public address config  
						
						
						
					 
					
						2016-07-04 18:21:22 +02:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							39a46eee8f 
							
						 
					 
					
						
						
							
							add owning NibbleVec  
						
						
						
					 
					
						2016-07-04 17:45:01 +02:00 
						 
				 
			
				
					
						
							
							
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							bb2a631885 
							
						 
					 
					
						
						
							
							Fixing compilation&clippy warnings ( #1531 )  
						
						... 
						
						
						
						* Fixing compilation&clippy warnings
* Adding spaces 
						
					 
					
						2016-07-04 13:53:55 +02:00 
						 
				 
			
				
					
						
							
							
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							cfcf061e41 
							
						 
					 
					
						
						
							
							tests stub  
						
						
						
					 
					
						2016-07-04 14:51:50 +03:00 
						 
				 
			
				
					
						
							
							
								Robert Habermeier 
							
						 
					 
					
						
						
						
						
							
						
						
							465aae71e7 
							
						 
					 
					
						
						
							
							merge branch accountdb_migration into pv64  
						
						
						
					 
					
						2016-07-04 12:53:01 +02:00