Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8dd1a6354
							
						
					 | 
					
						
						
							
							Merge branch 'master' into tx_queue_timeout
						
						
						
						
						
						
						
						Conflicts:
	ethcore/src/client/test_client.rs
	miner/src/miner.rs 
						
					 | 
					
						2016-03-18 19:36:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							2309e19fd9
							
						
					 | 
					
						
						
							
							Merge pull request #760 from ethcore/tx_queue_gas_limit
						
						
						
						
						
						
						
						Avoid importing transactions with gas above 1.1*block_gas_limit to transaction queue 
						
					 | 
					
						2016-03-18 18:05:26 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1fb0619bb
							
						
					 | 
					
						
						
							
							Merge pull request #752 from ethcore/tx_queue_invalid
						
						
						
						
						
						
						
						Removing transactions that failed to be pushed to block. 
						
					 | 
					
						2016-03-18 18:03:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							7d77324765
							
						
					 | 
					
						
						
							
							BlockGasLimit taken from push_transaction result
						
						
						
						
						
					 | 
					
						2016-03-18 14:22:50 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							0dc1ddef9a
							
						
					 | 
					
						
						
							
							Flipping sealing_enabled flag after no requests for sealing_block for some time
						
						
						
						
						
					 | 
					
						2016-03-18 13:59:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							58bb5e967a
							
						
					 | 
					
						
						
							
							Merge branch 'master' into tx_queue_gas_limit
						
						
						
						
						
						
						
						Conflicts:
	miner/src/transaction_queue.rs 
						
					 | 
					
						2016-03-18 12:25:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							7fb365634a
							
						
					 | 
					
						
						
							
							Updating gas_limit in test_client generated blocks
						
						
						
						
						
					 | 
					
						2016-03-18 10:36:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							e58ec31e20
							
						
					 | 
					
						
						
							
							Fixing warnings
						
						
						
						
						
					 | 
					
						2016-03-18 10:14:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							338e5fadb9
							
						
					 | 
					
						
						
							
							Bumping clippy
						
						
						
						
						
					 | 
					
						2016-03-18 10:08:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							48c72a168c
							
						
					 | 
					
						
						
							
							Merge branch 'master' into tx_queue_invalid
						
						
						
						
						
					 | 
					
						2016-03-18 09:44:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ae60056b2
							
						
					 | 
					
						
						
							
							Common error handling
						
						
						
						
						
					 | 
					
						2016-03-17 16:13:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							309af743e0
							
						
					 | 
					
						
						
							
							Ignoring transactions slightly above gas_limit
						
						
						
						
						
					 | 
					
						2016-03-17 15:23:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4021a77ca
							
						
					 | 
					
						
						
							
							Stop adding transactions right after we know that no other will make it to block.
						
						
						
						
						
					 | 
					
						2016-03-17 14:40:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							c382fa7eab
							
						
					 | 
					
						
						
							
							Removing invalid transactions from queue
						
						
						
						
						
					 | 
					
						2016-03-17 12:29:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							b1557b547b
							
						
					 | 
					
						
						
							
							Reverting check if block queue is empty
						
						
						
						
						
					 | 
					
						2016-03-17 11:47:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							fdba8de600
							
						
					 | 
					
						
						
							
							Validating senders balance before importing transaction to queue
						
						
						
						
						
					 | 
					
						2016-03-16 10:45:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							be32e79a7a
							
						
					 | 
					
						
						
							
							Merge branch 'master' into tx_queue
						
						
						
						
						
					 | 
					
						2016-03-16 09:28:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							188e325b20
							
						
					 | 
					
						
						
							
							Importing transactions from hashset. Notifying about every block
						
						
						
						
						
					 | 
					
						2016-03-15 23:01:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							9dea31031c
							
						
					 | 
					
						
						
							
							Enact block with uncles test
						
						
						
						
						
					 | 
					
						2016-03-15 14:35:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							e5f54966af
							
						
					 | 
					
						
						
							
							Merge pull request #734 from ethcore/fixblockchainrace
						
						
						
						
						
						
						
						Don't change best block until extras is committed. 
						
					 | 
					
						2016-03-15 11:56:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							59d0d2df9a
							
						
					 | 
					
						
						
							
							Don't change best block until extras is committed.
						
						
						
						
						
					 | 
					
						2016-03-15 10:59:58 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							d6d0f8d4eb
							
						
					 | 
					
						
						
							
							Merge pull request #725 from ethcore/unclesminingfix
						
						
						
						
						
						
						
						Add RLP, not a data item. 
						
					 | 
					
						2016-03-14 20:20:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							7ba396b8d3
							
						
					 | 
					
						
						
							
							Merge pull request #687 from ethcore/pv63-receipts
						
						
						
						
						
						
						
						PV63 receipts response 
						
					 | 
					
						2016-03-14 20:18:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							7628df6fe6
							
						
					 | 
					
						
						
							
							Merge pull request #723 from ethcore/rpc_tests
						
						
						
						
						
						
						
						another batch of rpc tests 
						
					 | 
					
						2016-03-14 19:18:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							97051cb949
							
						
					 | 
					
						
						
							
							Add RLP, not a data item.
						
						
						
						
						
					 | 
					
						2016-03-14 18:20:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							8cdb013f9f
							
						
					 | 
					
						
						
							
							Merge branch 'master' into pv63-receipts
						
						
						
						
						
						
						
						Conflicts:
	ethcore/src/client/client.rs 
						
					 | 
					
						2016-03-14 17:36:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b241faf01
							
						
					 | 
					
						
						
							
							uncle method mock
						
						
						
						
						
					 | 
					
						2016-03-14 17:01:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							0de73609d2
							
						
					 | 
					
						
						
							
							eth_hashrate && eth_submitHashrate tests
						
						
						
						
						
					 | 
					
						2016-03-14 14:18:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Arkadiy Paronyan
							
						 
					 | 
					
						
						
						
						
							
						
						
							38de95cc3b
							
						
					 | 
					
						
						
							
							Merge pull request #719 from ethcore/targetgaslimit
						
						
						
						
						
						
						
						Allow configuration of target gas limit. 
						
					 | 
					
						2016-03-14 14:04:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f4323f3bb
							
						
					 | 
					
						
						
							
							Merge branch 'master' into pv63-receipts
						
						
						
						
						
						
						
						Conflicts:
	ethcore/src/client/test_client.rs 
						
					 | 
					
						2016-03-14 11:06:28 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							3eb08b0d61
							
						
					 | 
					
						
						
							
							fix tests and deuncommented
						
						
						
						
						
					 | 
					
						2016-03-14 10:53:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc8b9c3205
							
						
					 | 
					
						
						
							
							Fix build.
						
						
						
						
						
					 | 
					
						2016-03-14 10:48:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							829ed4d0a6
							
						
					 | 
					
						
						
							
							commented empty slice/vec comparison
						
						
						
						
						
					 | 
					
						2016-03-14 10:47:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6b7884a1d
							
						
					 | 
					
						
						
							
							Allow configuration of target gas limit.
						
						
						
						
						
					 | 
					
						2016-03-14 02:00:22 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							9e7ff2c00e
							
						
					 | 
					
						
						
							
							Version 1.1
						
						
						
						
						
					 | 
					
						2016-03-14 01:00:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							5c964694b4
							
						
					 | 
					
						
						
							
							Merge pull request #706 from ethcore/fix-accountdb
						
						
						
						
						
						
						
						Check for NULL_RLP in AccountDB 
						
					 | 
					
						2016-03-13 22:29:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								arkpar
							
						 
					 | 
					
						
						
						
						
							
						
						
							420f473f90
							
						
					 | 
					
						
						
							
							Check for NULL_RLP in AccountDB
						
						
						
						
						
					 | 
					
						2016-03-13 21:28:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							b4f7f220f1
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into merge_ethminer
						
						
						
						
						
					 | 
					
						2016-03-13 16:35:52 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							809c239ff8
							
						
					 | 
					
						
						
							
							fix rev
						
						
						
						
						
					 | 
					
						2016-03-13 15:59:25 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							76696e3b49
							
						
					 | 
					
						
						
							
							Minor build fixes.
						
						
						
						
						
					 | 
					
						2016-03-13 15:36:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							08b9cc2c41
							
						
					 | 
					
						
						
							
							Merge changes from #674 into branch.
						
						
						
						
						
					 | 
					
						2016-03-13 15:29:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Gav Wood
							
						 
					 | 
					
						
						
						
						
							
						
						
							02f43f2e8c
							
						
					 | 
					
						
						
							
							Merge branch 'ethminer_crate'
						
						
						
						
						
					 | 
					
						2016-03-13 15:00:47 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							00820c342a
							
						
					 | 
					
						
						
							
							fixed eth_getCode and added tests for it
						
						
						
						
						
					 | 
					
						2016-03-13 14:45:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							487ba9b08a
							
						
					 | 
					
						
						
							
							implemented eth_storageAt rpc method, added more tests for rpc
						
						
						
						
						
					 | 
					
						2016-03-13 12:09:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Marek Kotewicz
							
						 
					 | 
					
						
						
						
						
							
						
						
							1f8e0f86ac
							
						
					 | 
					
						
						
							
							Merge pull request #688 from ethcore/updating_clippy
						
						
						
						
						
						
						
						Updating clippy 
						
					 | 
					
						2016-03-13 10:07:44 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								debris
							
						 
					 | 
					
						
						
						
						
							
						
						
							e09de6ea3d
							
						
					 | 
					
						
						
							
							added missing eth_getBalance rpc method and tests for it
						
						
						
						
						
					 | 
					
						2016-03-12 19:51:24 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							0684abd345
							
						
					 | 
					
						
						
							
							fixed to return receipts grouped by requested block
						
						
						
						
						
					 | 
					
						2016-03-12 19:23:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							bd9cfb4ee5
							
						
					 | 
					
						
						
							
							Merge branch 'pv63-state' into pv63-receipts
						
						
						
						
						
					 | 
					
						2016-03-12 18:52:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Nikolay Volf
							
						 
					 | 
					
						
						
						
						
							
						
						
							ade8b8356b
							
						
					 | 
					
						
						
							
							Merge branch 'master' into pv63-state
						
						
						
						
						
						
						
						Conflicts:
	ethcore/src/client/client.rs 
						
					 | 
					
						2016-03-12 18:09:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Tomasz Drwięga
							
						 
					 | 
					
						
						
						
						
							
						
						
							19b6c74675
							
						
					 | 
					
						
						
							
							Two more warnings
						
						
						
						
						
					 | 
					
						2016-03-12 13:39:17 +01:00 | 
					
					
						
						
							
							
							
						
					 |