Tomasz Drwięga
2e72173620
Merge branch 'master' into ethminer_crate
...
Conflicts:
Cargo.lock
Cargo.toml
hook.sh
miner/src/transaction_queue.rs
rpc/Cargo.toml
sync/Cargo.toml
sync/src/chain.rs
2016-03-10 12:25:36 +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
Tomasz Drwięga
2f9b955210
Merge branch 'master' into ethminer_crate
...
Conflicts:
parity/main.rs
2016-03-10 09:39:26 +01:00
Gav Wood
50c8d7f633
Merge pull request #607 from ethcore/tx_queue_integration
...
Transaction Queue Integration
2016-03-10 00:45:07 +01:00
Gav Wood
ac42045155
Merge pull request #639 from ethcore/keys-cli
...
Keys cli
2016-03-10 00:25:01 +01:00
Nikolay Volf
0f056f3abb
Merge branch 'master' into clippy-dev
...
Conflicts:
Cargo.toml
2016-03-10 02:45:53 +04:00
debris
423dd7e0a9
updated jsonrpc-core and http-server libs
2016-03-09 18:04:13 +01:00
Nikolay Volf
6ad0ba8fe2
basic commands
2016-03-09 17:11:15 +04:00
Tomasz Drwięga
99a6802b61
Moving block sealing and transaction_queue to separate create
2016-03-08 15:46:44 +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
cc3839ae57
Revert "Revert "Transaction Queue integration""
...
This reverts commit d330f0b7b7
2016-03-05 16:46:04 +01:00
Gav Wood
d330f0b7b7
Revert "Transaction Queue integration"
2016-03-05 12:53:54 +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
Nikolay Volf
a4f4764e2a
Merge pull request #559 from ethcore/tx_queue
...
TransactionsQueue implementation
2016-03-04 21:43:33 +03:00
Nikolay Volf
0d01099f44
moving unlock logics to secret-store itself
2016-03-04 16:23:00 +03:00
Tomasz Drwięga
f4a71dc03c
Merge branch 'tx_queue' into tx_queue_integration
2016-03-02 21:27:08 +01:00
Tomasz Drwięga
82866fcab5
Merge branch 'master' into tx_queue
2016-03-02 21:14:11 +01:00
debris
03ffcd0e64
Merge branch 'master' into rpc_poll_ids
2016-03-02 13:59:03 +01:00
debris
3b4d4a9b63
Merge branch 'master' into rpc_poll_ids
2016-03-02 05:15:21 +01:00
Gav Wood
d55aa54412
Merge branch 'master' into mining
2016-03-02 00:59:39 +01:00
Tomasz Drwięga
7565625ce0
Integrating TransactionQueue with client
2016-03-01 22:30:23 +01:00
Tomasz Drwięga
725e894f9b
TransactionsQueue implementation
2016-03-01 21:48:58 +01:00
Gav Wood
2266d74c2a
Fix JSONRPC I/O.
2016-03-01 01:15:00 +01:00
Nikolay Volf
d0125f3ff5
uint to separated crate
2016-03-01 00:21:15 +03:00
Gav Wood
ffc5c2ea7b
eth_getwork implemented.
2016-02-29 19:30:13 +01:00
Gav Wood
16bc7b57cb
Merge pull request #526 from ethcore/serde_update
...
udpated serde to version 0.7.0
2016-02-27 16:09:44 +01:00
debris
b60b84fe67
use transient-hashmap from crates.io
2016-02-27 15:56:41 +01:00
debris
11de5b4923
udpated serde to version 0.7.0
2016-02-27 13:14:58 +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
c76fc14a5c
rocksdb dependency version bump
2016-02-26 03:22:18 +01:00
arkpar
4660612e08
Merge branch 'master' of github.com:ethcore/parity into db
2016-02-25 20:52:31 +01:00
arkpar
937547f178
rocksdb dependency version bump
2016-02-25 20:20:00 +01:00
arkpar
21f62012d6
Merge branch 'master' of github.com:ethcore/parity into sync
2016-02-25 14:22:41 +01:00
debris
85350f3c66
updated version of unicase
2016-02-25 14:21:29 +01:00
arkpar
1b9f428183
Merge branch 'master' of github.com:ethcore/parity into sync
2016-02-25 14:20:28 +01:00
arkpar
781f763f1f
Memory management
2016-02-25 14:09:39 +01:00
Marek Kotewicz
ba464bbac4
Merge pull request #493 from ethcore/jsonrpc_security
...
jsonrpc security, cors headers, fixed #359
2016-02-25 14:08:18 +01:00
Nikolay Volf
b6a6bc0f4e
Merge pull request #482 from peterjoel/issue_161
...
Rust implementations to replace data tables (#161 )
2016-02-25 03:31:04 +03:00
arkpar
5a9bba3fa5
Merge branch 'master' of github.com:ethcore/parity into db
2016-02-24 21:32:21 +01:00
debris
4ce9aad749
Merge branch 'jsonrpc2' into rpc_poll_ids
2016-02-24 10:35:15 +01:00
arkpar
40f908a499
Log formatting
2016-02-23 20:14:37 +01:00
debris
35cabecad8
support for polling
2016-02-23 18:51:29 +01:00
Tomusdrw
c2952b49b4
Bumping clippy version Fixes #496
2016-02-23 10:47:57 +01:00
Tomusdrw
60a8b92e10
Bumping versions. Fixes #496
2016-02-23 10:14:56 +01:00
arkpar
61949d0ed4
Merge branch 'master' of github.com:ethcore/parity into db
2016-02-22 13:44:25 +01:00
debris
90184658a7
jsonrpc security, cors headers, fixed #359
2016-02-22 13:41:38 +01:00
Gav Wood
e63aba73c5
Remove "unknown" from version string.
2016-02-22 09:04:44 +01:00
Gav Wood
ea187253a2
Include git commit date & hash.
2016-02-21 21:14:09 +01:00
Gav Wood
6fa2284c68
Remove unneeded deps.
2016-02-21 20:03:01 +01:00
Gav Wood
63bbd0ccd8
Use proper version string.
2016-02-21 20:00:45 +01:00
Peter
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
Gav Wood
26ad918e03
Merge pull request #477 from ethcore/temp-path
...
dev/test/build tools to separate crate
2016-02-20 21:59:59 +01:00
arkpar
00f2c6e3e4
Merge branch 'master' of github.com:ethcore/parity into db
2016-02-20 00:48:36 +01:00
arkpar
5572d1792d
Back to original slab crate
2016-02-19 18:43:55 +01:00
Nikolay Volf
84e7ce2758
Merge branch 'master' into temp-path
...
Conflicts:
util/Cargo.toml
util/src/lib.rs
2016-02-19 19:11:24 +03:00
Nikolay Volf
ab0fe65f3f
unlisting as dev-dependencies
2016-02-19 18:09:31 +03:00
arkpar
2f62994f61
Updated cargo.lock
2016-02-19 15:17:31 +01:00
arkpar
f15275bb5b
Merge branch 'master' of github.com:ethcore/parity into db
2016-02-19 13:52:07 +01:00
arkpar
d9fec87143
Merge branch 'master' of github.com:ethcore/parity into discovery
2016-02-19 13:39:43 +01:00
debris
19a3daf533
parity compiling fine
2016-02-19 00:50:23 +01:00
debris
df3d17789a
compiling ethcore on beta
2016-02-19 00:06:06 +01:00
arkpar
af8ba06795
utils compilable in beta
2016-02-18 23:29:41 +01:00
arkpar
e0623f57f9
Merge branch 'master' of github.com:ethcore/parity into discovery
2016-02-18 21:49:11 +01:00
Gav Wood
8e93989eec
Merge branch 'rustup' into rustbeta
2016-02-18 21:09:36 +01:00
Gav Wood
ae2ef83f16
Merge branch 'clippy_optional' of https://github.com/Manishearth/parity into Manishearth-clippy_optional
2016-02-18 20:59:28 +01:00
Nikolay Volf
031b15daab
update cargo.lock
2016-02-18 22:12:25 +03:00
Nikolay Volf
8b4278aeaa
feature dep for heapsize
2016-02-18 22:06:59 +03:00
Nikolay Volf
198119466b
forking heapsize
2016-02-18 19:21:24 +03:00
debris
80f4f422fc
updated heapsizeof
2016-02-18 15:17:26 +01:00
debris
ebe8e19cc0
fixed compiling with rustc 1.8.0-nightly (57c357d89 2016-02-16)
2016-02-18 14:36:59 +01:00
Gav Wood
97f549cf5f
Add daemonization.
2016-02-18 12:42:01 +01:00
arkpar
68d606b5f0
rocksdb abstraction layer
2016-02-18 03:46:24 +01:00
Nikolay Volf
0b916e0a51
Merge branch 'master' into discovery
2016-02-17 03:21:41 +03:00
Manish Goregaokar
8802fb2fd8
Make clippy an optional dependency
2016-02-17 02:07:41 +05:30
Nikolay Volf
feb9b96ce7
version bump, test script for full suite
2016-02-16 13:40:58 +03:00
arkpar
c5ca293d72
Merge branch 'master' of github.com:ethcore/parity into discovery
2016-02-16 02:31:31 +01:00
arkpar
203947388b
Get public address/UPNP refactoring
2016-02-16 02:05:36 +01:00
Nikolay Volf
29980d3e96
travis fix
2016-02-16 01:07:39 +03:00
debris
874dcdd840
back to cargo crates
2016-02-15 10:47:56 +01:00
Nikolay Volf
304173f595
preserving root cargo lock
2016-02-14 19:35:45 +03:00
Gav Wood
ceaf6910c1
Upate metadata.
2015-11-24 21:27:10 +01:00
Gav Wood
950f1f898b
Change to library.
2015-11-24 21:05:08 +01:00
