Tomasz Drwięga
|
2f9b955210
|
Merge branch 'master' into ethminer_crate
Conflicts:
parity/main.rs
|
2016-03-10 09:39:26 +01:00 |
|
Tomasz Drwięga
|
6864a08000
|
Merge branch 'master' into tx_queue_validation
|
2016-03-10 09:26:57 +01: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
|
ddc3440712
|
Merge branch 'master' into tx-rpc-expose
Conflicts:
sync/src/chain.rs
|
2016-03-10 03:22:32 +04: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 |
|
debris
|
082a4d9078
|
jsonrpc uses client and sync interfaces as a preparetion for jsonrpc tests
|
2016-03-09 17:31:43 +01:00 |
|
Tomasz Drwięga
|
363de973c9
|
Adding documentation and ditching EthMiner
|
2016-03-09 14:26:28 +01:00 |
|
Tomasz Drwięga
|
9d664336b5
|
Tratifying Miner
|
2016-03-09 13:30:59 +01:00 |
|
Tomasz Drwięga
|
5db84c3233
|
Adding transactions to block
|
2016-03-09 13:09:34 +01:00 |
|
Tomasz Drwięga
|
f84d40734d
|
Validating sender before importing to queuue
|
2016-03-09 10:26:51 +01:00 |
|
Tomasz Drwięga
|
9acb36af87
|
Fixing tests compilation. Removing ethminer dependency on client
|
2016-03-08 16:23:32 +01:00 |
|
Tomasz Drwięga
|
99a6802b61
|
Moving block sealing and transaction_queue to separate create
|
2016-03-08 15:46:44 +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
|
1184679d23
|
Merge branch 'tx_queue_integration' into tx_queue_rpc
|
2016-03-08 10:17:01 +01:00 |
|
Tomasz Drwięga
|
f973610b38
|
Merge branch 'master' into tx_queue_integration
|
2016-03-08 10:15:11 +01:00 |
|
Tomasz Drwięga
|
69db469d39
|
Merge branch 'master' into clippy-dev
Conflicts:
util/src/journaldb.rs
|
2016-03-07 14:35:42 +01:00 |
|
Tomasz Drwięga
|
cbc2c0cf0c
|
Fixing clippy warnings. When building on nightly it is required to enable clippy
|
2016-03-07 14:34:17 +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
|
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
|
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
|
3f493ab118
|
Merge branch 'tx_queue_integration' into tx_queue_rpc
|
2016-03-05 17:46:45 +01: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
|
ae1c1b918f
|
Fixing compilation
|
2016-03-05 16:51:01 +01: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
|
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
|
8ff49c06dd
|
somehow that was not set to the right path
|
2016-03-04 21:53:24 +03: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
|
d9f23470c4
|
Merge branch 'tx_queue_integration' into tx_queue_rpc
|
2016-03-04 16:54:00 +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
|
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
|
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 |
|
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
|
725e894f9b
|
TransactionsQueue implementation
|
2016-03-01 21:48:58 +01:00 |
|
Tomasz Drwięga
|
8c9c701de5
|
Fixing spelling in propagade->propagate
|
2016-03-01 21:34:57 +01:00 |
|
Gav Wood
|
f705f6957a
|
Merge branch 'master' into mining
|
2016-03-01 16:59:39 +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 |
|
Tomasz Drwięga
|
8c60eaa548
|
Unused variable
|
2016-02-29 23:43:48 +01:00 |
|
Gav Wood
|
791b0d82aa
|
Fix panic when downloading stales.
|
2016-02-29 14:59:10 +01:00 |
|
debris
|
2947a1415b
|
Merge branch 'master' into rpc_poll_ids
|
2016-02-26 15:57:23 +01:00 |
|
arkpar
|
2e66ba7b64
|
Merge branch 'master' of github.com:ethcore/parity into sync
|
2016-02-26 13:53:01 +01:00 |
|
Gav Wood
|
7a706fa0d2
|
Merge pull request #418 from ethcore/jsonrpc2
bloomfilter
|
2016-02-26 13:08:41 +01:00 |
|
arkpar
|
c66178e3f7
|
Fixed a race condition when a connecting peer disconnects immediately
|
2016-02-26 11:38:06 +01:00 |
|
arkpar
|
bed89d0740
|
Fixed sync tests
|
2016-02-25 16:32:34 +01:00 |
|
arkpar
|
1b9f428183
|
Merge branch 'master' of github.com:ethcore/parity into sync
|
2016-02-25 14:20:28 +01:00 |
|
arkpar
|
781f763f1f
|
Memory management
|
2016-02-25 14:09:39 +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 |
|
debris
|
0318907fb3
|
rpc eth_getFilterChanges returns new blocks, implemented eth_uninstallFilter
|
2016-02-24 14:16:05 +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 |
|
debris
|
52ed69b619
|
Merge branch 'master' into jsonrpc2
|
2016-02-23 14:53:09 +01:00 |
|
Tomusdrw
|
c2952b49b4
|
Bumping clippy version Fixes #496
|
2016-02-23 10:47:57 +01:00 |
|
debris
|
155404bf92
|
Merge branch 'master' of github.com:ethcore/parity into jsonrpc2
|
2016-02-22 08:50:03 +01:00 |
|
debris
|
3253d2a17b
|
fixed ethsync tests compile errors and warnings
|
2016-02-19 15:34:12 +01:00 |
|
debris
|
8113c689fc
|
Merge branch 'master' into jsonrpc2
|
2016-02-19 14:07:11 +01:00 |
|
arkpar
|
1d60d82698
|
Merge branch 'master' of github.com:ethcore/parity into discovery
|
2016-02-19 13:44:57 +01:00 |
|
arkpar
|
d9fec87143
|
Merge branch 'master' of github.com:ethcore/parity into discovery
|
2016-02-19 13:39:43 +01:00 |
|
debris
|
ef8055f900
|
Merge branch 'master' into jsonrpc2
|
2016-02-19 12:52:16 +01:00 |
|
debris
|
b5d6359030
|
fixed allow warnings in ethcore
|
2016-02-19 12:40:23 +01:00 |
|
debris
|
c0aca706d2
|
removed commented out line
|
2016-02-19 00:51:17 +01:00 |
|
debris
|
19a3daf533
|
parity compiling fine
|
2016-02-19 00:50:23 +01:00 |
|
Gav Wood
|
8e93989eec
|
Merge branch 'rustup' into rustbeta
|
2016-02-18 21:09:36 +01:00 |
|
debris
|
ebe8e19cc0
|
fixed compiling with rustc 1.8.0-nightly (57c357d89 2016-02-16)
|
2016-02-18 14:36:59 +01:00 |
|
debris
|
ed880b3b58
|
Merge branch 'master' of github.com:ethcore/parity into jsonrpc2
|
2016-02-17 15:59:36 +01:00 |
|
arkpar
|
a179722542
|
Merge branch 'discovery' of github.com:ethcore/parity into discovery
|
2016-02-17 01:39:27 +01:00 |
|
arkpar
|
39a98cd555
|
Prevent connection deletion until unregister is called; minor tweaks
|
2016-02-17 01:39:16 +01:00 |
|
Nikolay Volf
|
0b916e0a51
|
Merge branch 'master' into discovery
|
2016-02-17 03:21:41 +03:00 |
|
Manish Goregaokar
|
8802fb2fd8
|
Make clippy an optional dependency
|
2016-02-17 02:07:41 +05:30 |
|
Nikolay Volf
|
feb9b96ce7
|
version bump, test script for full suite
|
2016-02-16 13:40:58 +03:00 |
|
debris
|
a9e3875230
|
fixed ethsync tests
|
2016-02-15 17:47:01 +01:00 |
|
arkpar
|
30968925ee
|
Merge branch 'master' of github.com:ethcore/parity into discovery
|
2016-02-15 16:03:34 +01:00 |
|
arkpar
|
f141e69671
|
Added test for restart on malformed block
|
2016-02-15 13:34:58 +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
|
76590d5a82
|
Merge branch 'master' of github.com:ethcore/parity into net
|
2016-02-14 17:50:14 +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 |
|
Nikolay Volf
|
9ff3155a64
|
clippy, returing docopt
|
2016-02-14 00:58:41 +03:00 |
|
Nikolay Volf
|
2205b80703
|
trigger build
|
2016-02-13 18:11:46 +03:00 |
|
Nikolay Volf
|
84c752583a
|
clippy version update, docopt-macro moving to fork
|
2016-02-13 13:17:16 +03:00 |
|
arkpar
|
fcd0dafbe4
|
Fixed random failing test
|
2016-02-12 15:48:26 +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
|
93975be5e3
|
transaction by block number and index
|
2016-02-10 22:36:59 +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 |
|
debris
|
9159d5812b
|
eth_syncing, fixed #397
|
2016-02-10 16:28:59 +01:00 |
|
debris
|
dc8fa4ebfd
|
moved BlockId and TransactionId to blockchain.rs
|
2016-02-10 15:09:38 +01:00 |
|
debris
|
7491815e27
|
fixed ethsync tests
|
2016-02-10 11:44:03 +01:00 |
|
debris
|
27acdf38e2
|
fixed ethsync tests
|
2016-02-09 18:34:06 +01:00 |
|
debris
|
bb3ffe5764
|
Merge branch 'master' of github.com:ethcore/parity into jsonrpc
|
2016-02-09 10:13:35 +01:00 |
|
debris
|
e5e33826a7
|
fixed failin ethsync test
|
2016-02-08 16:07:38 +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
|
d40d4ef87c
|
fix tests
|
2016-02-07 01:43:44 +03:00 |
|