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 |
|
Nikolay Volf
|
c4fe307b06
|
Merge pull request #595 from ethcore/tx_queue_integration
Transaction Queue integration
|
2016-03-05 14:21:54 +03:00 |
|
Tomasz Drwięga
|
b9a6a70ced
|
Renaming bad blocks as retracted
|
2016-03-05 11:37:19 +01:00 |
|
debris
|
5ad5773014
|
verifier improvements
|
2016-03-05 10:45:05 +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 |
|
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
|
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
|
559e01ea84
|
Review remarks resolved.
|
2016-03-04 22:54:59 +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
|
c72c27b47e
|
client integration
|
2016-03-04 20:09:21 +03: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 |
|
debris
|
706ce5dfb6
|
verifier trait
|
2016-03-04 11:56:04 +01:00 |
|
Gav Wood
|
52dceff3ea
|
Merge branch 'master' into finduncles
|
2016-03-03 15:16:56 +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 |
|
Gav Wood
|
df77f51bcc
|
History to 30 to pass tests.
|
2016-03-03 11:47:24 +01:00 |
|
Tomasz Drwięga
|
f4a71dc03c
|
Merge branch 'tx_queue' into tx_queue_integration
|
2016-03-02 21:27:08 +01:00 |
|
Gav Wood
|
039c0056bc
|
Uncle inclusion in block authoring. Still need tests.
|
2016-03-02 19:38:00 +01:00 |
|
Gav Wood
|
877270c35f
|
Fixes.
|
2016-03-02 18:32:54 +01:00 |
|
Gav Wood
|
3c7814c8ac
|
Remove debug line.
|
2016-03-02 15:43:48 +01:00 |
|
debris
|
03ffcd0e64
|
Merge branch 'master' into rpc_poll_ids
|
2016-03-02 13:59:03 +01:00 |
|
Gav Wood
|
47b4729332
|
Fix check.
|
2016-03-02 13:28:51 +01:00 |
|
Gav Wood
|
13deb4f048
|
Merge branch 'master' of github.com:ethcore/parity
|
2016-03-02 13:01:48 +01:00 |
|
Gav Wood
|
3309959139
|
Additional check to ancient enactments.
|
2016-03-02 12:57:34 +01:00 |
|
debris
|
3b4d4a9b63
|
Merge branch 'master' into rpc_poll_ids
|
2016-03-02 05:15:21 +01:00 |
|
Tomasz Drwięga
|
7565625ce0
|
Integrating TransactionQueue with client
|
2016-03-01 22:30:23 +01:00 |
|
Gav Wood
|
140711dd8a
|
Fixups from review.
Reduce size of default extra-data.
Introduce find_uncle_headers.
|
2016-03-01 19:59:12 +01:00 |
|
Gav Wood
|
a5c65b2a3d
|
Reduce spam.
|
2016-03-01 16:59:01 +01:00 |
|
Gav Wood
|
48df869202
|
--author and --extra-data options. Fixed null parent-hash.
|
2016-03-01 16:58:14 +01:00 |
|
Gav Wood
|
5ccb172e73
|
Hashrate now reported correctly.
|
2016-03-01 01:52:22 +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
|
ffc5c2ea7b
|
eth_getwork implemented.
|
2016-02-29 19:30:13 +01:00 |
|
Gav Wood
|
2c32b0fc1c
|
Merge branch 'master' into mining
|
2016-02-29 16:40:57 +01:00 |
|
Gav Wood
|
e20858a5dc
|
Compile fixes.
|
2016-02-29 15:30:08 +01:00 |
|
Gav Wood
|
83b8e7df5a
|
Initial refactor and block closing.
|
2016-02-29 14:57:41 +01:00 |
|
debris
|
53b19e9f2d
|
Merge branch 'master' of https://github.com/ethcore/parity into blockchain_cleanup
|
2016-02-27 16:06:02 +01:00 |
|
Gav Wood
|
b3f09596b1
|
Merge pull request #516 from ethcore/sync
Better memory management
|
2016-02-27 15:54:19 +01:00 |
|
debris
|
f1538ebc76
|
Merge branch 'master' into rpc_poll_ids
|
2016-02-27 15:34:02 +01:00 |
|
debris
|
d57518d90c
|
Merge branch 'master' into blockchain_cleanup
|
2016-02-27 02:18:07 +01:00 |
|
debris
|
53e8d99075
|
blockchain split into few separate submodules, cleanup insert_block process
|
2016-02-27 01:37:12 +01:00 |
|
Tomasz Drwięga
|
f55d111469
|
Merge branch 'master' into client_bugs
Conflicts:
ethcore/src/client.rs
|
2016-02-26 19:43:06 +01:00 |
|
debris
|
2947a1415b
|
Merge branch 'master' into rpc_poll_ids
|
2016-02-26 15:57:23 +01:00 |
|
arkpar
|
10ef7123c4
|
Merge branch 'master' of github.com:ethcore/parity into sync
|
2016-02-26 13:55:42 +01:00 |
|
arkpar
|
2e66ba7b64
|
Merge branch 'master' of github.com:ethcore/parity into sync
|
2016-02-26 13:53:01 +01:00 |
|
arkpar
|
9920dcea17
|
Merge branch 'master' of github.com:ethcore/parity into db
|
2016-02-26 13:16:22 +01:00 |
|
arkpar
|
781f763f1f
|
Memory management
|
2016-02-25 14:09:39 +01:00 |
|