Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							f2a08d57e4 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rpc-logs  
						
						 
						
						... 
						
						
						
						Conflicts:
	rpc/src/v1/tests/ethcore.rs
	rpc/src/v1/traits/ethcore.rs 
						
					 
					
						2016-04-19 19:59:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marek Kotewicz 
							
						 
					 
					
						
						
						
						
							
						
						
							225a5ee825 
							
						 
					 
					
						
						
							
							removed redundant unwraps ( #935 )  
						
						 
						
						... 
						
						
						
						* removed redundant unwraps
* fixed compilation error, removed warnings
* fixed transaction queue merge conflict
* fixed failing ethminer doc test 
						
					 
					
						2016-04-19 10:35:32 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							407ab30503 
							
						 
					 
					
						
						
							
							Using ArrayVec to store logs  
						
						 
						
						
						
					 
					
						2016-04-19 19:22:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							a21f2a0998 
							
						 
					 
					
						
						
							
							Exposing loggin via RPC  
						
						 
						
						
						
					 
					
						2016-04-19 18:27:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							2f174a6441 
							
						 
					 
					
						
						
							
							Merge pull request  #975  from ethcore/fixed_tq_merge_conflict  
						
						 
						
						... 
						
						
						
						fixed transaction queue merge conflict 
						
					 
					
						2016-04-19 18:24:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								debris 
							
						 
					 
					
						
						
						
						
							
						
						
							314ced57c8 
							
						 
					 
					
						
						
							
							fixed transaction queue merge conflict  
						
						 
						
						
						
					 
					
						2016-04-19 16:20:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marek Kotewicz 
							
						 
					 
					
						
						
						
						
							
						
						
							46c8324c52 
							
						 
					 
					
						
						
							
							Merge pull request  #974  from ethcore/tx-limit-conf  
						
						 
						
						... 
						
						
						
						Configurable limit for transaction queue (CLI & Ethcore-RPC) 
						
					 
					
						2016-04-19 16:02:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marek Kotewicz 
							
						 
					 
					
						
						
						
						
							
						
						
							b8eb3d07ba 
							
						 
					 
					
						
						
							
							Merge pull request  #973  from ethcore/tx-limit-bug  
						
						 
						
						... 
						
						
						
						Enforce limit caused `last_nonce` to return incorrect values. 
						
					 
					
						2016-04-19 16:02:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							3c67ac636b 
							
						 
					 
					
						
						
							
							Merge branch 'master' into tx-limit-conf  
						
						 
						
						... 
						
						
						
						Conflicts:
	miner/src/transaction_queue.rs 
						
					 
					
						2016-04-19 00:03:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							10e2659600 
							
						 
					 
					
						
						
							
							Fixing last_nonces updating when transactions are removed because of the limit  
						
						 
						
						
						
					 
					
						2016-04-19 00:00:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							98b3962412 
							
						 
					 
					
						
						
							
							RPC methods to set the limits  
						
						 
						
						
						
					 
					
						2016-04-18 23:13:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							5df817c8e0 
							
						 
					 
					
						
						
							
							Setting limit from CLI  
						
						 
						
						
						
					 
					
						2016-04-18 23:03:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							cd044ec096 
							
						 
					 
					
						
						
							
							Merge branch 'master' into tx-limit-bug  
						
						 
						
						... 
						
						
						
						Conflicts:
	miner/src/transaction_queue.rs 
						
					 
					
						2016-04-18 21:58:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							caf4d179a2 
							
						 
					 
					
						
						
							
							Even more detailed errors for transaction queue ( #969 )  
						
						 
						
						... 
						
						
						
						* Even more detailed errors for transaction queue
* Small rename
* Removing macros in favour of functions+try!() 
						
					 
					
						2016-04-18 10:34:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							58c47069d8 
							
						 
					 
					
						
						
							
							Enforce-limit + last_nonces bug  
						
						 
						
						
						
					 
					
						2016-04-18 18:39:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							41153dd37c 
							
						 
					 
					
						
						
							
							Removing macros in favour of functions+try!()  
						
						 
						
						
						
					 
					
						2016-04-18 17:20:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							55051951f8 
							
						 
					 
					
						
						
							
							Merge pull request  #970  from ethcore/blockchain_panic_fix  
						
						 
						
						... 
						
						
						
						temporary fix of panic in blockchain garbage collection 
						
					 
					
						2016-04-18 15:30:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								debris 
							
						 
					 
					
						
						
						
						
							
						
						
							524a495ffd 
							
						 
					 
					
						
						
							
							temporary fix of panic in blockchain garbage collection  
						
						 
						
						
						
					 
					
						2016-04-18 15:18:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							2812f8cae6 
							
						 
					 
					
						
						
							
							Small rename  
						
						 
						
						
						
					 
					
						2016-04-18 13:35:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							881678b613 
							
						 
					 
					
						
						
							
							Even more detailed errors for transaction queue  
						
						 
						
						
						
					 
					
						2016-04-18 13:16:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							5aa54e0c1a 
							
						 
					 
					
						
						
							
							Merge pull request  #967  from ethcore/ipc-codegen-upgrades  
						
						 
						
						... 
						
						
						
						IPC codegen - some minor fixes & enhancements 
						
					 
					
						2016-04-18 12:55:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							5b8ca74d65 
							
						 
					 
					
						
						
							
							Merge pull request  #968  from ethcore/tx-tracing  
						
						 
						
						... 
						
						
						
						Additional logging for transactions 
						
					 
					
						2016-04-18 10:41:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							d093c5755e 
							
						 
					 
					
						
						
							
							Moving own transaction tracing to miner create  
						
						 
						
						
						
					 
					
						2016-04-17 20:36:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nikolay Volf 
							
						 
					 
					
						
						
						
						
							
						
						
							3c1c3ac156 
							
						 
					 
					
						
						
							
							Merge pull request  #963  from ethcore/dbkeys  
						
						 
						
						... 
						
						
						
						refactored blockchain extras keys building 
						
					 
					
						2016-04-17 20:48:06 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							8389f771e9 
							
						 
					 
					
						
						
							
							Tracing whole transaction  
						
						 
						
						
						
					 
					
						2016-04-17 18:36:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nikolay Volf 
							
						 
					 
					
						
						
						
						
							
						
						
							3c88e70270 
							
						 
					 
					
						
						
							
							upgrades from try-migration branch  
						
						 
						
						
						
					 
					
						2016-04-17 19:30:23 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							5086880093 
							
						 
					 
					
						
						
							
							Additional logging for transactions  
						
						 
						
						
						
					 
					
						2016-04-17 18:26:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							5547b44e5a 
							
						 
					 
					
						
						
							
							Merge pull request  #957  from ethcore/webapps-mio  
						
						 
						
						... 
						
						
						
						Using hyper-mio branch in webapps. 
						
					 
					
						2016-04-17 15:36:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							6826712861 
							
						 
					 
					
						
						
							
							Merge pull request  #965  from ethcore/build-remove-nano  
						
						 
						
						... 
						
						
						
						Remove nanomsg from build-dependencies 
						
					 
					
						2016-04-17 13:52:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nikolay Volf 
							
						 
					 
					
						
						
						
						
							
						
						
							0ffc222fba 
							
						 
					 
					
						
						
							
							no need for ipc in build-dependencies  
						
						 
						
						
						
					 
					
						2016-04-17 14:11:45 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nikolay Volf 
							
						 
					 
					
						
						
						
						
							
						
						
							799f1b7b08 
							
						 
					 
					
						
						
							
							Merge pull request  #964  from petevine/master  
						
						 
						
						... 
						
						
						
						Fix build for --target=armv7-unknown-linux-gnueabihf 
						
					 
					
						2016-04-17 04:42:40 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								petevine 
							
						 
					 
					
						
						
						
						
							
						
						
							763d78af87 
							
						 
					 
					
						
						
							
							Update dependencies  
						
						 
						
						
						
					 
					
						2016-04-17 01:50:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							7516b737ee 
							
						 
					 
					
						
						
							
							Fixing compilation errors  
						
						 
						
						
						
					 
					
						2016-04-16 00:57:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								debris 
							
						 
					 
					
						
						
						
						
							
						
						
							5c4086bf8e 
							
						 
					 
					
						
						
							
							log errors when db queries fails  
						
						 
						
						
						
					 
					
						2016-04-15 19:32:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								debris 
							
						 
					 
					
						
						
						
						
							
						
						
							295efdba55 
							
						 
					 
					
						
						
							
							refactored blockchain extras keys building  
						
						 
						
						
						
					 
					
						2016-04-15 18:54:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							ca4ddfb963 
							
						 
					 
					
						
						
							
							Merge pull request  #962  from ethcore/ipc-nested-interfaces  
						
						 
						
						... 
						
						
						
						IPC RPC codegen extra feature 
						
					 
					
						2016-04-15 17:46:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							13c25c5d49 
							
						 
					 
					
						
						
							
							Merge branch 'master' into webapps-mio  
						
						 
						
						... 
						
						
						
						Conflicts:
	Cargo.lock
	parity/main.rs 
						
					 
					
						2016-04-15 17:14:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							29b0bb1184 
							
						 
					 
					
						
						
							
							ipc-nested-interfaces  
						
						 
						
						
						
					 
					
						2016-04-15 17:50:10 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							59f98a2a20 
							
						 
					 
					
						
						
							
							Merge pull request  #961  from ethcore/ipc-nested-interfaces  
						
						 
						
						... 
						
						
						
						IPC RPC codegen for generic implementation 
						
					 
					
						2016-04-15 16:30:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							38fa25edbe 
							
						 
					 
					
						
						
							
							Merge pull request  #960  from ethcore/upgrade-path  
						
						 
						
						... 
						
						
						
						using db_path directory when upgrading 
						
					 
					
						2016-04-15 16:30:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							099e57c4e3 
							
						 
					 
					
						
						
							
							fix warning  
						
						 
						
						
						
					 
					
						2016-04-15 16:33:42 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							d5b6f42965 
							
						 
					 
					
						
						
							
							Merge branch 'master' into ipc-nested-interfaces  
						
						 
						
						
						
					 
					
						2016-04-15 16:17:25 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								NikVolf 
							
						 
					 
					
						
						
						
						
							
						
						
							058ef59b13 
							
						 
					 
					
						
						
							
							codegen for service with generics  
						
						 
						
						
						
					 
					
						2016-04-15 16:16:58 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							d84f382ab8 
							
						 
					 
					
						
						
							
							fixed build  
						
						 
						
						
						
					 
					
						2016-04-15 14:45:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								arkpar 
							
						 
					 
					
						
						
						
						
							
						
						
							e7d8cfb8e0 
							
						 
					 
					
						
						
							
							update nanomsg-sys  
						
						 
						
						
						
					 
					
						2016-04-15 13:56:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arkadiy Paronyan 
							
						 
					 
					
						
						
						
						
							
						
						
							b441750cc9 
							
						 
					 
					
						
						
							
							Merge pull request  #958  from ethcore/ipc-hypervisor  
						
						 
						
						... 
						
						
						
						IPC hypervisor 
						
					 
					
						2016-04-15 10:31:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tomasz Drwięga 
							
						 
					 
					
						
						
						
						
							
						
						
							00372cf747 
							
						 
					 
					
						
						
							
							Removing a transaction from queue now removes all from this sender with lower nonces. ( #950 )  
						
						 
						
						... 
						
						
						
						* Changing  to wipe-out all transactions from particular sender lower then given nonce.
* Changing given nonce to be client_nonce
* Fixing test_client to support proper nonces when transactions are added to blockchain
* Fixing logic for transactions from new blocks in chain 
						
					 
					
						2016-04-14 22:38:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							0b589915b9 
							
						 
					 
					
						
						
							
							Update auth.rs  
						
						 
						
						
						
					 
					
						2016-04-14 22:24:13 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							16ad086e7f 
							
						 
					 
					
						
						
							
							Update mod.rs  
						
						 
						
						
						
					 
					
						2016-04-14 22:23:20 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gav Wood 
							
						 
					 
					
						
						
						
						
							
						
						
							264c9bfd3c 
							
						 
					 
					
						
						
							
							Update lib.rs  
						
						 
						
						
						
					 
					
						2016-04-14 22:16:58 -07:00