Tomasz Drwięga
|
8b84b4f128
|
Merge branch 'master' into rpc-shared-miner
Conflicts:
parity/main.rs
|
2016-04-22 12:16:15 +02:00 |
|
Arkadiy Paronyan
|
11b0daf6cb
|
Merge pull request #983 from ethcore/rpc-settings
Additional RPC methods for settings
|
2016-04-22 11:37:24 +02:00 |
|
Tomasz Drwięga
|
08a0d42ed3
|
Compilation fix
|
2016-04-21 20:53:44 +02:00 |
|
Arkadiy Paronyan
|
5fc944ae1d
|
Merge pull request #985 from ethcore/tx-queue-deadlock
Fixing transaction_queue deadlock
|
2016-04-21 20:45:29 +02:00 |
|
Tomasz Drwięga
|
bacac7d0af
|
Fixing transaction_queue deadlock
|
2016-04-21 20:42:36 +02:00 |
|
Tomasz Drwięga
|
0458a3378c
|
Additional RPC methods for settings
|
2016-04-21 19:24:10 +02:00 |
|
Marek Kotewicz
|
5ccf653841
|
Merge pull request #981 from ethcore/main-refactor
Refactoring of `parity/main.rs`
|
2016-04-21 18:43:02 +02:00 |
|
Tomasz Drwięga
|
ef9b49f0b2
|
Merge branch 'main-refactor' into rpc-shared-miner
|
2016-04-21 17:38:21 +02:00 |
|
Tomasz Drwięga
|
ffc5d726bd
|
Merge branch 'master' into main-refactor
Conflicts:
parity/main.rs
|
2016-04-21 17:35:54 +02:00 |
|
Tomasz Drwięga
|
f5c2bea134
|
Shared instance of ExternalMiner
|
2016-04-21 17:32:53 +02:00 |
|
Arkadiy Paronyan
|
8381e79da6
|
Merge pull request #982 from ethcore/warnings
Fixing clippy warnings.
|
2016-04-21 17:28:30 +02:00 |
|
Tomasz Drwięga
|
3e280a3386
|
Splitting Configuration to separate module
|
2016-04-21 16:45:07 +02:00 |
|
Tomasz Drwięga
|
f5fcada5ba
|
Getting rid of generated code warnings
|
2016-04-21 16:32:44 +02:00 |
|
Tomasz Drwięga
|
ee474b425b
|
Fixing hook.
|
2016-04-21 16:19:47 +02:00 |
|
Tomasz Drwięga
|
c47d08e308
|
Fixing warnings
|
2016-04-21 16:06:54 +02:00 |
|
Tomasz Drwięga
|
69af2de3ba
|
Fixing clippy warning
|
2016-04-21 16:02:11 +02:00 |
|
Tomasz Drwięga
|
bad735a8e6
|
Separating
|
2016-04-21 15:41:25 +02:00 |
|
Tomasz Drwięga
|
3e4adcb3b6
|
Splitting informant,io_handler and webapps
|
2016-04-21 13:57:27 +02:00 |
|
Tomasz Drwięga
|
09b2d7b3a6
|
Separating RPC
|
2016-04-21 13:12:43 +02:00 |
|
Arkadiy Paronyan
|
3c665f7640
|
Merge pull request #977 from ethcore/status-bump
Bumping status page
|
2016-04-21 11:26:35 +02:00 |
|
Arkadiy Paronyan
|
f2a5630fdf
|
Merge pull request #972 from ethcore/db_writer
querying extras separated to its own module
|
2016-04-21 11:26:13 +02:00 |
|
Tomasz Drwięga
|
26ed38ecc2
|
Version 0.2.2 of status page
|
2016-04-21 09:43:42 +02:00 |
|
Marek Kotewicz
|
e149402d81
|
Merge pull request #976 from ethcore/rpc-logs
Exposing application logs via RPC.
|
2016-04-20 18:47:30 +02:00 |
|
Arkadiy Paronyan
|
e47af7f745
|
Merge pull request #966 from ethcore/from-bytes-extend
Addressing binary serialization for db types
|
2016-04-20 18:17:00 +02:00 |
|
debris
|
273e4d6f32
|
removed db/module, a single file is enoguh
|
2016-04-20 15:53:01 +02:00 |
|
debris
|
bffa1e1ec9
|
simplified writing and reading from database with cache
|
2016-04-20 15:45:42 +02:00 |
|
debris
|
9ce9fd390d
|
Merge branch 'master' of github.com:ethcore/parity into db_writer
|
2016-04-20 13:45:53 +02:00 |
|
Tomasz Drwięga
|
4b82fc1d1f
|
Bumping status page
|
2016-04-20 10:07:02 +02:00 |
|
Tomasz Drwięga
|
c56a67a55a
|
Adding tests for RotatingLogger
|
2016-04-20 00:47:56 +02:00 |
|
Tomasz Drwięga
|
f2a08d57e4
|
Merge branch 'master' into rpc-logs
Conflicts:
rpc/src/v1/tests/ethcore.rs
rpc/src/v1/traits/ethcore.rs
|
2016-04-19 19:59:50 +02:00 |
|
Marek Kotewicz
|
225a5ee825
|
removed redundant unwraps (#935)
* removed redundant unwraps
* fixed compilation error, removed warnings
* fixed transaction queue merge conflict
* fixed failing ethminer doc test
|
2016-04-19 10:35:32 -07:00 |
|
Tomasz Drwięga
|
407ab30503
|
Using ArrayVec to store logs
|
2016-04-19 19:22:14 +02:00 |
|
Tomasz Drwięga
|
a21f2a0998
|
Exposing loggin via RPC
|
2016-04-19 18:27:12 +02:00 |
|
Arkadiy Paronyan
|
2f174a6441
|
Merge pull request #975 from ethcore/fixed_tq_merge_conflict
fixed transaction queue merge conflict
|
2016-04-19 18:24:35 +02:00 |
|
debris
|
314ced57c8
|
fixed transaction queue merge conflict
|
2016-04-19 16:20:04 +02:00 |
|
Marek Kotewicz
|
46c8324c52
|
Merge pull request #974 from ethcore/tx-limit-conf
Configurable limit for transaction queue (CLI & Ethcore-RPC)
|
2016-04-19 16:02:28 +02:00 |
|
Marek Kotewicz
|
b8eb3d07ba
|
Merge pull request #973 from ethcore/tx-limit-bug
Enforce limit caused `last_nonce` to return incorrect values.
|
2016-04-19 16:02:08 +02:00 |
|
Tomasz Drwięga
|
3c67ac636b
|
Merge branch 'master' into tx-limit-conf
Conflicts:
miner/src/transaction_queue.rs
|
2016-04-19 00:03:20 +02:00 |
|
Tomasz Drwięga
|
10e2659600
|
Fixing last_nonces updating when transactions are removed because of the limit
|
2016-04-19 00:00:55 +02:00 |
|
Tomasz Drwięga
|
98b3962412
|
RPC methods to set the limits
|
2016-04-18 23:13:38 +02:00 |
|
Tomasz Drwięga
|
5df817c8e0
|
Setting limit from CLI
|
2016-04-18 23:03:41 +02:00 |
|
Tomasz Drwięga
|
cd044ec096
|
Merge branch 'master' into tx-limit-bug
Conflicts:
miner/src/transaction_queue.rs
|
2016-04-18 21:58:19 +02:00 |
|
Tomasz Drwięga
|
caf4d179a2
|
Even more detailed errors for transaction queue (#969)
* Even more detailed errors for transaction queue
* Small rename
* Removing macros in favour of functions+try!()
|
2016-04-18 10:34:59 -07:00 |
|
Tomasz Drwięga
|
58c47069d8
|
Enforce-limit + last_nonces bug
|
2016-04-18 18:39:14 +02:00 |
|
debris
|
60157e6f6c
|
Merge branch 'master' of github.com:ethcore/parity into db_writer
|
2016-04-18 18:15:10 +02:00 |
|
debris
|
62455a4094
|
separated from blockchain and made reusable db reader and batch writer
|
2016-04-18 18:15:03 +02:00 |
|
Tomasz Drwięga
|
41153dd37c
|
Removing macros in favour of functions+try!()
|
2016-04-18 17:20:35 +02:00 |
|
Arkadiy Paronyan
|
55051951f8
|
Merge pull request #970 from ethcore/blockchain_panic_fix
temporary fix of panic in blockchain garbage collection
|
2016-04-18 15:30:04 +02:00 |
|
debris
|
524a495ffd
|
temporary fix of panic in blockchain garbage collection
|
2016-04-18 15:18:14 +02:00 |
|
Tomasz Drwięga
|
2812f8cae6
|
Small rename
|
2016-04-18 13:35:19 +02:00 |
|