Gav Wood
|
cfe3b07130
|
Merge branch 'boxjdb' into reorgjdb
|
2016-03-11 15:03:43 +01:00 |
|
Gav Wood
|
38d470f3bc
|
Reorganise command line options into more general engine.
|
2016-03-11 14:45:19 +01:00 |
|
Tomasz Drwięga
|
03da6c991f
|
Merge branch 'master' into ethminer_crate
Conflicts:
Cargo.lock
Cargo.toml
ethcore/src/client/client.rs
hook.sh
parity/main.rs
rpc/Cargo.toml
rpc/src/v1/impls/eth.rs
sync/Cargo.toml
sync/src/tests/helpers.rs
|
2016-03-11 14:37:07 +01:00 |
|
Gav Wood
|
7e8b6c3660
|
Merge branch 'boxjdb' into reorgjdb
|
2016-03-11 14:06:32 +01:00 |
|
Nikolay Volf
|
22d1def894
|
Merge pull request #666 from ethcore/moregethcli
More geth compatibility.
|
2016-03-11 16:05:27 +03:00 |
|
Gav Wood
|
b25551be7b
|
Merge pull request #671 from ethcore/clippy_hook
Removing running clippy by default on nightly.
|
2016-03-11 14:03:16 +01:00 |
|
Marek Kotewicz
|
176b9a992d
|
Merge pull request #667 from ethcore/rpc_tests
rpc net submodule tests
|
2016-03-11 13:58:32 +01:00 |
|
Gav Wood
|
51cfd4b0ea
|
Remove unneeded clone.
|
2016-03-11 13:58:11 +01:00 |
|
debris
|
ecd33a6093
|
fixed U256 and transaction request deserialization, added tests for transaction request
|
2016-03-11 13:54:52 +01:00 |
|
Gav Wood
|
4771fdf0fb
|
Rearrange journaldb infrastructure.
|
2016-03-11 13:50:39 +01:00 |
|
Gav Wood
|
2a856a13f0
|
Obvious typo fix.
|
2016-03-11 13:21:53 +01:00 |
|
Gav Wood
|
d71c5d4c17
|
Place Sync/Send in trait.
|
2016-03-11 13:19:10 +01:00 |
|
Nikolay Volf
|
d3f83ad7be
|
Merge branch 'master' into personal-rpc-cli
|
2016-03-11 16:05:22 +04:00 |
|
Nikolay Volf
|
99c5794929
|
fix warning for transaction_queue.add usage
|
2016-03-11 16:00:30 +04:00 |
|
Gav Wood
|
e461916f5a
|
Merge remote-tracking branch 'origin/master' into boxjdb
|
2016-03-11 12:56:33 +01:00 |
|
Gav Wood
|
756f964130
|
JournalDB -> Box<JournalDB>, and it's a trait.
|
2016-03-11 12:54:48 +01:00 |
|
Nikolay Volf
|
70ee6aa942
|
refactoring to use generic account provider as web3 svc
|
2016-03-11 15:50:13 +04:00 |
|
Nikolay Volf
|
ed0047725c
|
adding cli extension
|
2016-03-11 15:49:49 +04:00 |
|
debris
|
1554d5adef
|
Merge branch 'master' into rpc_tests
|
2016-03-11 12:32:08 +01:00 |
|
debris
|
d1fa292956
|
Merge branch 'master' into rpc_unit_tests
|
2016-03-11 12:31:56 +01:00 |
|
debris
|
190630cc6b
|
separated transaction_request to its own submodule, added basic tests for it
|
2016-03-11 12:31:45 +01:00 |
|
Tomasz Drwięga
|
dd2fb4df67
|
Storing BlockNumber & transactions directly in enum
|
2016-03-11 12:31:42 +01:00 |
|
Nikolay Volf
|
62e94e1744
|
Merge pull request #665 from ethcore/client_submodules
Client module overhaul
|
2016-03-11 14:28:30 +03:00 |
|
arkpar
|
8f54c24e47
|
Merged changes from jdb_option1, keep LATEST_ERA from decreasing
|
2016-03-11 11:52:11 +01:00 |
|
Tomasz Drwięga
|
2fd036b073
|
Merge branch 'ethminer_crate' into rpc_pending_filter
Conflicts:
rpc/src/v1/helpers/poll_manager.rs
rpc/src/v1/impls/eth.rs
|
2016-03-11 11:44:44 +01:00 |
|
debris
|
68a13973a4
|
fixed ethcore-rpc tests build after merge
|
2016-03-11 11:42:24 +01:00 |
|
Tomasz Drwięga
|
55a14b3aaf
|
Fixing transaction queue test
|
2016-03-11 11:40:12 +01:00 |
|
Tomasz Drwięga
|
eb8e92c37f
|
Cargo.lock
|
2016-03-11 11:18:38 +01:00 |
|
debris
|
389d17974e
|
Merge branch 'client_submodules' into rpc_tests
|
2016-03-11 11:17:28 +01:00 |
|
debris
|
ebd2a92267
|
Merge branch 'master' of github.com:ethcore/parity into client_submodules
|
2016-03-11 11:17:08 +01:00 |
|
Tomasz Drwięga
|
d84e008e00
|
Removing superflous check for nightly
|
2016-03-11 11:16:49 +01:00 |
|
Marek Kotewicz
|
fd39975cf0
|
Merge pull request #587 from ethcore/rpc-signing-extend
Rpc transaction signing
|
2016-03-11 11:14:17 +01:00 |
|
Marek Kotewicz
|
eb2171e287
|
Merge pull request #652 from ethcore/tx_queue_rpc
Transaction queue exposed via JSON rpc.
|
2016-03-11 11:08:16 +01:00 |
|
debris
|
7ea53d39e6
|
Merge branch 'client_submodules' into rpc_tests
|
2016-03-11 11:05:25 +01:00 |
|
Tomasz Drwięga
|
a8a21da9ba
|
Updating hook and removing running clippy from dev-dependencies
|
2016-03-11 11:05:20 +01:00 |
|
debris
|
bfac5f9238
|
Merge branch 'master' of github.com:ethcore/parity into client_submodules
|
2016-03-11 11:03:52 +01:00 |
|
debris
|
18939462c3
|
sync_provider function
|
2016-03-11 11:03:43 +01:00 |
|
Marek Kotewicz
|
8d6ea3a0ef
|
Merge pull request #499 from ethcore/thread
Remove unneeded locking
|
2016-03-11 10:59:21 +01:00 |
|
Tomasz Drwięga
|
8709dd28f8
|
Fixing clippy warnings
|
2016-03-11 10:58:51 +01:00 |
|
Tomasz Drwięga
|
3a4a7ac822
|
Bumping clippy version
|
2016-03-11 10:35:26 +01:00 |
|
Tomasz Drwięga
|
5b204a5ff5
|
Merge branch 'master' into ethminer_crate
Conflicts:
parity/main.rs
rpc/src/v1/impls/eth.rs
sync/src/lib.rs
|
2016-03-11 10:31:07 +01:00 |
|
debris
|
3479a9bf95
|
Merge branch 'client_submodules' into rpc_tests
|
2016-03-11 10:30:46 +01:00 |
|
debris
|
a6d268db16
|
fixed missing reexport
|
2016-03-11 10:30:13 +01:00 |
|
debris
|
8e52510dbb
|
implemented net_listening method
|
2016-03-11 10:21:25 +01:00 |
|
Tomasz Drwięga
|
3bbdc03d0c
|
Fixing doctest.
|
2016-03-11 10:17:51 +01:00 |
|
debris
|
34a120e127
|
net tests
|
2016-03-11 10:17:20 +01:00 |
|
Gav Wood
|
d9c462a3d3
|
Use proper listen address. Tidyups.
|
2016-03-11 10:05:27 +01:00 |
|
Gav Wood
|
4c757997f6
|
Merge remote-tracking branch 'origin/master' into moregethcli
|
2016-03-10 21:41:29 +01:00 |
|
Gav Wood
|
29916edb91
|
More geth compatibility.
|
2016-03-10 21:36:45 +01:00 |
|
debris
|
87dd42f7bc
|
Merge branch 'master' of github.com:ethcore/parity into client_submodules
|
2016-03-10 21:17:58 +01:00 |
|