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 |
|
debris
|
1743e480e3
|
rust_stable
|
2016-03-05 11:35:44 +01:00 |
|
Tomasz Drwięga
|
8a13e87cbe
|
Renaming BlocksWith helper to EachBlockWith
|
2016-03-05 11:30:27 +01:00 |
|
Nikolay Volf
|
1d04a7b8f9
|
changing warning to trace
|
2016-03-05 13:16:09 +03:00 |
|
debris
|
5ad5773014
|
verifier improvements
|
2016-03-05 10:45:05 +01:00 |
|
Gav Wood
|
a7e5113f2c
|
Merge pull request #593 from ethcore/journaldb
Additional journaldb logging and assert
|
2016-03-05 09:48:01 +01:00 |
|
Gav Wood
|
504e74a9ad
|
Merge pull request #578 from ethcore/finduncles
Uncle inclusion in block authoring.
|
2016-03-05 09:47:51 +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 |
|
arkpar
|
a4640beb2c
|
Typo
|
2016-03-05 00:00:43 +01:00 |
|
arkpar
|
2d6738fcde
|
Additional logging and assert
|
2016-03-04 23:53:57 +01:00 |
|
Gav Wood
|
8ed632eb96
|
Merge pull request #592 from ethcore/network
Fixed potential deadlock on startup
|
2016-03-04 23:51:56 +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 |
|
Gav Wood
|
e11b74e8d2
|
Merge pull request #589 from ethcore/disablejournaldb
JournalDB can now operate in "archive" mode
|
2016-03-04 23:51:21 +01:00 |
|
Gav Wood
|
8f00056171
|
Avoid sealing unnecessarily.
|
2016-03-04 23:43:59 +01:00 |
|
Gav Wood
|
86c34c7d10
|
Remove "fix".
|
2016-03-04 23:29:56 +01:00 |
|
Gav Wood
|
098a6ad2cc
|
Reset HISTORY.
|
2016-03-04 23:09:05 +01:00 |
|
Gav Wood
|
d63e535b3c
|
Merge branch 'master' into finduncles
|
2016-03-04 23:08:48 +01:00 |
|
Gav Wood
|
96617533c8
|
Remove unneeded field.
|
2016-03-04 22:57:44 +01:00 |
|
Gav Wood
|
559e01ea84
|
Review remarks resolved.
|
2016-03-04 22:54:59 +01:00 |
|
arkpar
|
182aec2f94
|
Fixed potential deadlock on startup
|
2016-03-04 22:01:36 +01:00 |
|
arkpar
|
f028ff1d40
|
Use same BlockChainInfo for propagation
|
2016-03-04 21:52:03 +01:00 |
|
Gav Wood
|
bc018faedc
|
Avoid forcing a resync for the pre-existing journaldbs.
|
2016-03-04 21:17:42 +01:00 |
|
Gav Wood
|
bbbaffbc53
|
"--archive" option for disabling the journal DB
Fixes #579
|
2016-03-04 21:06:28 +01:00 |
|
Nikolay Volf
|
5d9a599b17
|
Merge branch 'master' into rpc-signing-extend
|
2016-03-04 22:42:32 +03:00 |
|
Nikolay Volf
|
316e48e3b5
|
Merge pull request #586 from ethcore/secret-store-ext
Secret store integration with client
|
2016-03-04 22:41:47 +03:00 |
|
Gav Wood
|
ba67b67ff3
|
JournalDB can now operate in "archive" mode.
|
2016-03-04 20:19:36 +01:00 |
|