Commit Graph

3565 Commits

Author SHA1 Message Date
Nikolay Volf 41f15929b9 Merge pull request #928 from ethcore/ipc-handshake
IPC handshake (negotiating protocol/api version)
2016-04-12 14:19:35 +03:00
NikVolf 14241c8d14 line breaks 2016-04-12 13:05:13 +03:00
Arkadiy Paronyan 283ce13454 Merge pull request #914 from ethcore/upgrades
Upgrade logic between versions
2016-04-12 11:30:52 +02:00
Arkadiy Paronyan 6af8e5f7e7 Merge pull request #903 from ethcore/tracing
executive tracing cleanup
2016-04-12 11:30:18 +02:00
arkpar 54300b136c ARM Dockerfile 2016-04-12 10:06:54 +02:00
NikVolf 93822bd2a2 Merge branch 'master' into ipc-handshake 2016-04-12 08:22:52 +03:00
NikVolf 60ea89ca1c removed ready func 2016-04-12 07:17:57 +03:00
NikVolf a8bd7d07df client handshake tests, errors 2016-04-12 07:13:31 +03:00
NikVolf edba351335 codegen for client handshake 2016-04-12 07:07:12 +03:00
NikVolf be7eb63d1c handshake dispatch test 2016-04-12 06:43:45 +03:00
NikVolf 8ecbb53e99 reducing code 2016-04-12 06:19:15 +03: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
Arkadiy Paronyan edf4735542 Update install-parity.sh 2016-04-11 19:52:42 +02:00
Marek Kotewicz 2d9db0cf67 Merge pull request #921 from ethcore/rustup
updated dependencies
2016-04-11 14:39:59 +02:00
debris dfa8196543 updated dependencies 2016-04-11 13:21:55 +02:00
Marek Kotewicz 2004f1b5e5 Merge pull request #920 from ethcore/fixed_send_transaction_deadlock
Fixed send transaction deadlock
2016-04-11 13:20:59 +02:00
debris dc6ade4ae3 fixed transaction deadlock 2016-04-11 12:44:57 +02:00
debris 4bfbb56701 added explanatory comments 2016-04-11 11:36:39 +02:00
debris 610251fdf7 Merge branch 'master' into tracing 2016-04-11 11:35:07 +02:00
debris 66e63ee081 Merge branch 'master' of github.com:ethcore/parity 2016-04-11 11:32:34 +02:00
Gav Wood 587862a370 Merge branch 'master' of github.com:ethcore/parity 2016-04-10 15:35:53 -07:00
Gav Wood 6c35c5e604 --unlock is comma-delimited. (#916) 2016-04-10 14:01:41 -07:00
Marek Kotewicz fed853593b fixed eth_getLogs (#915)
* fixed eth_getLogs

* removed empty lines
2016-04-10 11:42:03 -07:00
debris 8340f135fc fixed eth_getLogs 2016-04-10 19:43:42 +02: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
Nikolay Volf 032d29ec86 Merge pull request #912 from ethcore/keys-path-fix-create
create provided custom dir for keys if none
2016-04-10 17:01:51 +04:00
NikVolf 5f7cc437dd removing lower-level defaults 2016-04-10 14:38:57 +03:00
NikVolf 219e88a023 create provided custom dir for keys if none 2016-04-10 14:20:48 +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
Gav Wood d823fd7685 Merge pull request #906 from ethcore/webapps-auth
WebApps HTTP Basic Auth Support
2016-04-09 10:19:59 -07:00
Tomasz Drwięga a63be702e1 Merge pull request #888 from ethcore/h256
Removing match on constant
2016-04-09 11:28:01 +02:00
Tomasz Drwięga 04d5b5cbe6 Merge branch 'master' into h256
Conflicts:
	ethcore/src/account.rs
2016-04-09 11:27:19 +02:00
Tomasz Drwięga e839404bd2 Merge pull request #907 from ethcore/gavofyork-patch-1
Update auth.rs
2016-04-09 11:25:05 +02:00
Gav Wood 1d5b29fb48 Update auth.rs 2016-04-08 17:51:20 -07:00
Gav Wood 60875905ac Merge pull request #904 from ethcore/webapp-default
Enabling webapps compilation by default
2016-04-08 17:43:13 -07:00
Gav Wood 0ef6de930f Update account.rs 2016-04-08 17:42:17 -07:00
Gav Wood 215973c7ab Merge pull request #898 from ethcore/fixed_895
fixed #895
2016-04-08 17:41:54 -07:00
Tomasz Drwięga dab54cf2a7 HTTP Basic Authorization for WebApps server. 2016-04-08 16:11:58 +02:00
Tomasz Drwięga 8f16515d82 HTTP Authorization support in router 2016-04-08 15:25:20 +02:00
NikVolf 80d04ead33 server handshake 2016-04-08 14:07:25 +03:00
debris fcf7f392f0 fixed failing tests 2016-04-08 11:48:37 +02:00
Tomasz Drwięga 508daad011 Enabling webapps by default 2016-04-08 11:18:46 +02:00
Arkadiy Paronyan f9f11b6f74 Merge pull request #899 from ethcore/webapps2
Support for compile-time included WebApplications.
2016-04-08 10:54:40 +02:00
Tomasz Drwięga f129126a82 Adding couple of missing commas 2016-04-08 10:13:42 +02:00
debris 64294853cc separated tracing logic to its own trait 2016-04-08 01:50:55 +02:00