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

400 Commits

Author SHA1 Message Date
Nikolay Volf
a26a4edc85 version bump 2016-06-14 18:37:04 +03:00
NikVolf
5920a7068f installer initial, ui option for executable 2016-06-14 17:12:46 +03:00
Arkadiy Paronyan
6b12334136 Windows build (#1253) 
* Networking refactoring

* Fixed typo

* Trace logging

* Updated dependencies for windows build

* Windows fixes

* use mio 0.5

* nix build

* Windows build fix

* style

* removed unused import

* ipc crate version bump

* ipc config for named pipes

* tweaks and fixes

* tweaks and fixes

* final version bump

* Fixed tests

* Disable color output on windows

* Added missing doc
 2016-06-13 18:55:24 +02:00
Arkadiy Paronyan
b33482ce74 Merge pull request #1259 from ethcore/clippy-bump 
Clippy bump
 2016-06-13 11:57:07 +02:00
Arkadiy Paronyan
7064624b6f Merge pull request #1252 from ethcore/dapps-bump 
Signer port returned from RPC + Topbar showing count of unconfirmed transactions.
 2016-06-12 12:02:48 +02:00
Tomasz Drwięga
fca22e92ce Bumping clippy 2016-06-12 11:26:07 +02:00
Tomasz Drwięga
c2b226ec57 Dapps bump 2016-06-12 10:23:16 +02:00
Tomasz Drwięga
6d9baef12c Bumping minimal sysui [ci skip] 2016-06-10 15:59:03 +02:00
Tomasz Drwięga
036b324804 Bumping dapps 2016-06-10 15:23:18 +02:00
Tomasz Drwięga
2e52c99042 Fixing CORS settings 2016-06-09 10:02:52 +02:00
Tomasz Drwięga
cfaa0389e1 Bumping dapps 2016-06-08 17:27:21 +02:00
Tomasz Drwięga
f61ee1a5f1 SystemUIs authorization (#1233) 
* Initial implementation of AuthCodeStore for SystemUIs

* SystemUIs authorization

* Renaming SystemUI -> SignerUI

* Fixing clippy warnings

* Lowering time threshold

* Bumping sysui

* Fixing test
 2016-06-07 08:21:19 -07:00
Tomasz Drwięga
1dae61f22f Merge branch 'master' into signer-auth 2016-06-06 12:12:38 +02:00
Tomasz Drwięga
302126ebcf Allowing connections only from chrome-extension and self-hosted client 2016-06-06 12:03:01 +02:00
Arkadiy Paronyan
98d9752097 Merge pull request #1219 from ethcore/clippy-bump 
Clippy bump & fixing warnings
 2016-06-06 11:46:59 +02:00
Marek Kotewicz
b93c83b8a0 Merge pull request #1216 from ethcore/serde-bump 
Bumping serde & syntex
 2016-06-06 11:32:13 +02:00
Tomasz Drwięga
a7de430193 Merge branch 'master' into clippy-bump 
Conflicts:
	dapps/Cargo.toml
 2016-06-06 10:13:42 +02:00
Tomasz Drwięga
a063a63ac7 Merge branch 'master' into serde-bump 
Conflicts:
	ethcore/src/types/state_diff.rs
 2016-06-06 10:10:06 +02:00
Tomasz Drwięga
9572f6e5fc Merge branch 'master' into signer-ui 2016-06-06 10:06:48 +02:00
Tomasz Drwięga
d5048967e2 Updating topbar to latest version (#1220) 2016-06-03 17:52:39 +02:00
Tomasz Drwięga
bb1b8cc08a Loading local Dapps from FS. (#1214) 
* apps list to separate module

* Preparing to support serving files from disk

* Serving files from disk

* Using dapps path from CLI

* Adding more docs
 2016-06-03 11:51:11 +02:00
Tomasz Drwięga
ae2deaaf72 Bumping clippy version 2016-06-03 11:15:38 +02:00
Tomasz Drwięga
3ba15f6c64 Updating httpserver and core 2016-06-02 20:32:48 +02:00
Tomasz Drwięga
3e2479cf40 Merge branch 'master' into signer-ui 2016-06-02 20:00:25 +02:00
Tomasz Drwięga
d40504caa5 Merge branch 'signer-wsnotification' into signer-ui 2016-06-02 13:09:11 +02:00
Arkadiy Paronyan
8596a347ea Networking refactoring (#1172) 
* Networking refactoring

* Make sure the same socket is reused

* Safer atomic ordering

* Replaced eq with ==
 2016-06-02 11:49:56 +02:00
Tomasz Drwięga
5f68b81f68 Updating jsonrpc-core 2016-06-01 20:32:16 +02:00
Nikolay Volf
6676c6cf7e Merge branch 'master' into client-refact 2016-06-01 19:42:32 +02:00
Tomasz Drwięga
99e26b8480 Simple signing queue, confirmation APIs exposed in signer WebSockets. (#1182) 
* Splitting methods requiring signing into separate trait

* Single place where RPC apis are created.

* Separating eth_filter

* Separating eth_signing

* Stubs for Personal Signer methods

* Test for EthSigningQueueClient

* TransactionConfirmation API

* Exposing PersonalSigner API

* Defining ApiSets dependent on context

* Removing types

* Fixing default impl

* Fixing un-mocked tests

* Update signing_queue.rs

[ci skip]

* Removing unused import [ci skip]
 2016-06-01 19:37:34 +02:00
Tomasz Drwięga
a7a2b55362 Using ethcore http server 2016-06-01 19:32:05 +02:00
Tomasz Drwięga
1fd9110829 Serde bump 2016-06-01 17:59:21 +02:00
Nikolay Volf
f5ed31792f fixed sync with client only 2016-05-31 20:54:02 +02:00
Tomasz Drwięga
4d29508b4c Minimal System UI 2016-05-31 20:12:47 +02:00
Tomasz Drwięga
fb5efa2ffc Merge branch 'master' into signer-signing 
Conflicts:
	rpc/src/v1/impls/eth.rs
	rpc/src/v1/tests/mocked/eth.rs
	rpc/src/v1/traits/eth.rs
 2016-05-30 21:46:37 +02:00
Marek Kotewicz
43348c1629 Merge pull request #1167 from ethcore/signer-rpc 
Exposing RPC over Signer WebSockets
 2016-05-30 21:31:20 +02:00
Arkadiy Paronyan
68e62030d5 Merge pull request #1170 from ethcore/ipc-server-bump 
json ipc server version bump
 2016-05-30 18:11:52 +02:00
arkpar
76bb0729ba Updated dependencies for windows build 2016-05-30 15:38:23 +02:00
Nikolay Volf
7dfd7e883f another bump 2016-05-29 13:22:45 +02:00
Nikolay Volf
a8cf0ddf50 json ipc server version bump 2016-05-29 13:09:51 +02:00
Arkadiy Paronyan
b9f7ed9185 Merge pull request #1141 from rphmeier/rpc-tests 
Framework for improved RPC unit tests
 2016-05-29 00:50:19 +02:00
Tomasz Drwięga
1ba39538a7 Removing types 2016-05-28 19:50:57 +02:00
Tomasz Drwięga
87d0f09a44 Base for Signer Websockets server (#1158) 
* Basic signing queue

* Adding docs

* WebSockets server for signer

* Removing TODO

* Shortening the syntax

* Exposing types from RPC

* Fixing indentation

* Update main.rs
 2016-05-28 19:30:31 +02:00
Robert Habermeier
7ee23240f0 fix travis test build 2016-05-27 18:19:18 +02:00
Tomasz Drwięga
c4e2f65051 Exposing RPC over websockets 2016-05-27 17:55:12 +02:00
Tomasz Drwięga
cf19e38663 Exposing types from RPC 2016-05-27 15:46:07 +02:00
Tomasz Drwięga
b77fdcdd68 WebSockets server for signer 2016-05-27 13:03:00 +02:00
Tomasz Drwięga
945ebcbf9b Merge branch 'master' into signer-server 2016-05-27 10:53:30 +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
Tomasz Drwięga
a7bf13f23f Merge branch 'signer-crate' into signer-server 2016-05-26 19:30:52 +02:00
Tomasz Drwięga
977ad428ae Merge branch 'master' into signer-crate 
Conflicts:
	.travis.yml
	Cargo.toml
	cov.sh
	doc.sh
	fmt.sh
	hook.sh
	test.sh
 2016-05-26 18:58:25 +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
28391d2f52 Basic signing queue 2016-05-26 17:46:44 +02:00
Tomasz Drwięga
28545d706f Empty trusted signer crate with it's general purpose 2016-05-26 16:43:04 +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
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
Tomasz Drwięga
b1cfbc460e Using signAndSend in topbar 2016-05-23 12:56:18 +02:00
Tomasz Drwięga
fb0be9e730 Updating status page (new docs) 2016-05-23 11:55:10 +02:00
Tomasz Drwięga
f8553ef90a New dapps & query parameter handling (#1113) 
* DAO dapp

* Adding Maker OTC dapp

* Updating makerotc to contain topbar

* Updating daodapp

* Bumping versions after authors has been updated

* Adding webapps to tests

* Enabling all accounts in wallet
 2016-05-21 15:27:55 +02:00
arkpar
ca6c91f591 New sync algorithm 2016-05-19 16:16:11 +02:00
Nikolay Volf
dfac17538f ethcore-db crate (#1097) 
* trait

* implentated, lifetime issue still

* full api

* test mod

* working open

* get/retrieve

* fix warnings and bug

* working serialization of &[u8] parameters

* client attributes

* fix empty payload ser/de

* [ci skip] debug assert out

* extra deserialization test

* extra serialization test

* extra serialization test

* serialization fixes, nupdate rocksdb

* open test working

* result bug & remove some scaffolds

* fix warnings

* more simple tests

* consistent quotes

* get rid of dedicated is_open flag

* hashmap -> btreemap
 2016-05-19 14:36:15 +02:00
Tomasz Drwięga
ef38d9c769 Updating idmanager 2016-05-18 12:19:40 +02:00
Tomasz Drwięga
b9febdda34 Home page 2016-05-18 11:54:15 +02:00
Tomasz Drwięga
361d36f7d6 Webapps details 2016-05-17 16:55:08 +02:00
Tomasz Drwięga
9b9ea93ff7 Bumping clippy & crossbeam 2016-05-17 09:33:01 +02:00
Tomasz Drwięga
2ef6f756d0 Merge branch 'master' into idmanager 
Conflicts:
	webapp/src/apps.rs
	webapp/src/page/mod.rs
	webapp/src/proxypac.rs
	webapp/src/router/mod.rs
 2016-05-16 20:22:19 +02:00
Tomasz Drwięga
6363b0f69f Bumping status&idmanager 2016-05-16 20:10:43 +02:00
Nikolay Volf
4e41cbca81 Moving all Client public API types to separate mod & binary serialization codegen for that mod (#1051) 
* transaction moved

* trash remove

* ids move

* receipt

* tree-route

* blockchain info

* log_entry move

* trace filter moved

* executed & trace moved

* localized trace moved

* block status moved

* build scripts and codegen refs

* Cargo.lock update

* binary for blockstatus, blockchaininfo

* binary for trace

* trace filters binary ser

* binary for log entries & executed

* binary for receipt

* special case for u8 & transaction binary attribute

* resolved remaining issues & error binary serialization

* json-tests util import

* fix warnings

* ids attr

* add missing attributes

* Update build.rs
 2016-05-16 18:33:32 +02:00
Tomasz Drwięga
d94030294a Bumping idmanager version 2016-05-16 13:00:55 +02:00
Marek Kotewicz
9b91444638 comma delimeting multiple cors headers (#1078) 2016-05-14 12:29:26 +01:00
Tomasz Drwięga
72b1b41748 Supporting topbar injection 2016-05-13 18:40:20 +02:00
Tomasz Drwięga
a22f0a0d03 Updating dapp-wallet 2016-05-11 18:10:42 +02:00
Nikolay Volf
16395a820f moving deps to ethcore/hyper and bumping jsonrpc-http-server version 2016-05-10 11:38:21 +03:00
Tomasz Drwięga
7f26b5cbba Updating status page. Bringing back wallet 2016-05-09 14:40:46 +02:00
Nikolay Volf
da6a8b98e2 Merge branch 'master' into syntex-lib-update 
Conflicts:
	Cargo.lock
 2016-05-07 18:23:01 +04:00
Nikolay Volf
2e76def295 update hyper branch mio 2016-05-07 11:22:20 +04:00
Nikolay Volf
d9acbbb027 finalizing deps rearrange 2016-05-06 16:40:24 +04:00
Nikolay Volf
c16a46dca7 all to ethcore 2016-05-06 14:58:37 +04:00
Nikolay Volf
aa6db4e69d placing right versions 2016-05-06 01:54:15 +04:00
Nikolay Volf
a51bc6cd36 bump ipc lib version (#1047) 2016-05-05 10:55:32 +02:00
Tomasz Drwięga
75981ec0ab Updating hyper-mio commit (#1048) 2016-05-05 10:55:06 +02:00
Nikolay Volf
b99825bcac bump lib version (#1046) 2016-05-04 22:45:17 +02:00
Arkadiy Paronyan
4480cf512a Merge pull request #1043 from ethcore/hyper-mio 
Fixing hyper-mio revision
 2016-05-04 15:46:45 +02:00
Tomasz Drwięga
b32e2f9549 Updating locations of webapp stuff (#1040) 2016-05-04 15:37:29 +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
0a49efd018 Fixing hyper-mio revision 2016-05-04 15:10:04 +02:00
Arkadiy Paronyan
8f56b21ca9 Merge pull request #1030 from ethcore/master-version 
Version 1.2
 2016-05-03 10:05:28 +02:00
Tomasz Drwięga
1e117d1ee5 Bumping status page 2016-05-02 16:41:14 +02:00
arkpar
008d009e3e Version 1.2 2016-05-02 15:02:26 +02:00
Tomasz Drwięga
e2465b1eab Bumping clippy & fixing warnings (#1024) 
* Bumping clippy

* Fixing warnings found by clippy
 2016-05-02 13:13:12 +02:00
Tomasz Drwięga
e22e4b9b8b Switching to geth-attach supporting version of rpc core and server (#1022) 2016-04-30 19:41:56 +01:00
Marek Kotewicz
66477a9476 Core tracedb functionality. (#996) 
* fixed encoding 0u8

* simplified if else stmt

* tracedb core

* more comprehensive tracedb tests

* fixed minor review issues

* addresses filter

* fixed typos

* replace malformed with corrupted

* trace switch

* db key is generic and can be made smaller

* smaller tracedb keys

* tracedb version

* fixed ignored tests

* rename Tracedb -> TraceDB

* fixed typos

* proves

* trace only top level calls to builtins to avoid DDoS attacks

* fixed tracedb config switches

* fix comments fat replaced with trace

* vector-addressing scheme for localized traces

* removed comments

* removed first, redundant 0 from trace address

* updated db.trace method

* additional tests for tracedb.trace()
 2016-04-30 16:41:24 +01:00
Tomasz Drwięga
4fe99b7dea Updating status page (#1015) 
* Updating status page

* Bump

* Bumping version of status page
 2016-04-29 19:50:07 +01:00
Tomasz Drwięga
0ab9775561 Disabling wallet (#1017) 
* Disabling wallet

* Fixing compilation
 2016-04-28 20:48:13 +01:00
debris
6cd4724901 cargo update 2016-04-28 10:21:58 +02:00
Marek Kotewicz
aed9c79237 Merge pull request #1011 from ethcore/url-update 
Switching to rust-url@1.0.0
 2016-04-28 10:09:13 +02: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
Tomasz Drwięga
ea4346e945 Switching to rust-url#1.0.0 2016-04-27 22:41:46 +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
940dda885b Updating cargo.lock 2016-04-26 11:20:07 +02:00
Tomusdrw
36104edc63 Merge branch 'master' into rpc-exception-handling 2016-04-25 17:37:55 +02:00
debris
5aaa8e439f updated cargo.lock 2016-04-25 16:42:16 +02:00
Arkadiy Paronyan
1e9b64a786 Merge pull request #993 from ethcore/parityup 
updated parity dependencies
 2016-04-25 10:04:42 +02:00
Nikolay Volf
9a3e6a6135 hypervisor fix 2016-04-25 06:34:11 +03:00
debris
3417b27832 updated parity dependencies 2016-04-24 19:10:56 +02:00
Tomasz Drwięga
8956d7e02b Exception handling in RPC & WebApps 2016-04-23 12:29:12 +02:00
Nikolay Volf
4c5425dbde Merge branch 'master' into binary-serializer 
Conflicts:
	ipc/codegen/src/codegen.rs
 2016-04-22 16:40:16 +03:00
Tomasz Drwięga
26ed38ecc2 Version 0.2.2 of status page 2016-04-21 09:43:42 +02:00
Nikolay Volf
59e18ad659 making this work 2016-04-20 23:05:53 +03:00
Tomasz Drwięga
4b82fc1d1f Bumping status page 2016-04-20 10:07:02 +02:00
Tomasz Drwięga
5086880093 Additional logging for transactions 2016-04-17 18:26:15 +02:00
Arkadiy Paronyan
5547b44e5a Merge pull request #957 from ethcore/webapps-mio 
Using hyper-mio branch in webapps.
 2016-04-17 15:36:23 +02:00
petevine
763d78af87 Update dependencies 2016-04-17 01:50:04 +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
arkpar
d84f382ab8 fixed build 2016-04-15 14:45:49 +02:00
arkpar
e7d8cfb8e0 update nanomsg-sys 2016-04-15 13:56:24 +02:00
Arkadiy Paronyan
b441750cc9 Merge pull request #958 from ethcore/ipc-hypervisor 
IPC hypervisor
 2016-04-15 10:31:19 +02:00
NikVolf
b7798d3869 updating nanomsg-sys 2016-04-15 00:01:20 +03:00
NikVolf
dc7e105ef8 Merge branch 'master' into ipc-hypervisor 2016-04-14 21:57:24 +03:00
Tomasz Drwięga
f81914351d Rewriting webapps to use hyper-mio branch 2016-04-14 20:38:48 +02:00
Tomasz Drwięga
313e77fc3b Bumping jsonrpc-http-server 2016-04-14 19:30:53 +02:00
Tomasz Drwięga
5b2d726a02 Changing cors header to be optional 2016-04-14 14:38:07 +02:00
NikVolf
405e3e2e7d initial setup 2016-04-13 19:03:57 +03:00
Tomasz Drwięga
9892e43c4e Getting rid of iron dependency 2016-04-12 22:44:53 +02:00
Tomasz Drwięga
6b03a3218c Bumping clippy version 2016-04-12 13:51:39 +02:00
NikVolf
1d09844950 Merge branch 'master' into upgrades 2016-04-11 21:43:07 +03:00
debris
dfa8196543 updated dependencies 2016-04-11 13:21:55 +02:00
NikVolf
69add61174 basic upgrade scenario 2016-04-10 16:12:20 +03:00
Tomasz Drwięga
8f16515d82 HTTP Authorization support in router 2016-04-08 15:25:20 +02:00
Tomasz Drwięga
6395095659 Updating version of parity-status 2016-04-07 18:42:51 +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
ed633bd0b7 Adding StatusPage and main page support 2016-04-07 15:14:39 +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
ad37b7fd2a Adding webapps router 2016-04-07 12:10:26 +02:00
Tomasz Drwięga
e3ce5d94e1 Adding webapps crate 2016-04-07 10:49:00 +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
Tomasz Drwięga
e8fa429438 Bumping clippy 2016-04-06 09:53:56 +02:00
debris
f23f35aa13 weekly dependencies update 2016-04-01 12:04:04 +02:00
Gav Wood
63a9fa172c Avoid openssl dep. 2016-03-28 10:25:19 +02:00
Gav Wood
b606fb68cf USD-based pricing of gas. 2016-03-28 00:49:35 +02:00
Gav Wood
0e026ed11f Fix author reporting. num_cpus for JSONRPC threads. 2016-03-22 19:12:17 +01:00
debris
b9623e6c5b improvements to build, updated dependencies, moved rpctest to its own submodule 2016-03-19 23:27:50 +01:00
debris
757f0c9bc4 Merge branch 'master' of github.com:ethcore/parity into ethrpc_test 2016-03-18 18:05:29 +01:00
Tomasz Drwięga
338e5fadb9 Bumping clippy 2016-03-18 10:08:47 +01:00
debris
1f03ae54d6 moved ethcores spec to its own module, added genesis 2016-03-17 15:15:10 +01:00
debris
f92a0c8df2 rpctest executable 2016-03-17 11:50:31 +01:00
Gav Wood
22bc9f6458 Merge pull request #745 from ethcore/ethjson 
json deserialization module
 2016-03-17 11:21:29 +01:00
debris
5e44769f82 Merge branch 'ethjson' into ethrpc_test 2016-03-17 10:56:30 +01:00
debris
d96858d38c proper blockchain json parsing 2016-03-15 18:17:48 +01:00
Nikolay Volf
6d939ddfce updating lock 2016-03-15 13:36:27 +01:00
arkpar
9e7ff2c00e Version 1.1 2016-03-14 01:00:17 +01:00
Tomasz Drwięga
4cf18c728d Fixing sync invalid sync test 2016-03-13 20:53:47 +01:00
Gav Wood
08b9cc2c41 Merge changes from #674 into branch. 2016-03-13 15:29:55 +01:00
Gav Wood
02f43f2e8c Merge branch 'ethminer_crate' 2016-03-13 15:00:47 +01:00
Tomasz Drwięga
dac90992ad Merge branch 'master' into updating_clippy 
Conflicts:
	Cargo.lock
	util/src/journaldb/overlayrecentdb.rs
 2016-03-13 00:20:31 +01:00
arkpar
0b4355d549 rocksdb version bump 2016-03-12 19:03:33 +01:00
Gav Wood
98bae098be Update cargo lock. 2016-03-12 12:10:55 +01:00
Tomasz Drwięga
e10457d235 Bumping clippy 2016-03-12 10:06:50 +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
Tomasz Drwięga
f724cab92d Merge branch 'master' into updating_clippy 
Conflicts:
	ethcore/src/lib.rs
	sync/src/chain.rs
	sync/src/lib.rs
	util/src/keys/store.rs
	util/src/lib.rs
 2016-03-11 19:17:09 +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
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
Tomasz Drwięga
8709dd28f8 Fixing clippy warnings 2016-03-11 10:58:51 +01:00
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.

Conflicts:
	sync/src/transaction_queue.rs
 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