Gav Wood
|
204d31a056
|
Merge pull request #631 from ethcore/tx_queue_docs
Additional documentation for transaction queue
|
2016-03-10 00:45:30 +01:00 |
|
Tomasz Drwięga
|
e92ee1c0ea
|
Merge branch 'master' into tx_queue_integration
|
2016-03-09 09:27:20 +01:00 |
|
Arkadiy Paronyan
|
798c348d0e
|
Merge pull request #633 from ethcore/fixing_docopt
Fixing CLI parameters
|
2016-03-08 18:36:02 +01:00 |
|
Tomasz Drwięga
|
b2fc077f8c
|
Fixing CLI parameters
|
2016-03-08 16:42:33 +01:00 |
|
Tomasz Drwięga
|
799d3bd2c8
|
Fixing doc test for queue
|
2016-03-08 12:42:32 +01:00 |
|
Tomasz Drwięga
|
655bb0ed5d
|
Additional documentation for transaction queue
|
2016-03-08 12:36:06 +01:00 |
|
Tomasz Drwięga
|
f973610b38
|
Merge branch 'master' into tx_queue_integration
|
2016-03-08 10:15:11 +01:00 |
|
Gav Wood
|
9780897fc7
|
Merge pull request #628 from ethcore/gethcli
Normal CLI options with geth.
|
2016-03-07 23:35:40 +01:00 |
|
Gav Wood
|
f601975701
|
Merge pull request #626 from ethcore/network
Do not remove the peer immediatelly on send error
|
2016-03-07 12:31:32 +01:00 |
|
Gav Wood
|
ec3698066b
|
Normal CLI options with geth.
Support node identity.
Support fine-grained JSONRPC API enabling.
|
2016-03-07 12:21:11 +01:00 |
|
Tomasz Drwięga
|
e83f856104
|
Merging chain_blocks_verified to chain_new_blocks
|
2016-03-07 12:16:37 +01:00 |
|
arkpar
|
58721475ff
|
Do not remove the peer immediatelly on send error
|
2016-03-07 11:34:07 +01:00 |
|
Gav Wood
|
f9e93d594b
|
Merge pull request #622 from ethcore/jsonrpc_block_behind
Jsonrpc block behind
|
2016-03-07 11:00:56 +01:00 |
|
Arkadiy Paronyan
|
92e18a79ea
|
Merge pull request #624 from ethcore/killspam
Remove println!s.
|
2016-03-07 10:58:50 +01:00 |
|
Gav Wood
|
72016196cd
|
Remove println!s.
|
2016-03-07 10:56:39 +01:00 |
|
debris
|
bcae4f6e7b
|
fixed jsonrpc reporting current block is one less than actuall, fixed #612
|
2016-03-07 10:30:19 +01:00 |
|
Tomasz Drwięga
|
b0ac103900
|
Merge branch 'master' into tx_queue_integration
|
2016-03-07 09:54:07 +01:00 |
|
Gav Wood
|
318e7e9e04
|
Merge pull request #613 from ethcore/jdb_option1
JournalDB option 1 fix
|
2016-03-07 09:38:50 +01:00 |
|
debris
|
0da2ec1c0a
|
Merge branch 'master' of github.com:ethcore/parity
|
2016-03-07 09:35:31 +01:00 |
|
Gav Wood
|
4d1effb008
|
Fix tests.
|
2016-03-07 09:10:02 +01:00 |
|
Gav Wood
|
73207c2355
|
Revert accidental beta regressions.
|
2016-03-07 08:01:14 +01:00 |
|
Gav Wood
|
fd87633db6
|
Remove superfluous LATEST_KEY write.
|
2016-03-07 07:57:50 +01:00 |
|
Arkadiy Paronyan
|
7e9f13750f
|
Merge pull request #611 from ethcore/network
Network tracing cleanup
|
2016-03-07 07:44:49 +01:00 |
|
Gav Wood
|
0980c7130a
|
Fix replay_keys
Counters should never have an entry with zero value.
|
2016-03-07 06:58:43 +01:00 |
|
Gav Wood
|
4230fdfffe
|
More veriosning fixups.
|
2016-03-06 22:43:21 +01:00 |
|
Gav Wood
|
bc2fb14b5d
|
Add memory usage reports.
Update to be similar to master.
|
2016-03-06 22:39:04 +01:00 |
|
Gav Wood
|
bfd882c7e0
|
Fix warnings.
|
2016-03-06 22:05:12 +01:00 |
|
Gav Wood
|
51c95d4d67
|
Implement option 1.
|
2016-03-06 21:57:55 +01:00 |
|
Tomasz Drwięga
|
e91de78528
|
Renaming back bad as retracted
|
2016-03-06 11:12:02 +01:00 |
|
Tomasz Drwięga
|
64b5e23ba5
|
Merge branch 'tx_queue_integration' of github.com:ethcore/parity into tx_queue_integration
|
2016-03-06 11:05:13 +01:00 |
|
Tomasz Drwięga
|
aaf2e0c3fb
|
Locking outside of loop
|
2016-03-06 11:04:24 +01:00 |
|
arkpar
|
003d1fd0cc
|
Network tracing improvements
|
2016-03-05 23:32:38 +01:00 |
|
Nikolay Volf
|
57e6e1e1b5
|
[ci ship] redundant lines
|
2016-03-05 20:15:19 +03:00 |
|
Tomasz Drwięga
|
4a53d62be4
|
Fixing inconsistency when replacing transactions in queue
|
2016-03-05 17:41:35 +01:00 |
|
Tomasz Drwięga
|
18cbea394d
|
Small renaming
|
2016-03-05 17:14:48 +01:00 |
|
Tomasz Drwięga
|
c13afcf404
|
Removing assertion and just comparing fees
|
2016-03-05 17:06:04 +01:00 |
|
Tomasz Drwięga
|
8915974cf0
|
Fixing compilation
|
2016-03-05 16:48:03 +01:00 |
|
Tomasz Drwięga
|
cc3839ae57
|
Revert "Revert "Transaction Queue integration""
This reverts commit d330f0b7b7.
Conflicts:
sync/src/transaction_queue.rs
|
2016-03-05 16:46:04 +01:00 |
|
Tomasz Drwięga
|
5ac7b9f812
|
Merge branch 'master' into tx_queue_integration
Conflicts:
sync/src/transaction_queue.rs
|
2016-03-05 16:44:35 +01:00 |
|
Tomasz Drwięga
|
0a7fc4af73
|
Recalculating heights in future when removing transaction
|
2016-03-05 16:42:34 +01:00 |
|
Tomasz Drwięga
|
6afa1c85b7
|
Replacing transactions instead of just inserting
|
2016-03-05 16:20:41 +01:00 |
|
Tomasz Drwięga
|
765d7179f5
|
Failing tests for transaction queue
|
2016-03-05 15:43:04 +01:00 |
|
Tomasz Drwięga
|
78a39d3ac9
|
Avoid importing same transaction twice (especially with different nonce_height)
|
2016-03-05 14:34:15 +01:00 |
|
debris
|
068d776b17
|
Merge branch 'master' of github.com:ethcore/parity
|
2016-03-05 13:49:03 +01:00 |
|
Tomasz Drwięga
|
0109e5e9d4
|
Removing memory leak when transactions are dropped from set
|
2016-03-05 13:03:34 +01:00 |
|
Gav Wood
|
b14b4cfef8
|
Merge pull request #602 from ethcore/revert-595-tx_queue_integration
Revert "Transaction Queue integration"
|
2016-03-05 12:54:01 +01:00 |
|
Gav Wood
|
d330f0b7b7
|
Revert "Transaction Queue integration"
|
2016-03-05 12:53:54 +01:00 |
|
Gav Wood
|
5ac0da6bba
|
Merge pull request #601 from ethcore/fix-benches
fix benches compilation
|
2016-03-05 12:30:33 +01:00 |
|
Nikolay Volf
|
cfbaa2d6e9
|
fixed namespaces
|
2016-03-05 14:25:46 +03:00 |
|
Nikolay Volf
|
c4fe307b06
|
Merge pull request #595 from ethcore/tx_queue_integration
Transaction Queue integration
|
2016-03-05 14:21:54 +03:00 |
|