grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,768 Commits 1 Branch 329 Tags 59 MiB
4a9b9dc305
Commit Graph

460 Commits

Author SHA1 Message Date
Gav Wood
c1ed520de0 RPC endpoint for VM tracing and ser/de types ready. 2016-05-28 16:52:33 +02:00
Arkadiy Paronyan
468d761e5c Merge pull request #1163 from ethcore/warnings 
Fixing few clippy warnings
 2016-05-27 19:06:37 +02:00
Tomasz Drwięga
20846c11c9 Merge branch 'signer-server' into signer-rpc 
Conflicts:
	parity/signer.rs
	signer/Cargo.toml
	signer/src/lib.rs
	signer/src/ws_server/mod.rs
 2016-05-27 18:53:01 +02:00
Tomasz Drwięga
f60097ddb6 Merge branch 'master' into signer-server 
Conflicts:
	rpc/src/v1/types/bytes.rs
 2016-05-27 18:50:47 +02:00
Tomasz Drwięga
6f93ecf1d2 Exposing types from RPC 2016-05-27 18:50:04 +02:00
Tomasz Drwięga
58039fb420 Fixing few clippy warnings 2016-05-27 17:56:25 +02:00
Tomasz Drwięga
c4e2f65051 Exposing RPC over websockets 2016-05-27 17:55:12 +02:00
Robert Habermeier
ba600ac06a have parity create the PersonalClient properly 2016-05-27 16:45:26 +02:00
Tomasz Drwięga
b77fdcdd68 WebSockets server for signer 2016-05-27 13:03:00 +02:00
Marek Kotewicz
ca008fb541 migration fixes (#1155) 
* dont use system temp for migration, do backup

* fixed issue with number of open files on osx

* fixed compilation of util tests
 2016-05-27 08:23:29 +02:00
Marek Kotewicz
7370776af1 Bloomchain (#1014) 
* use bloomchain crate in blockchain module. remove obsole chainfilter submodule

* update database version to 6.0

* removed redundant line

* simple db migration

* make migration slightly more functional

* bloomchain migration

* migration version is just a single unsigned integer

* updated migration v6

* parity migration

* db migration

* removed hardcoded migration dir

* replace ptr::copy with clone_from_slice, removed potential endianess problem from trace/db.rs

* removed superfluous line

* blockchains log blooms config is not exposed any more
 2016-05-26 18:24:51 +02:00
Tomasz Drwięga
cc1a334ba7 Renaming dapps repos. Updating dapps (#1142) 
* Renaming dapps repos. Updating dapps

* Skipping legacy options for compatibility. Fixing tabs

* Fixing CLI options
 2016-05-26 18:21:15 +02:00
Tomasz Drwięga
5b0c936fee Fixing clippy warnings 2016-05-26 11:49:58 +02:00
Tomasz Drwięga
fa6b35ec8d Bumping clippy. Fixing warnings (#1139) 
* Bumping clippy. Fixing warnings

* Removing unused import

* Fixing complexity and arguments warning on two functions
 2016-05-25 17:03:58 +02:00
Gav Wood
a0bc1f9dae Display progress when importing (#1136) 
* Display progress when importing

* Additional polish.

* Fix strange yielding behaviour.

* Allow colour to be disabled.

Fixed #1135
 2016-05-25 09:57:31 +02:00
Gav Wood
27380cdadb Coloured, padding logging. (#1133) 
* Add info message for mined block.

* Coloured, padding logging.

* Remove superfluous logs.

* Use better term colour module.
 2016-05-24 20:30:21 +02:00
Gav Wood
2969d015ed Importing (#1132) 
* Basic hex block exporting.

* Export formats and to file.

* First bits.

* Block importing.

* Fix error text.

* Wait for queue to empty before shutting down after import.
 2016-05-24 20:29:19 +02:00
Marek Kotewicz
bf46531372 Merge pull request #1116 from rphmeier/die_display 
Have `die_with_error` use `fmt::Display` rather than Debug
 2016-05-24 20:00:50 +02:00
Gav Wood
78d3dfbfa6 Fix error text. 2016-05-24 13:31:03 +02:00
Gav Wood
6c64aec137 Export formats and to file. 2016-05-23 18:42:59 +02:00
Gav Wood
564a996620 Basic hex block exporting. 2016-05-23 09:51:36 +02:00
Robert Habermeier
49899d0dee trace error in die_with_io_error 2016-05-22 12:48:40 -04:00
Robert Habermeier
1251315b28 use fmt::Display in die_with_io_error printing 2016-05-22 12:43:21 -04:00
Gav Wood
9f84326ca7 Avoid importing keys into wrong place. (#1119) 
* Avoid importing keys into wrong place.

- Now a `--no-import-keys` option;
- `--testnet` now alters the import location for keys and the store path.

Fixes #1112 and #1089.

* Avoid double-bools.
 2016-05-21 18:46:18 +02:00
Gav Wood
828bf7cb9e Make receipt's gasUsed property work properly. 
Fixes #1111
 2016-05-21 14:49:21 +02:00
Robert Habermeier
3cba91bdd5 alter die_with_error to use fmt::Display, not Debug 2016-05-20 18:13:30 -04:00
debris
95365670e4 Merge branch 'master' of github.com:ethcore/parity into trace_err 2016-05-19 14:15:05 +02:00
Gav Wood
bfdbff5ac7 basic pruning method still experimental. 2016-05-19 11:40:43 +02:00
debris
506ca15a15 Merge branch 'master' of github.com:ethcore/parity into trace_err 2016-05-19 11:07:53 +02:00
Gav Wood
306315e3e5 Default to archive mode. 2016-05-19 10:03:45 +02:00
Nikolay Volf
6c6bbe9c57 Merge branch 'master' into miner-spec-refact 
Conflicts:
	ethcore/src/client/client.rs
	ethcore/src/client/mod.rs
	ethcore/src/client/test_client.rs
	miner/src/miner.rs
 2016-05-19 03:51:05 +03:00
debris
55ebab2392 Merge branch 'master' of github.com:ethcore/parity into trace_err 2016-05-19 01:03:55 +02:00
Marek Kotewicz
6cff58055d CLI option for using JITEVM (#1103) 
* easily configurable vm (in progress)

* completely removed vm_factory from engine

* --jitvm command line flag
 2016-05-19 00:44:49 +02:00
debris
57b0be2a0b pretty print trace error 2016-05-18 11:44:55 +02:00
Tomasz Drwięga
a950b81ee8 Fixing clippy warnings 2016-05-17 10:32:05 +02:00
Nikolay Volf
994d056922 miner will use separate spec 2016-05-16 19:16:56 +03:00
Nikolay Volf
52e22b8a51 Merge pull request #1085 from ethcore/fix1073 
Provide fallback for usd-per-eth option when offline.
 2016-05-14 22:02:35 +03:00
Nikolay Volf
3ea26fcb0a merged out function return 2016-05-14 20:43:29 +03:00
Nikolay Volf
93aa6c613a Merge branch 'master' into path-man 
Conflicts:
	parity/configuration.rs
 2016-05-14 20:22:59 +03:00
Gav Wood
33248528b9 Provide fallback for usd-per-eth option when offline. 
Fixes #1073.
 2016-05-14 14:53:46 +01:00
Nikolay Volf
2b78e511c9 Configurable keys security (#1080) 
* adding options & cli flags

* adding it to the key deriving

* removed duplicated option
 2016-05-14 12:30:25 +01:00
Marek Kotewicz
9b91444638 comma delimeting multiple cors headers (#1078) 2016-05-14 12:29:26 +01:00
Nikolay Volf
96496d6349 by ref 2016-05-13 18:36:18 +03:00
Nikolay Volf
7c19930efa creating all in one place 2016-05-13 18:32:32 +03:00
Nikolay Volf
9150538ac4 refactoring in configuration 2016-05-13 13:53:33 +03:00
Gav Wood
2a19f91e99 Fix --geth IPC for MacOS. (#1062) 2016-05-09 12:04:00 +01:00
Gav Wood
c75348392c Merge branch 'master' of github.com:ethcore/parity 2016-05-08 13:34:14 +01:00
Gav Wood
04f7322f06 --geth compatibility option 2016-05-08 13:34:01 +01:00
Nikolay Volf
0d642f3109 removing unused externs 2016-05-06 16:43:29 +04:00
Gav Wood
0d507922ce Tidy up CLI options and make JSONRPC & webapps on by default. (#1045) 
* Tidy up CLI options and make JSONRPC & webapps on by default.

* Fix test.
 2016-05-04 22:44:42 +02:00
Nikolay Volf
ad00bd7bc8 Merge pull request #1044 from ethcore/clippy-warnings 
Fixing clippy warnings
 2016-05-04 18:10:03 +03:00
Arkadiy Paronyan
0b1442faa2 Merge pull request #1041 from ethcore/rpc_modules 
Fixing RPC modules compatibility
 2016-05-04 15:48:07 +02:00
Nikolay Volf
c449bf5663 JSON-RPC over IPC (#1039) 
* moving namespaces for http/rpc

* cli options for ipc

* jsonrpc exposed fully

* updating json-ipc-server & removing non-standart traces api from defaults

* spelling & format
 2016-05-04 15:37:09 +02:00
Tomasz Drwięga
15a8860e8a Fixing clippy warnings 2016-05-04 15:22:22 +02:00
Tomasz Drwięga
c3f33aefdd Fixing RPC modules compatibility 2016-05-04 14:03:29 +02:00
Gav Wood
ac73b2628a Basic Authority (#991) 
* Firt commit.

* First non-functional but correct implementation of BasicAuthority.

Still needs:
- Sealing infrastructure.

* Punch a hole to give miner access to key store.

* Fix test built.

* Basic version of synchronous mining.

This will seal a block whenever a new transaction comes through.
To be made better we need a timer which will wait for one second after the
last block before sealing a new one - better still would be to cooperatively
interleave blocks with other sealing nodes.

* Add tests.

* Fix minor issues from repotting.

* Address grumbles.
 2016-05-03 17:23:53 +02:00
arkpar
0595caf50c Flush password prompt 2016-05-02 16:28:15 +02:00
Marek Kotewicz
7c2adc4137 Tracedb interface && cli (#997) 
* traces cli and jsonrpc api

* missing if in docs

* adding traces to modules
 2016-05-02 12:17:30 +02:00
Tomasz Drwięga
fdd030d101 Fixing status page displaying homestead (#1020) 
* Fixing status page displaying homestead when running with --testnet switch

* Putting cli parsing logic in single place. Adding tests
 2016-04-30 18:58:28 +01:00
Tomasz Drwięga
e942f86bd7 Modules RPC (#1019) 2016-04-29 19:52:08 +01:00
Arkadiy Paronyan
f83a8f3ba1 More detailed fatal error reporting (#1016) 2016-04-28 20:48:00 +01:00
Marek Kotewicz
7068901649 Merge pull request #988 from ethcore/rpc-exception-handling 
Exception handling in RPC & WebApps
 2016-04-28 10:02:12 +02:00
Arkadiy Paronyan
3865e4cdba Merge pull request #998 from ethcore/ipc-new-serialization 
IPC with new serialization
 2016-04-26 15:52:38 +02:00
Tomusdrw
36104edc63 Merge branch 'master' into rpc-exception-handling 2016-04-25 17:37:55 +02:00
Nikolay Volf
9a3e6a6135 hypervisor fix 2016-04-25 06:34:11 +03:00
Tomasz Drwięga
8956d7e02b Exception handling in RPC & WebApps 2016-04-23 12:29:12 +02:00
Tomasz Drwięga
8b84b4f128 Merge branch 'master' into rpc-shared-miner 
Conflicts:
	parity/main.rs
 2016-04-22 12:16:15 +02:00
Tomasz Drwięga
0458a3378c Additional RPC methods for settings 2016-04-21 19:24:10 +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
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
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
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
Tomasz Drwięga
a21f2a0998 Exposing loggin via RPC 2016-04-19 18:27:12 +02:00
Tomasz Drwięga
5df817c8e0 Setting limit from CLI 2016-04-18 23:03:41 +02:00
Tomasz Drwięga
13c25c5d49 Merge branch 'master' into webapps-mio 
Conflicts:
	Cargo.lock
	parity/main.rs
 2016-04-15 17:14:39 +02:00
Arkadiy Paronyan
38fa25edbe Merge pull request #960 from ethcore/upgrade-path 
using db_path directory when upgrading
 2016-04-15 16:30:44 +02:00
Arkadiy Paronyan
b441750cc9 Merge pull request #958 from ethcore/ipc-hypervisor 
IPC hypervisor
 2016-04-15 10:31:19 +02:00
Gav Wood
99b8e28051 Update mod.rs 2016-04-14 22:13:38 -07:00
NikVolf
222a1bd29b using db_path directory 2016-04-15 02:49:42 +03:00
Arkadiy Paronyan
9b2f545391 Merge pull request #956 from ethcore/cors-option 
Changing cors header to be optional
 2016-04-14 21:16:57 +02:00
Gav Wood
d909bc05c4 Sensible gas limits for eth_sendTransaction (#953) 
* Sensible gas limits for eth_sendTransaction

Fixes #859

* Compile fix.

* Remove !.
 2016-04-14 12:01:12 -07:00
NikVolf
dc7e105ef8 Merge branch 'master' into ipc-hypervisor 2016-04-14 21:57:24 +03:00
NikVolf
edb8f1fd7e doc effort 2016-04-14 21:50:35 +03:00
NikVolf
6f4a98333e child processes spawn 2016-04-14 21:45:53 +03:00
Tomasz Drwięga
f81914351d Rewriting webapps to use hyper-mio branch 2016-04-14 20:38:48 +02:00
NikVolf
7ac985dded fix warnings 2016-04-14 20:56:06 +03:00
NikVolf
1b2ef60bbe working tests including warmup 2016-04-14 20:43:14 +03:00
NikVolf
4d527e152c hypervisor-service chain 2016-04-14 18:49:25 +03:00
NikVolf
4931a300f2 first tests 2016-04-14 18:22:31 +03:00
Tomasz Drwięga
5b2d726a02 Changing cors header to be optional 2016-04-14 14:38:07 +02:00
Gav Wood
f5985bbffc Fix upgrade script and make parity run when no .parity dir. 2016-04-13 18:02:16 -07:00
Gav Wood
32ca8066e9 Tracing and docs. (#952) 2016-04-13 11:26:41 -07:00
NikVolf
405e3e2e7d initial setup 2016-04-13 19:03:57 +03:00
Arkadiy Paronyan
c7d6444ae0 Merge pull request #936 from ethcore/bumping-clippy 
Bumping clippy and fixing warnings.
 2016-04-12 16:49:30 +02:00
Nikolay Volf
bdb35cfaed Merge pull request #927 from ethcore/pruning_auto 
Pruning auto
 2016-04-12 16:00:39 +03:00
Tomasz Drwięga
7fbe3f4721 Fixing clippy warnings 2016-04-12 13:54:34 +02:00
Arkadiy Paronyan
283ce13454 Merge pull request #914 from ethcore/upgrades 
Upgrade logic between versions
 2016-04-12 11:30:52 +02:00
NikVolf
8ecbb53e99 reducing code 2016-04-12 06:19:15 +03:00
Gav Wood
fa95419c27 --pruning=auto option. 2016-04-11 18:42:50 -07:00
Gav Wood
6e97496b27 Support for --pruning=auto. 2016-04-11 15:51:14 -07:00
Tomasz Drwięga
3fe21f5931 Ethcore-specific RPC methods (#923) 
* Ethcore-specific rpc methods

* Initializing ethcore-rpc
 2016-04-11 12:06:32 -07:00
Gav Wood
c48374dbc6 Parameter to allow user to force the sealing mechanism (#918) 
* Allow block sealing mechanism to be forced, even when not mining.

* Fix deadlock in dispatch_transaction. Fix tests.

* Horrible workaround for transaction importing.

* Reduce tracing. Cleanups.

* Remove logging.

* Remove broken code inherited from dodgy implementation.

* pre-query tx queue nonce also if any

* remove outside nonce queries

* remove queue nonces
 2016-04-11 11:52:33 -07:00
NikVolf
1d09844950 Merge branch 'master' into upgrades 2016-04-11 21:43:07 +03:00
NikVolf
26e23da4c0 some newver/oldver logics 2016-04-10 17:15:40 +03:00
NikVolf
d3411a50a4 locked ver.lock upgrade 2016-04-10 16:42:33 +03:00
NikVolf
69add61174 basic upgrade scenario 2016-04-10 16:12:20 +03:00
Gav Wood
6ebd5009fc --unlock is comma-delimited. 2016-04-09 12:58:13 -07:00
Marek Kotewicz
373284ca0a spec loading cleanup (#858) 
* spec loading cleanup in progress

* changed engine field in json spec

* refactored engine params

* polishing spec loading refactor

* fixed compiling json tests

* fixed compiling parity

* removed warnings

* removed commented out code

* fixed failing test

* bringing back removed TODO in spec.
 2016-04-09 10:20:35 -07:00
Tomasz Drwięga
dab54cf2a7 HTTP Basic Authorization for WebApps server. 2016-04-08 16:11:58 +02:00
Tomasz Drwięga
9bd41761fc Reverting back to old-hyper version of rpc 2016-04-07 16:31:42 +02:00
Tomasz Drwięga
b7c790d741 Disabling rpc until we switch to async hyper 2016-04-07 16:22:02 +02:00
Tomasz Drwięga
bf4ab6daa8 Merge branch 'master' into webapps2 
Conflicts:
	parity/main.rs
 2016-04-07 16:13:58 +02:00
Tomasz Drwięga
4569c25127 Specifying webapp interface 2016-04-07 15:59:45 +02:00
arkpar
8074fee28c Use new json RPC server 2016-04-07 14:32:44 +02:00
Tomasz Drwięga
db2354a252 Merge branch 'fixing-rpc' into webapps2 
Conflicts:
	parity/main.rs
 2016-04-07 13:09:58 +02:00
Tomasz Drwięga
2adeb9fe88 Removing Option from setup_rpc_server method return type 2016-04-07 12:55:06 +02:00
Tomasz Drwięga
d1e3c633e5 Fixing compilation with rpc feature disabled 2016-04-07 12:50:35 +02:00
Tomasz Drwięga
91f1f4c174 Changing default setup to be safer for now 2016-04-07 12:20:35 +02:00
Tomasz Drwięga
1e9e0c32fa Disabling webapp server by default 2016-04-07 12:15:39 +02:00
Tomasz Drwięga
da05aa51fe Adding all APIs to webapp rpc server 2016-04-07 12:12:26 +02:00
Tomasz Drwięga
ad37b7fd2a Adding webapps router 2016-04-07 12:10:26 +02:00
Tomasz Drwięga
5d6ca1498e CLI options to run webapp server 2016-04-07 11:06:49 +02:00
Tomasz Drwięga
e3ce5d94e1 Adding webapps crate 2016-04-07 10:49:00 +02:00
Tomasz Drwięga
f27d88f6ab More descriptive message when closing 2016-04-06 23:58:23 +02:00
Tomasz Drwięga
fd03f58eae Rewriting messages 2016-04-06 19:22:10 +02:00
Tomasz Drwięga
a52043d5b3 Removing additional thread from JSON-RPC 2016-04-06 19:14:05 +02:00
Tomasz Drwięga
1f9eb97d0a Merge branch 'master' into closing 2016-04-06 19:07:56 +02:00
Tomasz Drwięga
dc91e57c2f Additional logging and error messages 2016-04-06 19:07:27 +02:00
Marek Kotewicz
a8eb34ddb8 Merge pull request #891 from ethcore/issue-882 
passing key path to all invocations
 2016-04-06 15:05:47 +02:00
NikVolf
e6be5016f9 replacing /home/nikky also 2016-04-06 14:21:19 +03:00
NikVolf
8b3e84f7fe passing key path to all invocations 2016-04-06 14:03:53 +03:00
Tomasz Drwięga
85da55a537 Fixing warnings 2016-04-06 10:55:40 +02:00
Nikolay Volf
167f61bef0 [ci skip] update misleading cli help msg for author 2016-04-04 04:03:20 +04:00
Peter
40b97045f0 Reorganised price info lookup 
This helped stop my eyes from hurting.

Further simplification
 2016-03-28 22:11:28 +01:00
Gav Wood
b606fb68cf USD-based pricing of gas. 2016-03-28 00:49:35 +02:00
NikVolf
6db02134e9 Merge branch 'master' into unlock-pass 2016-03-27 04:49:02 +03:00
Gav Wood
156a2336de Allow passwords on multiple lines in --password files. 2016-03-27 03:15:41 +02:00
NikVolf
32fd35843f in cli call 2016-03-27 03:45:43 +03:00
Gav Wood
8805d04183 Minor refactor. 2016-03-27 01:41:28 +01:00
Gav Wood
53c4ed09a3 Unlock accounts on CLI. 2016-03-27 01:35:42 +01:00
Gav Wood
0e026ed11f Fix author reporting. num_cpus for JSONRPC threads. 2016-03-22 19:12:17 +01:00
Gav Wood
7624bcf49e Increase threads to 4. 2016-03-22 18:43:06 +01:00
Gav Wood
05a9c16329 JSONRPC interface defaults to local. 
Please enter the commit message for your changes. Lines starting
 2016-03-20 10:34:34 +01:00
Gav Wood
c611566a3e Listen on all interfaces for JSONRPC by default. 2016-03-20 10:19:21 +01:00
Gav Wood
387d0743e6 Allow 0x prefix for --author. 2016-03-19 23:51:24 +01:00
Tomasz Drwięga
e58ec31e20 Fixing warnings 2016-03-18 10:14:19 +01:00
arkpar
4e5ebc9457 missing mut 2016-03-14 14:22:18 +01:00
arkpar
f6e8c03ff6 Merge branch 'master' of github.com:ethcore/parity into titi 2016-03-14 14:18:59 +01:00
Gav Wood
5503cd4646 Lock reports to avoid out of order badness. 2016-03-14 12:41:11 +01:00
Gav Wood
7320ad077f Merge remote-tracking branch 'origin/master' into targetgaslimit 2016-03-14 10:54:38 +01:00
Arkadiy Paronyan
d5fa49376e Merge pull request #713 from ethcore/docoptclean 
docopts cleanups
 2016-03-14 10:26:38 +01:00
Gav Wood
f6b7884a1d Allow configuration of target gas limit. 2016-03-14 02:00:22 +01:00
Gav Wood
2d1a837a8b docopts cleanups. 
one for @LefterisJP: 80-character line for docopts.
 2016-03-14 00:52:31 +01:00
Gav Wood
97fe4fcab4 Merge pull request #701 from ethcore/sstore-key-exp 
management of account expiration & memory
 2016-03-13 23:19:49 +01:00
Gav Wood
8fd8f687ee Remove EarlyMerge from user docs. 2016-03-13 23:12:47 +01:00
Gav Wood
0ccb9df4f1 Merge remote-tracking branch 'origin/master' into rcdb 2016-03-13 21:43:41 +01:00
Tomasz Drwięga
54ff64c0e0 Merge branch 'master' into merge_ethminer 
Conflicts:
	parity/main.rs
 2016-03-13 20:42:33 +01:00
Gav Wood
81291622eb Avoid batches for now. 2016-03-13 19:22:42 +01:00
Gav Wood
5107fc5897 Update options. 2016-03-13 18:09:44 +01:00
Gav Wood
08b9cc2c41 Merge changes from #674 into branch. 2016-03-13 15:29:55 +01:00
Nikolay Volf
a4f03100e9 registering timer 2016-03-13 15:11:16 +01:00
Gav Wood
02f43f2e8c Merge branch 'ethminer_crate' 2016-03-13 15:00:47 +01:00
Nikolay Volf
89dc6fa9cc io handlers 2016-03-13 14:46:45 +01:00
Gav Wood
e85a2f3804 Update main.rs 
[noci]
 2016-03-12 19:22:38 +01:00
Gav Wood
89986ec0e0 Update main.rs 
[noci]
 2016-03-12 19:19:16 +01:00
Tomasz Drwięga
19b6c74675 Two more warnings 2016-03-12 13:39:17 +01:00
Gav Wood
e1c0177932 Update main.rs 2016-03-12 10:44:48 +01:00
Tomasz Drwięga
d0f7555348 Merge branch 'master' into updating_clippy 
Conflicts:
	util/src/journaldb/archivedb.rs
 2016-03-12 10:40:22 +01:00
Tomasz Drwięga
4b6e1dd4d2 Fixing warnings 2016-03-12 10:25:51 +01:00
Tomasz Drwięga
3ea52c2324 Merge branch 'master' into ethminer_crate 
Conflicts:
	parity/main.rs
 2016-03-12 10:22:43 +01:00
Tomasz Drwięga
aebc91d96f Merge branch 'master' into ethminer_crate 
Conflicts:
	Cargo.toml
	rpc/Cargo.toml
	sync/Cargo.toml
 2016-03-12 09:50:18 +01:00
arkpar
896ba57555 Merge branch 'master' of github.com:ethcore/parity into jdb_option2 2016-03-11 22:43:59 +01:00
Marek Kotewicz
cd835e88fc Merge pull request #661 from ethcore/rpc_pending_filter 
RPC Pending Transactions Filter
 2016-03-11 19:40:35 +01:00
Tomasz Drwięga
fadbc61dff Merge branch 'ethminer_crate' into rpc_pending_filter 
Conflicts:
	miner/src/miner.rs
	parity/main.rs
 2016-03-11 19:27:09 +01:00
Tomasz Drwięga
c3a79c1478 Merge branch 'master' into ethminer_crate 
Conflicts:
	ethcore/src/client/client.rs
	parity/main.rs
	sync/src/chain.rs
	sync/src/lib.rs
 2016-03-11 19:22:40 +01:00
Nikolay Volf
08b4488ef3 Merge branch 'master' into personal-rpc-cli 
Conflicts:
	parity/main.rs
 2016-03-11 20:54:18 +04:00
Tomasz Drwięga
36ff65d050 Fixing warnings 2016-03-11 14:53:03 +01:00
Tomasz Drwięga
197ea7f7d6 Using miner in rpc instead of sync 2016-03-11 14:51:07 +01:00
Nikolay Volf
8d67316ece Merge branch 'master' into reorgjdb 
Conflicts:
	parity/main.rs
 2016-03-11 17:41:04 +04: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
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
Nikolay Volf
d3f83ad7be Merge branch 'master' into personal-rpc-cli 2016-03-11 16:05:22 +04:00
Nikolay Volf
ed0047725c adding cli extension 2016-03-11 15:49:49 +04: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
Tomasz Drwięga
d84e008e00 Removing superflous check for nightly 2016-03-11 11:16:49 +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
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
Nikolay Volf
a2dea3885b refactoring to AccountService 2016-03-10 23:09:45 +04:00
Gav Wood
84a48142de Add more geth options. 2016-03-10 19:50:04 +01:00