Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							2fd036b073
							
						
					 | 
					
						
						
							
							Merge branch 'ethminer_crate' into rpc_pending_filter
						
						
						
						
						
						
						
						Conflicts:
	rpc/src/v1/helpers/poll_manager.rs
	rpc/src/v1/impls/eth.rs 
						
					 | 
					
						2016-03-11 11:44:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							68a13973a4
							
						
					 | 
					
						
						
							
							fixed ethcore-rpc tests build after merge
						
						
						
						
						
					 | 
					
						2016-03-11 11:42:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							55a14b3aaf
							
						
					 | 
					
						
						
							
							Fixing transaction queue test
						
						
						
						
						
					 | 
					
						2016-03-11 11:40:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb8e92c37f
							
						
					 | 
					
						
						
							
							Cargo.lock
						
						
						
						
						
					 | 
					
						2016-03-11 11:18:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							389d17974e
							
						
					 | 
					
						
						
							
							Merge branch 'client_submodules' into rpc_tests
						
						
						
						
						
					 | 
					
						2016-03-11 11:17:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							ebd2a92267
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:ethcore/parity into client_submodules
						
						
						
						
						
					 | 
					
						2016-03-11 11:17:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							d84e008e00
							
						
					 | 
					
						
						
							
							Removing superflous check for nightly
						
						
						
						
						
					 | 
					
						2016-03-11 11:16:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Kotewicz
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd39975cf0
							
						
					 | 
					
						
						
							
							Merge pull request #587 from ethcore/rpc-signing-extend
						
						
						
						
						
						
						
						Rpc transaction signing 
						
					 | 
					
						2016-03-11 11:14:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Kotewicz
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb2171e287
							
						
					 | 
					
						
						
							
							Merge pull request #652 from ethcore/tx_queue_rpc
						
						
						
						
						
						
						
						Transaction queue exposed via JSON rpc. 
						
					 | 
					
						2016-03-11 11:08:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ea53d39e6
							
						
					 | 
					
						
						
							
							Merge branch 'client_submodules' into rpc_tests
						
						
						
						
						
					 | 
					
						2016-03-11 11:05:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							a8a21da9ba
							
						
					 | 
					
						
						
							
							Updating hook and removing running clippy from dev-dependencies
						
						
						
						
						
					 | 
					
						2016-03-11 11:05:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							bfac5f9238
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:ethcore/parity into client_submodules
						
						
						
						
						
					 | 
					
						2016-03-11 11:03:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							18939462c3
							
						
					 | 
					
						
						
							
							sync_provider function
						
						
						
						
						
					 | 
					
						2016-03-11 11:03:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Kotewicz
							
						 
					 | 
					
						
						
						
						
							
						
						
							8d6ea3a0ef
							
						
					 | 
					
						
						
							
							Merge pull request #499 from ethcore/thread
						
						
						
						
						
						
						
						Remove unneeded locking 
						
					 | 
					
						2016-03-11 10:59:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							8709dd28f8
							
						
					 | 
					
						
						
							
							Fixing clippy warnings
						
						
						
						
						
					 | 
					
						2016-03-11 10:58:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							3a4a7ac822
							
						
					 | 
					
						
						
							
							Bumping clippy version
						
						
						
						
						
					 | 
					
						2016-03-11 10:35:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b204a5ff5
							
						
					 | 
					
						
						
							
							Merge branch 'master' into ethminer_crate
						
						
						
						
						
						
						
						Conflicts:
	parity/main.rs
	rpc/src/v1/impls/eth.rs
	sync/src/lib.rs 
						
					 | 
					
						2016-03-11 10:31:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							3479a9bf95
							
						
					 | 
					
						
						
							
							Merge branch 'client_submodules' into rpc_tests
						
						
						
						
						
					 | 
					
						2016-03-11 10:30:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6d268db16
							
						
					 | 
					
						
						
							
							fixed missing reexport
						
						
						
						
						
					 | 
					
						2016-03-11 10:30:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							8e52510dbb
							
						
					 | 
					
						
						
							
							implemented net_listening method
						
						
						
						
						
					 | 
					
						2016-03-11 10:21:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							3bbdc03d0c
							
						
					 | 
					
						
						
							
							Fixing doctest.
						
						
						
						
						
					 | 
					
						2016-03-11 10:17:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							34a120e127
							
						
					 | 
					
						
						
							
							net tests
						
						
						
						
						
					 | 
					
						2016-03-11 10:17:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9c462a3d3
							
						
					 | 
					
						
						
							
							Use proper listen address. Tidyups.
						
						
						
						
						
					 | 
					
						2016-03-11 10:05:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							4c757997f6
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into moregethcli
						
						
						
						
						
					 | 
					
						2016-03-10 21:41:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							29916edb91
							
						
					 | 
					
						
						
							
							More geth compatibility.
						
						
						
						
						
					 | 
					
						2016-03-10 21:36:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							87dd42f7bc
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:ethcore/parity into client_submodules
						
						
						
						
						
					 | 
					
						2016-03-10 21:17:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							06a3abd01e
							
						
					 | 
					
						
						
							
							Removed unused return type
						
						
						
						
						
					 | 
					
						2016-03-10 21:15:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							8785bd37e8
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:ethcore/parity into jdb_option2
						
						
						
						
						
					 | 
					
						2016-03-10 21:06:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							5f37f6edb4
							
						
					 | 
					
						
						
							
							Correct cache update order
						
						
						
						
						
					 | 
					
						2016-03-10 21:01:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5c8851b50
							
						
					 | 
					
						
						
							
							moved TestBlockChainClient to ethcore
						
						
						
						
						
					 | 
					
						2016-03-10 20:27:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							a2dea3885b
							
						
					 | 
					
						
						
							
							refactoring to AccountService
						
						
						
						
						
					 | 
					
						2016-03-10 23:09:45 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							84a48142de
							
						
					 | 
					
						
						
							
							Add more geth options.
						
						
						
						
						
					 | 
					
						2016-03-10 19:50:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							a207b6a17e
							
						
					 | 
					
						
						
							
							Merge pull request #664 from ethcore/sync-provider
						
						
						
						
						
						
						
						extend sync status interface to sync provider 
						
					 | 
					
						2016-03-10 21:18:41 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							47aacbb819
							
						
					 | 
					
						
						
							
							work is in progress
						
						
						
						
						
					 | 
					
						2016-03-10 21:56:02 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a24bb7cc6
							
						
					 | 
					
						
						
							
							Merge pull request #663 from ethcore/archive_default
						
						
						
						
						
						
						
						--archive is default. --pruning is option. 
						
					 | 
					
						2016-03-10 20:48:04 +03:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6b5aad8c9
							
						
					 | 
					
						
						
							
							Merge branch 'master' of github.com:ethcore/parity into thread
						
						
						
						
						
					 | 
					
						2016-03-10 18:40:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							25a63611f8
							
						
					 | 
					
						
						
							
							extend sync status interface to sync provider
						
						
						
						
						
					 | 
					
						2016-03-10 20:32:17 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							5571503c22
							
						
					 | 
					
						
						
							
							traitified secret store
						
						
						
						
						
					 | 
					
						2016-03-10 20:18:01 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							c951dee766
							
						
					 | 
					
						
						
							
							--archive is default. --pruning is option.
						
						
						
						
						
					 | 
					
						2016-03-10 17:09:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							0eaf0a8db1
							
						
					 | 
					
						
						
							
							Updating hook.
						
						
						
						
						
					 | 
					
						2016-03-10 16:40:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							92022ac14d
							
						
					 | 
					
						
						
							
							Merge branch 'master' into ethminer_crate
						
						
						
						
						
						
						
						Conflicts:
	ethcore/src/client.rs
	parity/main.rs
	rpc/src/v1/impls/eth.rs
	sync/src/chain.rs 
						
					 | 
					
						2016-03-10 16:38:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							094ae4e9f9
							
						
					 | 
					
						
						
							
							personal is back to the master ver
						
						
						
						
						
					 | 
					
						2016-03-10 19:15:10 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							3b21a5f54c
							
						
					 | 
					
						
						
							
							Merge branch 'master' into rpc-signing-extend
						
						
						
						
						
						
						
						Conflicts:
	parity/main.rs 
						
					 | 
					
						2016-03-10 19:08:41 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							c37370a8a7
							
						
					 | 
					
						
						
							
							PendingTransaction filter.
						
						
						
						
						
					 | 
					
						2016-03-10 16:04:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							8dd41bfe0c
							
						
					 | 
					
						
						
							
							Merge pull request #641 from ethcore/jsonrpc_interfaces
						
						
						
						
						
						
						
						jsonrpc uses client and sync interfaces 
						
					 | 
					
						2016-03-10 15:44:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							9741d48496
							
						
					 | 
					
						
						
							
							Transaction data associated with polls.
						
						
						
						
						
					 | 
					
						2016-03-10 15:35:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							5764ec5ddc
							
						
					 | 
					
						
						
							
							Merge pull request #609 from ethcore/tx-rpc-expose
						
						
						
						
						
						
						
						Expose transaction insertion in sync lib 
						
					 | 
					
						2016-03-10 15:28:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							29ddf34d6d
							
						
					 | 
					
						
						
							
							Merge pull request #660 from ethcore/poll_get
						
						
						
						
						
						
						
						Removing get prefix from poll_info 
						
					 | 
					
						2016-03-10 15:24:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							9ea3c0eba0
							
						
					 | 
					
						
						
							
							Fixing compilation on beta & stable
						
						
						
						
						
					 | 
					
						2016-03-10 15:20:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							027f122aea
							
						
					 | 
					
						
						
							
							Removing get prefix from poll_info
						
						
						
						
						
					 | 
					
						2016-03-10 14:24:33 +01:00 | 
					
					
						
						
							
							
							
						
					 |