Commit Graph

146 Commits

Author SHA1 Message Date
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
c49258e866 Merge branch 'tx_queue_integration' into tx_queue_rpc 2016-03-06 11:15:16 +01:00
Tomasz Drwięga
e91de78528 Renaming back bad as retracted 2016-03-06 11:12:02 +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
e100ecbeac exposing in lib 2016-03-05 23:47:28 +03:00
Tomasz Drwięga
67f2bc40e6 Merge remote-tracking branch 'origin/tx_queue_integration' into tx_queue_rpc 2016-03-05 16:49:13 +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
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
arkpar
f028ff1d40 Use same BlockChainInfo for propagation 2016-03-04 21:52:03 +01: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
d9f23470c4 Merge branch 'tx_queue_integration' into tx_queue_rpc 2016-03-04 16:54:00 +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
410bd263dd Merge branch 'tx_queue_integration' into tx_queue_rpc 2016-03-04 12:34:34 +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
f4a71dc03c Merge branch 'tx_queue' into tx_queue_integration 2016-03-02 21:27:08 +01:00
Gav Wood
f5de0187e7 Merge remote-tracking branch 'origin/master' into clippy_warnings 2016-03-02 13:40:35 +01:00
Gav Wood
d55aa54412 Merge branch 'master' into mining 2016-03-02 00:59:39 +01:00
Tomasz Drwięga
c889d9b3eb Exposing transaction queue pending in RPC 2016-03-01 23:06:51 +01:00
Tomasz Drwięga
c6934431d1 Adding test for sync.chain_new_blocks. 2016-03-01 22:52:28 +01:00
Tomasz Drwięga
7565625ce0 Integrating TransactionQueue with client 2016-03-01 22:30:23 +01:00
Tomasz Drwięga
083747dc67 Lowering complexity of request_blocks 2016-03-01 22:05:54 +01:00
Tomasz Drwięga
8c9c701de5 Fixing spelling in propagade->propagate 2016-03-01 21:34:57 +01:00
Gav Wood
394e9c679b Reorganised ImportError to be a type of Errpr (rather than vice-versa).
Added support for eth_submitWork.
2016-03-01 00:02:48 +01:00
Gav Wood
791b0d82aa Fix panic when downloading stales. 2016-02-29 14:59:10 +01:00
arkpar
2e66ba7b64 Merge branch 'master' of github.com:ethcore/parity into sync 2016-02-26 13:53:01 +01:00
arkpar
c66178e3f7 Fixed a race condition when a connecting peer disconnects immediately 2016-02-26 11:38:06 +01:00
arkpar
1b9f428183 Merge branch 'master' of github.com:ethcore/parity into sync 2016-02-25 14:20:28 +01:00
arkpar
1a73d70334 Report memory usage 2016-02-24 22:37:28 +01:00
arkpar
cb3608c6d3 Limit download ahead 2016-02-24 21:23:58 +01:00
Nikolay Volf
d4ad673d64 tested out 2016-02-24 15:01:45 +03:00
Nikolay Volf
d51942e59d fix issue with starting requested block number was not included itself 2016-02-24 14:36:41 +03:00
arkpar
1d60d82698 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-19 13:44:57 +01:00
debris
b5d6359030 fixed allow warnings in ethcore 2016-02-19 12:40:23 +01:00
arkpar
39a98cd555 Prevent connection deletion until unregister is called; minor tweaks 2016-02-17 01:39:16 +01:00
arkpar
b503fb5de8 Merge branch 'master' of github.com:ethcore/parity into net 2016-02-15 12:57:19 +01:00
arkpar
ba95260113 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-15 11:56:36 +01:00
Tomusdrw
2c4700f4c1 Fixing clippy warnings 2016-02-15 00:55:45 +01:00
arkpar
986448ce7a Merge branch 'net' into discovery 2016-02-14 18:27:31 +01:00
arkpar
8b0ec51c0f Update last imported number on new block 2016-02-14 18:08:30 +01:00
arkpar
debf1ed934 Propagate only one last hash for peers that are too far behind 2016-02-14 17:49:20 +01:00
arkpar
fc7483ab87 Propagate only one last hash for peers that are too far behind 2016-02-14 17:10:55 +01:00
arkpar
76ea030b78 Small refactoring 2016-02-14 01:03:48 +01:00
arkpar
34b465a125 Check for peer registration 2016-02-12 14:20:18 +01:00
arkpar
f74c5dc921 More sync and propagation fixes 2016-02-12 13:07:02 +01:00
arkpar
84732d4b94 Sync fixes 2016-02-11 21:10:41 +01:00
arkpar
aed348ce8b Merge branch 'master' of github.com:ethcore/parity into net 2016-02-11 18:36:45 +01:00
arkpar
f4d8070bda Fixed one extra block/header being requested 2016-02-11 18:36:26 +01:00
debris
df0fa06e8a applied client interface changes to sync tests 2016-02-10 22:16:25 +01:00
debris
db35e21bcd few client methods use BlockId instead of hash and BlockNumber 2016-02-10 19:29:27 +01:00
Nikolay Volf
deffb271bc refactoring of report functions, some comments 2016-02-08 03:14:39 -08:00
Nikolay Volf
70d59e4a52 Merge branch 'nvolf' into block-propagation 2016-02-08 01:40:15 +03:00
Nikolay Volf
871b7113ec fixes for valid rlp 2016-02-08 01:39:02 +03:00
Nikolay Volf
69a4349ee2 documentation 2016-02-08 00:52:56 +03:00
Nikolay Volf
e9af2dfd96 new hashes tests 2016-02-08 00:20:59 +03:00
Nikolay Volf
4b1d67ef49 bunch of tests for new block packet 2016-02-08 00:08:15 +03:00
Nikolay Volf
3f17acca1d empty new block test 2016-02-07 23:01:09 +03:00
Nikolay Volf
efef36b5e8 handling sync message 2016-02-07 03:00:43 +03:00
Nikolay Volf
67c5e376b8 review fixes 2016-02-06 23:40:41 +03:00
Nikolay Volf
3e84691cec adding expect 2016-02-06 23:31:37 +03:00
Nikolay Volf
74c97ea36d removed unused latest_number 2016-02-06 23:08:20 +03:00
Nikolay Volf
391ef7e664 actually should be this way 2016-02-06 23:03:26 +03:00
Nikolay Volf
9727f27854 blocks + hashes 2016-02-06 23:00:52 +03:00
Nikolay Volf
6b02b6eddb using rlp::encode 2016-02-06 22:25:20 +03:00
Nikolay Volf
0905372f70 updating peer best hash when sync 2016-02-06 22:23:25 +03:00
Nikolay Volf
49e61b87a0 calculating peer highest number on fly 2016-02-06 22:16:59 +03:00
Nikolay Volf
b606df451e many fixes 2016-02-06 20:56:21 +03:00
Nikolay Volf
b01f954b05 final tests 2016-02-06 01:45:25 +03:00
Nikolay Volf
90e4722284 Merge branch 'master' into block-propagation 2016-02-05 21:47:27 +03:00
Nikolay Volf
cc3f712fec propagade initial 2016-02-05 09:34:08 -08:00
debris
c90d64662a added license in every *.rs file 2016-02-05 13:40:41 +01:00
Nikolay Volf
410d6533e0 indents 2016-02-05 03:01:50 +03:00
Nikolay Volf
b0cba757d6 test effort 2016-02-05 02:57:51 +03:00
Nikolay Volf
c12538b123 dispatch test as well 2016-02-05 01:58:32 +03:00
Nikolay Volf
8d7523a027 receipt tests 2016-02-05 01:24:36 +03:00
Nikolay Volf
ab131b134b first local chain test 2016-02-04 22:03:14 +03:00
Nikolay Volf
c0776b75b6 moving sources for proper test setup 2016-02-04 21:30:31 +03:00
arkpar
77449140cd Fixed sync stalling on fork 2016-02-04 13:16:31 +01:00
Nikolay Volf
d7aa315309 Merge branch 'master' into remerge-264
Conflicts:
	sync/src/chain.rs
2016-02-04 04:35:38 +03:00
Nikolay Volf
376c99c247 moving to mainaint_sync 2016-02-04 04:28:16 +03:00
Nikolay Volf
86cfe95113 continueing sync 2016-02-04 04:24:10 +03:00
Nikolay Volf
20ca72ee0c status waiting 2016-02-04 04:12:41 +03:00
Nikolay Volf
c3d0ed6e69 proper status setting 2016-02-04 04:11:27 +03:00
Nikolay Volf
ce7b5b03ad sync test temp fix 2016-02-04 03:44:40 +03:00
Nikolay Volf
d398b84802 remerge of 264 2016-02-03 23:42:30 +03:00
Nikolay Volf
edd41ac574 getting old one 2016-02-03 23:05:04 +03:00
arkpar
ce0cc11c56 Peer sync timeouts 2016-02-02 14:54:46 +01:00
arkpar
bd684e3732 Check for parent on queue import 2016-02-02 12:12:32 +01:00
arkpar
61f39d68f8 Block validation 2016-01-29 16:38:03 +01:00
arkpar
1e91b6f5db Moved sync to a separate crate 2016-01-29 15:56:06 +01:00