Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							283ce13454
							
						
					 | 
					
						
						
							
							Merge pull request #914 from ethcore/upgrades
						
						
						
						
						
						
						
						Upgrade logic between versions 
						
					 | 
					
						2016-04-12 11:30:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikVolf
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ecbb53e99
							
						
					 | 
					
						
						
							
							reducing code
						
						
						
						
						
					 | 
					
						2016-04-12 06:19:15 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							3fe21f5931
							
						
					 | 
					
						
						
							
							Ethcore-specific RPC methods (#923)
						
						
						
						
						
						
						
						* Ethcore-specific rpc methods
* Initializing ethcore-rpc 
						
					 | 
					
						2016-04-11 12:06:32 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							c48374dbc6
							
						
					 | 
					
						
						
							
							Parameter to allow user to force the sealing mechanism (#918)
						
						
						
						
						
						
						
						* Allow block sealing mechanism to be forced, even when not mining.
* Fix deadlock in dispatch_transaction. Fix tests.
* Horrible workaround for transaction importing.
* Reduce tracing. Cleanups.
* Remove logging.
* Remove broken code inherited from dodgy implementation.
* pre-query tx queue nonce also if any
* remove outside nonce queries
* remove queue nonces 
						
					 | 
					
						2016-04-11 11:52:33 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikVolf
							
						 
					 | 
					
						
						
						
						
							
						
						
							1d09844950
							
						
					 | 
					
						
						
							
							Merge branch 'master' into upgrades
						
						
						
						
						
					 | 
					
						2016-04-11 21:43:07 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikVolf
							
						 
					 | 
					
						
						
						
						
							
						
						
							26e23da4c0
							
						
					 | 
					
						
						
							
							some newver/oldver logics
						
						
						
						
						
					 | 
					
						2016-04-10 17:15:40 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikVolf
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3411a50a4
							
						
					 | 
					
						
						
							
							locked ver.lock upgrade
						
						
						
						
						
					 | 
					
						2016-04-10 16:42:33 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikVolf
							
						 
					 | 
					
						
						
						
						
							
						
						
							69add61174
							
						
					 | 
					
						
						
							
							basic upgrade scenario
						
						
						
						
						
					 | 
					
						2016-04-10 16:12:20 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							6ebd5009fc
							
						
					 | 
					
						
						
							
							--unlock is comma-delimited.
						
						
						
						
						
					 | 
					
						2016-04-09 12:58:13 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Kotewicz
							
						 
					 | 
					
						
						
						
						
							
						
						
							373284ca0a
							
						
					 | 
					
						
						
							
							spec loading cleanup (#858)
						
						
						
						
						
						
						
						* spec loading cleanup in progress
* changed engine field in json spec
* refactored engine params
* polishing spec loading refactor
* fixed compiling json tests
* fixed compiling parity
* removed warnings
* removed commented out code
* fixed failing test
* bringing back removed TODO in spec. 
						
					 | 
					
						2016-04-09 10:20:35 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							dab54cf2a7
							
						
					 | 
					
						
						
							
							HTTP Basic Authorization for WebApps server.
						
						
						
						
						
					 | 
					
						2016-04-08 16:11:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							9bd41761fc
							
						
					 | 
					
						
						
							
							Reverting back to old-hyper version of rpc
						
						
						
						
						
					 | 
					
						2016-04-07 16:31:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							b7c790d741
							
						
					 | 
					
						
						
							
							Disabling rpc until we switch to async hyper
						
						
						
						
						
					 | 
					
						2016-04-07 16:22:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf4ab6daa8
							
						
					 | 
					
						
						
							
							Merge branch 'master' into webapps2
						
						
						
						
						
						
						
						Conflicts:
	parity/main.rs 
						
					 | 
					
						2016-04-07 16:13:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							4569c25127
							
						
					 | 
					
						
						
							
							Specifying webapp interface
						
						
						
						
						
					 | 
					
						2016-04-07 15:59:45 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							8074fee28c
							
						
					 | 
					
						
						
							
							Use new json RPC server
						
						
						
						
						
					 | 
					
						2016-04-07 14:32:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							db2354a252
							
						
					 | 
					
						
						
							
							Merge branch 'fixing-rpc' into webapps2
						
						
						
						
						
						
						
						Conflicts:
	parity/main.rs 
						
					 | 
					
						2016-04-07 13:09:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							2adeb9fe88
							
						
					 | 
					
						
						
							
							Removing Option from setup_rpc_server method return type
						
						
						
						
						
					 | 
					
						2016-04-07 12:55:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							d1e3c633e5
							
						
					 | 
					
						
						
							
							Fixing compilation with rpc feature disabled
						
						
						
						
						
					 | 
					
						2016-04-07 12:50:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							91f1f4c174
							
						
					 | 
					
						
						
							
							Changing default setup to be safer for now
						
						
						
						
						
					 | 
					
						2016-04-07 12:20:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							1e9e0c32fa
							
						
					 | 
					
						
						
							
							Disabling webapp server by default
						
						
						
						
						
					 | 
					
						2016-04-07 12:15:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							da05aa51fe
							
						
					 | 
					
						
						
							
							Adding all APIs to webapp rpc server
						
						
						
						
						
					 | 
					
						2016-04-07 12:12:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad37b7fd2a
							
						
					 | 
					
						
						
							
							Adding webapps router
						
						
						
						
						
					 | 
					
						2016-04-07 12:10:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d6ca1498e
							
						
					 | 
					
						
						
							
							CLI options to run webapp server
						
						
						
						
						
					 | 
					
						2016-04-07 11:06:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							e3ce5d94e1
							
						
					 | 
					
						
						
							
							Adding webapps crate
						
						
						
						
						
					 | 
					
						2016-04-07 10:49:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							f27d88f6ab
							
						
					 | 
					
						
						
							
							More descriptive message when closing
						
						
						
						
						
					 | 
					
						2016-04-06 23:58:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd03f58eae
							
						
					 | 
					
						
						
							
							Rewriting messages
						
						
						
						
						
					 | 
					
						2016-04-06 19:22:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							a52043d5b3
							
						
					 | 
					
						
						
							
							Removing additional thread from JSON-RPC
						
						
						
						
						
					 | 
					
						2016-04-06 19:14:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f9eb97d0a
							
						
					 | 
					
						
						
							
							Merge branch 'master' into closing
						
						
						
						
						
					 | 
					
						2016-04-06 19:07:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc91e57c2f
							
						
					 | 
					
						
						
							
							Additional logging and error messages
						
						
						
						
						
					 | 
					
						2016-04-06 19:07:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Kotewicz
							
						 
					 | 
					
						
						
						
						
							
						
						
							a8eb34ddb8
							
						
					 | 
					
						
						
							
							Merge pull request #891 from ethcore/issue-882
						
						
						
						
						
						
						
						passing key path to all invocations 
						
					 | 
					
						2016-04-06 15:05:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikVolf
							
						 
					 | 
					
						
						
						
						
							
						
						
							e6be5016f9
							
						
					 | 
					
						
						
							
							replacing /home/nikky also
						
						
						
						
						
					 | 
					
						2016-04-06 14:21:19 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikVolf
							
						 
					 | 
					
						
						
						
						
							
						
						
							8b3e84f7fe
							
						
					 | 
					
						
						
							
							passing key path to all invocations
						
						
						
						
						
					 | 
					
						2016-04-06 14:03:53 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							85da55a537
							
						
					 | 
					
						
						
							
							Fixing warnings
						
						
						
						
						
					 | 
					
						2016-04-06 10:55:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							167f61bef0
							
						
					 | 
					
						
						
							
							[ci skip] update misleading cli help msg for author
						
						
						
						
						
					 | 
					
						2016-04-04 04:03:20 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Peter
							
						 
					 | 
					
						
						
						
						
							
						
						
							40b97045f0
							
						
					 | 
					
						
						
							
							Reorganised price info lookup
						
						
						
						
						
						
						
						This helped stop my eyes from hurting.
Further simplification 
						
					 | 
					
						2016-03-28 22:11:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							b606fb68cf
							
						
					 | 
					
						
						
							
							USD-based pricing of gas.
						
						
						
						
						
					 | 
					
						2016-03-28 00:49:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikVolf
							
						 
					 | 
					
						
						
						
						
							
						
						
							6db02134e9
							
						
					 | 
					
						
						
							
							Merge branch 'master' into unlock-pass
						
						
						
						
						
					 | 
					
						2016-03-27 04:49:02 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							156a2336de
							
						
					 | 
					
						
						
							
							Allow passwords on multiple lines in --password files.
						
						
						
						
						
					 | 
					
						2016-03-27 03:15:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								NikVolf
							
						 
					 | 
					
						
						
						
						
							
						
						
							32fd35843f
							
						
					 | 
					
						
						
							
							in cli call
						
						
						
						
						
					 | 
					
						2016-03-27 03:45:43 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							8805d04183
							
						
					 | 
					
						
						
							
							Minor refactor.
						
						
						
						
						
					 | 
					
						2016-03-27 01:41:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							53c4ed09a3
							
						
					 | 
					
						
						
							
							Unlock accounts on CLI.
						
						
						
						
						
					 | 
					
						2016-03-27 01:35:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							0e026ed11f
							
						
					 | 
					
						
						
							
							Fix author reporting. num_cpus for JSONRPC threads.
						
						
						
						
						
					 | 
					
						2016-03-22 19:12:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							7624bcf49e
							
						
					 | 
					
						
						
							
							Increase threads to 4.
						
						
						
						
						
					 | 
					
						2016-03-22 18:43:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							05a9c16329
							
						
					 | 
					
						
						
							
							JSONRPC interface defaults to local.
						
						
						
						
						
						
						
						Please enter the commit message for your changes. Lines starting 
						
					 | 
					
						2016-03-20 10:34:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							c611566a3e
							
						
					 | 
					
						
						
							
							Listen on all interfaces for JSONRPC by default.
						
						
						
						
						
					 | 
					
						2016-03-20 10:19:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							387d0743e6
							
						
					 | 
					
						
						
							
							Allow 0x prefix for --author.
						
						
						
						
						
					 | 
					
						2016-03-19 23:51:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							e58ec31e20
							
						
					 | 
					
						
						
							
							Fixing warnings
						
						
						
						
						
					 | 
					
						2016-03-18 10:14:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e5ebc9457
							
						
					 | 
					
						
						
							
							missing mut
						
						
						
						
						
					 | 
					
						2016-03-14 14:22:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6e8c03ff6
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:ethcore/parity into titi
						
						
						
						
						
					 | 
					
						2016-03-14 14:18:59 +01:00 | 
					
					
						
						
							
							
							
						
					 |