Gav Wood
|
b25551be7b
|
Merge pull request #671 from ethcore/clippy_hook
Removing running clippy by default on nightly.
|
2016-03-11 14:03:16 +01:00 |
|
debris
|
389d17974e
|
Merge branch 'client_submodules' into rpc_tests
|
2016-03-11 11:17:28 +01:00 |
|
debris
|
ebd2a92267
|
Merge branch 'master' of github.com:ethcore/parity into client_submodules
|
2016-03-11 11:17:08 +01:00 |
|
Tomasz Drwięga
|
d84e008e00
|
Removing superflous check for nightly
|
2016-03-11 11:16:49 +01:00 |
|
Marek Kotewicz
|
eb2171e287
|
Merge pull request #652 from ethcore/tx_queue_rpc
Transaction queue exposed via JSON rpc.
|
2016-03-11 11:08:16 +01:00 |
|
debris
|
34a120e127
|
net tests
|
2016-03-11 10:17:20 +01:00 |
|
debris
|
87dd42f7bc
|
Merge branch 'master' of github.com:ethcore/parity into client_submodules
|
2016-03-10 21:17:58 +01:00 |
|
debris
|
c5c8851b50
|
moved TestBlockChainClient to ethcore
|
2016-03-10 20:27:50 +01:00 |
|
Nikolay Volf
|
25a63611f8
|
extend sync status interface to sync provider
|
2016-03-10 20:32:17 +04:00 |
|
Gav Wood
|
8dd41bfe0c
|
Merge pull request #641 from ethcore/jsonrpc_interfaces
jsonrpc uses client and sync interfaces
|
2016-03-10 15:44:05 +01:00 |
|
Gav Wood
|
5764ec5ddc
|
Merge pull request #609 from ethcore/tx-rpc-expose
Expose transaction insertion in sync lib
|
2016-03-10 15:28:43 +01:00 |
|
Gav Wood
|
4cfcaf8521
|
Merge pull request #657 from ethcore/tx_queue_update_height_bug
Tx queue update height bug
|
2016-03-10 13:20:00 +01:00 |
|
Tomasz Drwięga
|
d4e7eafede
|
Merge branch 'master' into tx_queue_integration
Conflicts:
sync/src/transaction_queue.rs
|
2016-03-10 11:23:39 +01:00 |
|
Tomasz Drwięga
|
0cf405527e
|
Fixing update height bug
|
2016-03-10 11:14:25 +01:00 |
|
Gav Wood
|
99e577ad2f
|
Merge pull request #650 from ethcore/tx_queue_validation
Validate sender before importing to queue
|
2016-03-10 11:14:22 +01:00 |
|
Tomasz Drwięga
|
276768a826
|
Failing test case for #656
|
2016-03-10 11:11:59 +01:00 |
|
Gav Wood
|
249a89fc2d
|
Merge pull request #627 from ethcore/clippy-dev
`dev` feature enabled when compiling without `--release`
|
2016-03-10 11:05:56 +01:00 |
|
Nikolay Volf
|
a2046b429f
|
exposing only one func
|
2016-03-10 13:27:33 +04:00 |
|
Tomasz Drwięga
|
cc47c80243
|
Merge branch 'master' into tx_queue_rpc
|
2016-03-10 09:44:46 +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
|
f84d40734d
|
Validating sender before importing to queuue
|
2016-03-09 10:26:51 +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 |
|