d330f0b7b7
Revert "Transaction Queue integration"
2016-03-05 12:53:54 +01:00
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
a4f4764e2a
Merge pull request #559 from ethcore/tx_queue
...
TransactionsQueue implementation
2016-03-04 21:43:33 +03:00
0d01099f44
moving unlock logics to secret-store itself
2016-03-04 16:23:00 +03:00
f4a71dc03c
Merge branch 'tx_queue' into tx_queue_integration
2016-03-02 21:27:08 +01:00
82866fcab5
Merge branch 'master' into tx_queue
2016-03-02 21:14:11 +01:00
03ffcd0e64
Merge branch 'master' into rpc_poll_ids
2016-03-02 13:59:03 +01:00
3b4d4a9b63
Merge branch 'master' into rpc_poll_ids
2016-03-02 05:15:21 +01:00
d55aa54412
Merge branch 'master' into mining
2016-03-02 00:59:39 +01:00
7565625ce0
Integrating TransactionQueue with client
2016-03-01 22:30:23 +01:00
725e894f9b
TransactionsQueue implementation
2016-03-01 21:48:58 +01:00
2266d74c2a
Fix JSONRPC I/O.
2016-03-01 01:15:00 +01:00
d0125f3ff5
uint to separated crate
2016-03-01 00:21:15 +03:00
ffc5c2ea7b
eth_getwork implemented.
2016-02-29 19:30:13 +01:00
16bc7b57cb
Merge pull request #526 from ethcore/serde_update
...
udpated serde to version 0.7.0
2016-02-27 16:09:44 +01:00
b60b84fe67
use transient-hashmap from crates.io
2016-02-27 15:56:41 +01:00
11de5b4923
udpated serde to version 0.7.0
2016-02-27 13:14:58 +01:00
2947a1415b
Merge branch 'master' into rpc_poll_ids
2016-02-26 15:57:23 +01:00
10ef7123c4
Merge branch 'master' of github.com:ethcore/parity into sync
2016-02-26 13:55:42 +01:00
c76fc14a5c
rocksdb dependency version bump
2016-02-26 03:22:18 +01:00
4660612e08
Merge branch 'master' of github.com:ethcore/parity into db
2016-02-25 20:52:31 +01:00
937547f178
rocksdb dependency version bump
2016-02-25 20:20:00 +01:00
21f62012d6
Merge branch 'master' of github.com:ethcore/parity into sync
2016-02-25 14:22:41 +01:00
85350f3c66
updated version of unicase
2016-02-25 14:21:29 +01:00
1b9f428183
Merge branch 'master' of github.com:ethcore/parity into sync
2016-02-25 14:20:28 +01:00
781f763f1f
Memory management
2016-02-25 14:09:39 +01:00
ba464bbac4
Merge pull request #493 from ethcore/jsonrpc_security
...
jsonrpc security, cors headers, fixed #359
2016-02-25 14:08:18 +01:00
b6a6bc0f4e
Merge pull request #482 from peterjoel/issue_161
...
Rust implementations to replace data tables (#161 )
2016-02-25 03:31:04 +03:00
5a9bba3fa5
Merge branch 'master' of github.com:ethcore/parity into db
2016-02-24 21:32:21 +01:00
4ce9aad749
Merge branch 'jsonrpc2' into rpc_poll_ids
2016-02-24 10:35:15 +01:00
40f908a499
Log formatting
2016-02-23 20:14:37 +01:00
35cabecad8
support for polling
2016-02-23 18:51:29 +01:00
c2952b49b4
Bumping clippy version Fixes #496
2016-02-23 10:47:57 +01:00
60a8b92e10
Bumping versions. Fixes #496
2016-02-23 10:14:56 +01:00
61949d0ed4
Merge branch 'master' of github.com:ethcore/parity into db
2016-02-22 13:44:25 +01:00
90184658a7
jsonrpc security, cors headers, fixed #359
2016-02-22 13:41:38 +01:00
e63aba73c5
Remove "unknown" from version string.
2016-02-22 09:04:44 +01:00
ea187253a2
Include git commit date & hash.
2016-02-21 21:14:09 +01:00
6fa2284c68
Remove unneeded deps.
2016-02-21 20:03:01 +01:00
63bbd0ccd8
Use proper version string.
2016-02-21 20:00:45 +01:00
ce81a24bfd
Tests for issue #161
...
Implementations of get_cache_size and get_data_size in Rust (issue #161 )
Removed sizes module, containing replaced data tables
Fixed whitespace issues after code review
2016-02-21 02:11:09 +00:00
26ad918e03
Merge pull request #477 from ethcore/temp-path
...
dev/test/build tools to separate crate
2016-02-20 21:59:59 +01:00
00f2c6e3e4
Merge branch 'master' of github.com:ethcore/parity into db
2016-02-20 00:48:36 +01:00
5572d1792d
Back to original slab crate
2016-02-19 18:43:55 +01:00
84e7ce2758
Merge branch 'master' into temp-path
...
Conflicts:
util/Cargo.toml
util/src/lib.rs
2016-02-19 19:11:24 +03:00
ab0fe65f3f
unlisting as dev-dependencies
2016-02-19 18:09:31 +03:00
2f62994f61
Updated cargo.lock
2016-02-19 15:17:31 +01:00
f15275bb5b
Merge branch 'master' of github.com:ethcore/parity into db
2016-02-19 13:52:07 +01:00
d9fec87143
Merge branch 'master' of github.com:ethcore/parity into discovery
2016-02-19 13:39:43 +01:00
19a3daf533
parity compiling fine
2016-02-19 00:50:23 +01:00
Gav Wood
Tomasz Drwięga
Nikolay Volf
debris
Gav Wood
arkpar
Tomusdrw
Peter