| 
							
							
								 Tomasz Drwięga | 62c32eb288 | Merge branch 'master' into tx_queue_live Conflicts:
	miner/src/miner.rs | 2016-03-18 19:31:14 +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 | 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 | 942d38fb13 | Removing allow dead_code | 2016-03-18 10:22:00 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 338e5fadb9 | Bumping clippy | 2016-03-18 10:08:47 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | cee45e1a8e | Merge branch 'master' into tx_queue_live Conflicts:
	miner/src/miner.rs | 2016-03-18 09:48:35 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | a6bd15d333 | Fixing compilation | 2016-03-18 09:46:13 +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 | fece330ca4 | Refactoring removing invalid transactions from queue | 2016-03-17 15:30:03 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 309af743e0 | Ignoring transactions slightly above gas_limit | 2016-03-17 15:23:25 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | dec69651fd | Attempting to add all transactions to mined block | 2016-03-17 13:41:30 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 833c5fdd31 | Merge branch 'master' into tx_queue_live Conflicts:
	sync/src/chain.rs | 2016-03-17 13:35:01 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | a76eb022d0 | Merge pull request #746 from ethcore/tx_queue Verify sender's balance before importing transaction to queue | 2016-03-17 13:32:48 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | e1c3ab1846 | Renaming status fields to something more descriptive. | 2016-03-17 13:07:34 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | b684bc9ba0 | Updating sealing when new transactions are received | 2016-03-17 12:52:26 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | c382fa7eab | Removing invalid transactions from queue | 2016-03-17 12:29:55 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 7247f9e27f | Fixing doctest | 2016-03-17 12:23:15 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 884f2dd873 | Returning number of transactions pending in block not queue | 2016-03-17 11:19:12 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 95dda4aa68 | Full transaction cost | 2016-03-17 10:44:10 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 0925968840 | Adding test | 2016-03-16 17:22:23 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 8741a85443 | Fixing build | 2016-03-16 16:56:36 +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 | 974222aabd | Removing printlns | 2016-03-15 23:13:53 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 188e325b20 | Importing transactions from hashset. Notifying about every block | 2016-03-15 23:01:36 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 40ac01b730 | Fixing possible race in transaction queue | 2016-03-15 10:54:19 +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 |  | 
			
				
					| 
							
							
								 Gav Wood | 7af0a1dc2c | Missing comma. | 2016-03-14 02:02:32 +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 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | e2e067cdd0 | Bumping clippy | 2016-03-13 20:44: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 | 9424d53062 | Update lib.rs | 2016-03-12 10:37:27 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | aebc91d96f | Merge branch 'master' into ethminer_crate Conflicts:
	Cargo.toml
	rpc/Cargo.toml
	sync/Cargo.toml | 2016-03-12 09:50:18 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | fadbc61dff | Merge branch 'ethminer_crate' into rpc_pending_filter Conflicts:
	miner/src/miner.rs
	parity/main.rs | 2016-03-11 19:27:09 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 197ea7f7d6 | Using miner in rpc instead of sync | 2016-03-11 14:51:07 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 03da6c991f | Merge branch 'master' into ethminer_crate Conflicts:
	Cargo.lock
	Cargo.toml
	ethcore/src/client/client.rs
	hook.sh
	parity/main.rs
	rpc/Cargo.toml
	rpc/src/v1/impls/eth.rs
	sync/Cargo.toml
	sync/src/tests/helpers.rs | 2016-03-11 14:37:07 +01:00 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 55a14b3aaf | Fixing transaction queue test | 2016-03-11 11:40:12 +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 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | c37370a8a7 | PendingTransaction filter. | 2016-03-10 16:04:59 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 9ea3c0eba0 | Fixing compilation on beta & stable | 2016-03-10 15:20:54 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 9db4720162 | Fixing clippy warnings. | 2016-03-10 14:15:47 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 0535fb30c6 | Merge branch 'master' into ethminer_crate Conflicts:
	sync/src/lib.rs | 2016-03-10 14:03:09 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | eb1fab9202 | Adding clippy support to ethminer. | 2016-03-10 12:33:29 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 2e72173620 | Merge branch 'master' into ethminer_crate Conflicts:
	Cargo.lock
	Cargo.toml
	hook.sh
	miner/src/transaction_queue.rs
	rpc/Cargo.toml
	sync/Cargo.toml
	sync/src/chain.rs | 2016-03-10 12:25:36 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 3c0587b375 | Merge branch 'ethminer_crate' into tx_queue_min_gas | 2016-03-09 15:27:27 +01:00 |  | 
			
				
					| 
							
							
								 Tomasz Drwięga | 3d74e5bd47 | Fixing doctest | 2016-03-09 15:27:07 +01:00 |  |