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 |
|
arkpar
|
744c4c7d8b
|
JournalDB documentation
|
2016-03-07 07:06:55 +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 |
|
arkpar
|
d77d9ad9d8
|
JournalDB with history overlay
|
2016-03-06 19:57:00 +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 |
|
Nikolay Volf
|
bb8a79f18c
|
finalizing
|
2016-03-05 18:29:01 +03: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 |
|
Nikolay Volf
|
1aaae7b553
|
[ci skip] codegen bug
|
2016-03-05 16:42:02 +03: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 |
|
Nikolay Volf
|
9e5bf94a5a
|
Merge branch 'master' into rpc-signing-extend
|
2016-03-05 14:31:39 +03: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 |
|
Gav Wood
|
937a8e26a6
|
Merge pull request #597 from ethcore/verifier_improvements
verifier trait improvements
|
2016-03-05 12:12:47 +01:00 |
|
Gav Wood
|
c4faa69049
|
Merge pull request #600 from ethcore/rust_stable
build on rust stable
|
2016-03-05 12:11:57 +01:00 |
|
Gav Wood
|
0768d556a9
|
Merge pull request #599 from ethcore/silent-geth
Geth import silent if no geth
|
2016-03-05 12:11:21 +01:00 |
|
Tomasz Drwięga
|
b9a6a70ced
|
Renaming bad blocks as retracted
|
2016-03-05 11:37:19 +01:00 |
|
debris
|
9e5f8d4434
|
build on rust stable
|
2016-03-05 11:36:12 +01:00 |
|