Commit Graph

3171 Commits

Author SHA1 Message Date
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 58bb5e967a Merge branch 'master' into tx_queue_gas_limit
Conflicts:
	miner/src/transaction_queue.rs
2016-03-18 12:25:36 +01:00
Gav Wood 4e97a0b868 Merge pull request #766 from ethcore/updating_clippy
Updating clippy
2016-03-18 12:16:03 +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 942d38fb13 Removing allow dead_code 2016-03-18 10:22:00 +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 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
Arkadiy Paronyan 0d77937caf Merge pull request #754 from ethcore/tx_queue_all
Attempting to add all transactions to mined block
2016-03-17 20:02:54 +01:00
Gav Wood 4da8ede826 Merge pull request #761 from ethcore/ver-fix
Prettier version w/o git dir; Use rustc compile time version
2016-03-17 19:32:42 +01:00
arkpar a61d1d8d51 Indent 2016-03-17 18:43:01 +01:00
arkpar b1793fcb16 Prettier version wo git dir; Use rustc compile time version 2016-03-17 18:41:55 +01:00
Gav Wood 3fb180973b Merge pull request #751 from ethcore/tq-stop-sync
Stop adding transactions to queue while not fully synced
2016-03-17 15:47:06 +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
Nikolay Volf 85b08e6e7b get rid of the function 2016-03-17 15:09:08 +01:00
Nikolay Volf 7929af67c8 propagation is out 2016-03-17 15:02:18 +01:00
Nikolay Volf 0f96ce9bd2 no flag also 2016-03-17 14:56:19 +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
Nikolay Volf 0b35a36cb0 Merge branch 'master' into tq-stop-sync
Conflicts:
	sync/src/chain.rs
2016-03-17 14:19:12 +01:00
Nikolay Volf a285fbab6d overhaul to flag 2016-03-17 14:11:32 +01:00
Tomasz Drwięga dec69651fd Attempting to add all transactions to mined block 2016-03-17 13:41:30 +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
Gav Wood c88601a376 Merge pull request #750 from ethcore/tx_block_pending
Returning number of transactions pending in block not queue
2016-03-17 13:21:06 +01:00
Tomasz Drwięga caedb64ade Adding missing space 2016-03-17 13:18:26 +01:00
Nikolay Volf 83f5cc6aa6 adding helper can_sync 2016-03-17 13:14:06 +01:00
Tomasz Drwięga e1c3ab1846 Renaming status fields to something more descriptive. 2016-03-17 13:07:34 +01:00
Arkadiy Paronyan cd26ccba6b Merge pull request #733 from ethcore/build_speedup
Speeding up build
2016-03-17 12:47:29 +01:00
Tomasz Drwięga c382fa7eab Removing invalid transactions from queue 2016-03-17 12:29:55 +01:00
Nikolay Volf 5c4edbdd6b Merge branch 'master' into tq-stop-sync 2016-03-17 12:25:14 +01:00
Arkadiy Paronyan de484b2495 Merge pull request #742 from ethcore/mining-stop-sync
adding check for a sync when giving work to miner
2016-03-17 12:23:43 +01:00
Tomasz Drwięga 7247f9e27f Fixing doctest 2016-03-17 12:23:15 +01:00
Nikolay Volf 03ca9d2c06 adding message from client to sync and disabling sending transactions to the queue while syncing 2016-03-17 12:17:53 +01:00
Tomasz Drwięga bc04e0c713 Adding missing commas 2016-03-17 11:49:56 +01:00
Tomasz Drwięga b1557b547b Reverting check if block queue is empty 2016-03-17 11:47:41 +01:00
Tomasz Drwięga 0e7778a7b7 Increasing balance in tests 2016-03-17 11:27:38 +01:00
Gav Wood 4050462ad4 Update sync_provider.rs 2016-03-17 11:23:30 +01:00
Gav Wood 22bc9f6458 Merge pull request #745 from ethcore/ethjson
json deserialization module
2016-03-17 11:21:29 +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 81c36499ea Fixing sync test 2016-03-17 10:20:35 +01:00
Tomasz Drwięga 10c309fccb Merge branch 'master' into tx_queue 2016-03-17 10:20:21 +01:00
Arkadiy Paronyan c0da47db9c Merge pull request #749 from ethcore/arkpar-patch-1
Update install-parity.sh
2016-03-17 10:08:30 +01:00
Arkadiy Paronyan 5cd3eaa111 Update install-parity.sh 2016-03-17 09:54:05 +01:00
Gav Wood ecfcc4f3b6 Merge pull request #747 from ethcore/sync
Restart sync on getting old unknown header
2016-03-16 20:32:10 +01:00
arkpar b9584b7ec9 restart sync on getting old unknown header 2016-03-16 18:25:32 +01:00
Tomasz Drwięga 0925968840 Adding test 2016-03-16 17:22:23 +01:00