Nikolay Volf
|
a2046b429f
|
exposing only one func
|
2016-03-10 13:27:33 +04:00 |
|
Nikolay Volf
|
ddc3440712
|
Merge branch 'master' into tx-rpc-expose
Conflicts:
sync/src/chain.rs
|
2016-03-10 03:22:32 +04:00 |
|
Gav Wood
|
2ecad23fab
|
Merge pull request #647 from ethcore/sync
Fixed sync handling large forks
|
2016-03-10 00:53:20 +01:00 |
|
Nikolay Volf
|
663eec8a76
|
Merge branch 'master' into tx-rpc-expose
|
2016-03-10 03:03:27 +04:00 |
|
arkpar
|
d7e729a4ea
|
Fixed sync handling large forks
|
2016-03-09 23:55:56 +01:00 |
|
Tomasz Drwięga
|
f973610b38
|
Merge branch 'master' into tx_queue_integration
|
2016-03-08 10:15: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 |
|
Tomasz Drwięga
|
b0ac103900
|
Merge branch 'master' into tx_queue_integration
|
2016-03-07 09:54:07 +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
|
ad81356683
|
fix namespace
|
2016-03-06 00:48:00 +03:00 |
|
Nikolay Volf
|
e100ecbeac
|
exposing in lib
|
2016-03-05 23:47:28 +03: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 |
|
Tomasz Drwięga
|
0109e5e9d4
|
Removing memory leak when transactions are dropped from set
|
2016-03-05 13:03:34 +01:00 |
|
Gav Wood
|
d330f0b7b7
|
Revert "Transaction Queue integration"
|
2016-03-05 12:53:54 +01:00 |
|
Tomasz Drwięga
|
b9a6a70ced
|
Renaming bad blocks as retracted
|
2016-03-05 11:37:19 +01:00 |
|
Tomasz Drwięga
|
8a13e87cbe
|
Renaming BlocksWith helper to EachBlockWith
|
2016-03-05 11:30:27 +01:00 |
|
Tomasz Drwięga
|
77d526fd0b
|
Merge branch 'master' into tx_queue_integration
Conflicts:
ethcore/src/client.rs
sync/src/tests/helpers.rs
|
2016-03-05 00:57:45 +01:00 |
|
Gav Wood
|
87cd8ebd26
|
Merge pull request #591 from ethcore/sync
Fixing an overflow panic
|
2016-03-04 23:51:45 +01:00 |
|
Gav Wood
|
d7b49c9f15
|
Merge pull request #590 from ethcore/sync-fix
Fixed one more case of sync stalling
|
2016-03-04 23:51:32 +01:00 |
|
arkpar
|
f028ff1d40
|
Use same BlockChainInfo for propagation
|
2016-03-04 21:52:03 +01:00 |
|
Nikolay Volf
|
a4f4764e2a
|
Merge pull request #559 from ethcore/tx_queue
TransactionsQueue implementation
|
2016-03-04 21:43:33 +03:00 |
|
arkpar
|
3fa1776ecf
|
Fixed sync stalling on a new block arriving while body request is pending
|
2016-03-04 19:11:44 +01:00 |
|
Tomasz Drwięga
|
bcaed67eaa
|
Swapping order of inserting block to chain and commiting to DB to avoid race conditions
|
2016-03-04 16:48:10 +01:00 |
|
Tomasz Drwięga
|
bd7614f445
|
Merge branch 'tx_queue' into tx_queue_integration
Conflicts:
sync/src/transaction_queue.rs
|
2016-03-04 16:25:39 +01:00 |
|
Tomasz Drwięga
|
677c3996b9
|
Taking expected nonce from state into consideration when removing txs
|
2016-03-04 16:12:48 +01:00 |
|
Tomasz Drwięga
|
b320ff4602
|
Getting rid of first_nonces (we can fetch it from state)
|
2016-03-04 15:02:11 +01:00 |
|
Tomasz Drwięga
|
f7371daca3
|
Merge branch 'tx_queue' into tx_queue_integration
|
2016-03-04 12:20:31 +01:00 |
|
Tomasz Drwięga
|
8542d651ae
|
Refactoring transactions queue to avoid cloning transactions
|
2016-03-04 11:45:20 +01:00 |
|
Gav Wood
|
09e01fa0f8
|
Merge pull request #504 from ethcore/rpc_poll_ids
support for rpc polling
|
2016-03-03 12:44:27 +01:00 |
|
Tomasz Drwięga
|
f4a71dc03c
|
Merge branch 'tx_queue' into tx_queue_integration
|
2016-03-02 21:27:08 +01:00 |
|
Tomasz Drwięga
|
fc9999fb05
|
Changing uint to numbers
|
2016-03-02 21:26:48 +01:00 |
|
Tomasz Drwięga
|
82866fcab5
|
Merge branch 'master' into tx_queue
|
2016-03-02 21:14:11 +01:00 |
|
debris
|
03ffcd0e64
|
Merge branch 'master' into rpc_poll_ids
|
2016-03-02 13:59:03 +01:00 |
|
Gav Wood
|
f5de0187e7
|
Merge remote-tracking branch 'origin/master' into clippy_warnings
|
2016-03-02 13:40:35 +01:00 |
|
debris
|
3b4d4a9b63
|
Merge branch 'master' into rpc_poll_ids
|
2016-03-02 05:15:21 +01:00 |
|
Gav Wood
|
d55aa54412
|
Merge branch 'master' into mining
|
2016-03-02 00:59:39 +01:00 |
|