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

1394 Commits

Author SHA1 Message Date
Robert Habermeier
af868a7439 ensure genesis validator set in DB 2017-04-19 15:35:12 +02:00
Robert Habermeier
a278dd5a0a store epoch transition proofs in DB 2017-04-19 14:58:19 +02:00
Tomasz Drwięga
ea09aa584d WebSockets RPC server (#5425) 
* Basic WS server.

* CLI for WS server.

* Bump jsonrpc

* Fixing test.
 2017-04-13 16:32:07 +02:00
GitLab Build Bot
1e6674f804 [ci skip] js-precompiled 20170413-083353 2017-04-13 08:37:35 +00:00
GitLab Build Bot
d99f1e5f1f [ci skip] js-precompiled 20170412-114838 2017-04-12 11:52:33 +00:00
GitLab Build Bot
a0d83537e5 [ci skip] js-precompiled 20170412-104510 2017-04-12 10:48:49 +00:00
GitLab Build Bot
e84d03f31d [ci skip] js-precompiled 20170411-150514 2017-04-11 15:08:42 +00:00
Marek Kotewicz
4f8e61dce9 easy to use conversion from and to string for ethstore::Crypto (#5437) 
* easy to use conversion from and to string for ethstore::Crypto

* ethstore uses tempdir instead of devtools

* ethstore does not depend on ethcore-util
 2017-04-11 10:24:56 +02:00
GitLab Build Bot
a2bec1edb4 [ci skip] js-precompiled 20170410-094150 2017-04-10 09:45:12 +00:00
keorn
20d4e7139f Add CIDv0 RPC (#5414) 
* add cid rpc

* add light

* clean up
 2017-04-08 13:35:23 +02:00
GitLab Build Bot
bca0c6c172 [ci skip] js-precompiled 20170408-095429 2017-04-08 09:57:43 +00:00
Svyatoslav Nikolsky
93a6047912 Fixing secretstore TODOs - part 1 (#5386) 
* ECDKG protocol prototype

* added test for enc/dec math

* get rid of decryption_session

* added licenses

* fix after merge

* get rid of unused serde dependency

* doc

* decryption session [without commutative enc]

* failed_dec_session

* fixed tests

* added commen

* added more decryption session tests

* helper to localize an issue

* more computations to localize error

* decryption_session::SessionParams

* added tests for EC math to localize problem

* secretstore network transport

* encryption_session_works_over_network

* network errors processing

* connecting to KeyServer

* licenses

* get rid of debug println-s

* fixed secretstore args

* encryption results are stored in KS database

* decryption protocol works over network

* enc/dec Session traits

* fixing warnings

* fix after merge

* on-chain ACL checker proto

* fixed compilation

* fixed compilation

* finally fixed <odd>-of-N-scheme

* temporary commented test

* 1-of-N works in math

* scheme 1-of-N works

* updated AclStorage with real contract ABI

* remove unnecessary unsafety

* fixed grumbles

* wakeup on access denied

* encrypt secretstore messages

* 'shadow' decryption

* fix grumbles

* lost files

* secretstore cli-options

* decryption seccion when ACL check failed on master

* disallow regenerating key for existing document

* removed obsolete TODO

* fix after merge

* switched to tokio_io

* fix after merge

* fix after merge

* fix after merge

* fix after merge

* fix after merge

* fixed test

* fix after merge
 2017-04-08 11:26:16 +02:00
GitLab Build Bot
5ebd38f1d6 [ci skip] js-precompiled 20170405-145308 2017-04-05 14:58:00 +00:00
Robert Habermeier
8486e79cad Merge pull request #5002 from paritytech/lightcli 
Quick'n'dirty CLI for the light client
 2017-04-05 13:50:17 +02:00
GitLab Build Bot
8d0fde6f60 [ci skip] js-precompiled 20170405-090226 2017-04-05 09:06:09 +00:00
Svyatoslav Nikolsky
abec06f50c On-chain ACL checker for secretstore (#5015) 
* ECDKG protocol prototype

* added test for enc/dec math

* get rid of decryption_session

* added licenses

* fix after merge

* get rid of unused serde dependency

* doc

* decryption session [without commutative enc]

* failed_dec_session

* fixed tests

* added commen

* added more decryption session tests

* helper to localize an issue

* more computations to localize error

* decryption_session::SessionParams

* added tests for EC math to localize problem

* secretstore network transport

* encryption_session_works_over_network

* network errors processing

* connecting to KeyServer

* licenses

* get rid of debug println-s

* fixed secretstore args

* encryption results are stored in KS database

* decryption protocol works over network

* enc/dec Session traits

* fixing warnings

* fix after merge

* on-chain ACL checker proto

* fixed compilation

* fixed compilation

* finally fixed <odd>-of-N-scheme

* temporary commented test

* 1-of-N works in math

* scheme 1-of-N works

* updated AclStorage with real contract ABI

* remove unnecessary unsafety

* fixed grumbles

* wakeup on access denied

* fix after merge

* fix after merge

* moved contract to native-contracts lib
 2017-04-03 17:46:51 +02:00
GitLab Build Bot
ee4f9da385 [ci skip] js-precompiled 20170403-112007 2017-04-03 11:24:51 +00:00
Robert Habermeier
394040e22c Merge branch 'master' into lightcli 2017-04-03 12:44:52 +02:00
GitLab Build Bot
0a90f235de [ci skip] js-precompiled 20170403-103604 2017-04-03 10:39:53 +00:00
Svyatoslav Nikolsky
c0c06fdc53 Secretstore over network (#4974) 
* ECDKG protocol prototype

* added test for enc/dec math

* get rid of decryption_session

* added licenses

* fix after merge

* get rid of unused serde dependency

* doc

* decryption session [without commutative enc]

* failed_dec_session

* fixed tests

* added commen

* added more decryption session tests

* helper to localize an issue

* more computations to localize error

* decryption_session::SessionParams

* added tests for EC math to localize problem

* secretstore network transport

* encryption_session_works_over_network

* network errors processing

* connecting to KeyServer

* licenses

* get rid of debug println-s

* fixed secretstore args

* encryption results are stored in KS database

* decryption protocol works over network

* enc/dec Session traits

* fixing warnings

* fix after merge

* finally fixed <odd>-of-N-scheme

* temporary commented test

* 1-of-N works in math

* scheme 1-of-N works

* remove unnecessary unsafety

* fixed grumbles

* fix grumbles

* lost files
 2017-04-03 11:13:51 +02:00
Tomasz Drwięga
2df4532d50 Dapps and RPC server merge (#5365) 
* Dapps server as a middleware.

* Dapps RPC - Work in Progress

* Merging Dapps and RPC server.

* Fast HTTP server configuration.

* Bump jsonrpc

* Fixing test target

* Re-implementing commented-out tests.
 2017-04-03 10:27:37 +02:00
Robert Habermeier
c9c8f920d2 Futures-based native wrappers for contract ABIs (#5341) 
* initial native contract generator

* get generated code compiling

* unit tests for type codegen

* autogenerate registry contract

* native_contracts entry for registry

* service_transaction_checker

* fixed indentation
 2017-04-03 09:40:18 +02:00
Robert Habermeier
3eece20967 Merge branch 'master' into lightcli 2017-04-03 08:58:20 +02:00
Robert Habermeier
21e21f1e02 Merge pull request #5337 from paritytech/kovan-receipt-fix 
Kovan warp sync fixed
 2017-04-02 18:26:49 +02:00
Tomasz Drwięga
83fea78d38 Wordlist from crate (#5331) 2017-04-01 13:26:44 +07:00
NikVolf
a529427bc9 bump bn lib 2017-03-31 17:38:31 +03:00
NikVolf
3d2e9efb1e P1, P2 definition 2017-03-31 17:38:30 +03:00
Robert Habermeier
d146ae7275 Merge pull request #4999 from paritytech/eip-213 
EIP-213 (bn128 curve operations)
 2017-03-31 14:54:07 +02:00
arkpar
3915943f57 Kovan warp sync fixed 2017-03-30 13:13:43 +02:00
GitLab Build Bot
93ee2a9b64 [ci skip] js-precompiled 20170329-145217 2017-03-29 14:55:09 +00:00
GitLab Build Bot
858c974440 [ci skip] js-precompiled 20170329-134148 2017-03-29 13:44:40 +00:00
Tomasz Drwięga
d2394d3ac3 Updating paths to repos. (#5330) 
* Updating paths to repos.

* Updating rotor and libusb

* Fixing other occurrences
 2017-03-29 15:17:27 +02:00
GitLab Build Bot
7134b44f5b [ci skip] js-precompiled 20170328-172957 2017-03-28 17:32:58 +00:00
Marek Kotewicz
64c098627e updating dependencies (#5028) 
* updated docopt, env_logger, semver and regex crates

* updated parking_lot to 0.4

* fixed compiling on linux

* updated igd to 0.6

* updated jsonrpc

* fixed regex related compiler error on linux
 2017-03-28 19:06:08 +02:00
GitLab Build Bot
843d95966e [ci skip] js-precompiled 20170328-125352 2017-03-28 12:56:58 +00:00
GitLab Build Bot
e28c477075 [ci skip] js-precompiled 20170328-094309 2017-03-28 09:46:03 +00:00
GitLab Build Bot
7039eaf995 [ci skip] js-precompiled 20170328-065931 2017-03-28 07:02:31 +00:00
GitLab Build Bot
d6110d7332 [ci skip] js-precompiled 20170327-200527 2017-03-27 20:08:17 +00:00
GitLab Build Bot
6d5bfcfe44 [ci skip] js-precompiled 20170327-161452 2017-03-27 16:17:42 +00:00
GitLab Build Bot
f5bce0cd9e [ci skip] js-precompiled 20170327-155051 2017-03-27 15:53:33 +00:00
NikVolf
efe0f8449c Merge remote-tracking branch 'origin/master' into eip-213 2017-03-27 18:18:22 +03:00
Robert Habermeier
1ca1a4b1cc Merge pull request #5019 from paritytech/snapshot-v2 
Fine grained snapshot chunking
 2017-03-27 16:57:02 +02:00
GitLab Build Bot
90746bd8c9 [ci skip] js-precompiled 20170327-144027 2017-03-27 14:43:26 +00:00
GitLab Build Bot
7707f7557a [ci skip] js-precompiled 20170327-102018 2017-03-27 10:23:02 +00:00
GitLab Build Bot
9e02271a68 [ci skip] js-precompiled 20170327-100522 2017-03-27 10:08:02 +00:00
arkpar
4ef89b5ccb Fine grained snapshot chunking 2017-03-25 13:22:25 +01:00
Robert Habermeier
a78068cbe9 queue culling and informant 2017-03-23 22:20:00 +01:00
GitLab Build Bot
9efab789aa [ci skip] js-precompiled 20170323-150743 2017-03-23 15:10:28 +00:00
GitLab Build Bot
35a43a1e82 [ci skip] js-precompiled 20170323-150033 2017-03-23 15:03:35 +00:00
Robert Habermeier
da837fa9d8 Merge branch 'master' into lightcli 2017-03-23 14:12:42 +01:00
Arkadiy Paronyan
f5ea47a7b2 Various installer and tray apps fixes (#4970) 
* Mac tray app fixes

* Windows restarting fixed
 2017-03-23 13:25:31 +01:00
GitLab Build Bot
b931a225ba [ci skip] js-precompiled 20170323-093322 2017-03-23 09:36:34 +00:00
Robert Habermeier
0abbd7ac97 Merge branch 'pip-msg' into lightcli 2017-03-22 22:08:39 +01:00
GitLab Build Bot
41f66f33d5 [ci skip] js-precompiled 20170322-161945 2017-03-22 16:22:41 +00:00
GitLab Build Bot
5255b72f67 [ci skip] js-precompiled 20170322-160703 2017-03-22 16:10:12 +00:00
NikVolf
2de67538a2 updating deps 2017-03-22 18:07:41 +03:00
NikVolf
3e7dc57289 some tests for simple cases 2017-03-22 15:41:32 +03:00
GitLab Build Bot
b6f9cf4ba7 [ci skip] js-precompiled 20170322-112932 2017-03-22 11:32:23 +00:00
GitLab Build Bot
07ee7a341b [ci skip] js-precompiled 20170322-111524 2017-03-22 11:18:36 +00:00
GitLab Build Bot
b725829bfd [ci skip] js-precompiled 20170322-095443 2017-03-22 09:57:28 +00:00
Tomasz Drwięga
7e87e9e8ad Updating JSON-RPC crates (#4934) 
* New version of jsonrpc.

* Better invalid encoding messages

* Fixing deprecated methods of tokio_core

* Using dedicated branch for jsonrpc

* Bump
 2017-03-22 07:02:14 +01:00
Marek Kotewicz
d530cc86f3 splitting part of util into smaller crates (#4956) 
* split path module from util

* moved RotatingLogger from util to logger crate

* fix tests

* fix tests

* use only one version of ansi_term crate
 2017-03-22 06:23:40 +01:00
NikVolf
5e34235a36 initial, fallable built-ins 2017-03-22 04:01:46 +03:00
GitLab Build Bot
63f1ca9243 [ci skip] js-precompiled 20170321-204617 2017-03-21 20:48:59 +00:00
Tomasz Drwięga
498d5c0660 Updating syntex et al (#4983) 
* Migrating to new syntex

* Updating to latest syntex

* Another fix for nightly
 2017-03-21 23:26:05 +03:00
Robert Habermeier
384aeda645 Merge branch 'pip-msg' into lightcli 2017-03-21 21:15:24 +01:00
Robert Habermeier
7ad36ee36c Merge remote-tracking branch 'upstream/new-jsonrpc' into pip-msg 2017-03-21 21:15:06 +01:00
Robert Habermeier
e99884d0c0 Merge branch 'master' into pip-msg 2017-03-21 21:05:01 +01:00
Robert Habermeier
bc9c1d4824 use a database in ethcore-light 2017-03-21 20:57:13 +01:00
Robert Habermeier
797a3e1cd9 EIP198 and built-in activation (#4926) 
* EIP198 and built-in activation

* address review
 2017-03-21 19:36:38 +03:00
GitLab Build Bot
3687a7c717 [ci skip] js-precompiled 20170321-162716 2017-03-21 16:30:00 +00:00
GitLab Build Bot
1a6f23ad2b [ci skip] js-precompiled 20170321-145513 2017-03-21 14:58:06 +00:00
Robert Habermeier
fe52e969b6 Merge branch 'master' into pip-msg 2017-03-21 15:24:47 +01:00
GitLab Build Bot
213f61e826 [ci skip] js-precompiled 20170321-131503 2017-03-21 13:17:48 +00:00
Tomasz Drwięga
958a8f66a0
Merge branch 'master' into new-jsonrpc 2017-03-21 09:35:50 +01:00
Tomasz Drwięga
badb3729c9 Changing Mutex into RwLock for transaction queue (#4951) 
* Changing Mutex into RwLock for transaction queue

* Fixing merge

* little fix
 2017-03-20 19:15:02 +01:00
Marek Kotewicz
a555686bcd rlp serialization refactor (#4873) 
* fixed naming of rlp modules

* RlpStream cleanup

* appending short rlp lists (0...55 bytes) is 25% faster

* RlpStream does not use bytes module, nor trait Stream

* removed unused code from rlp module

* compiling ethcore-util with new rlp serialization

* compiling parity with new rlp serialization

* fixed compiling ethcore-light with new rlp serialization

* fixed compiling ethsync with new rlp serialization

* removed redundant comment, print

* removed redundant double-space

* replace usage of WriteBytesExt with ByteOrder
 2017-03-20 19:14:29 +01:00
Arkadiy Paronyan
16860c3f79 Bump nanomsg (#4965) 2017-03-20 16:03:16 +01:00
Tomasz Drwięga
1d87f24715
Bump 2017-03-20 12:06:42 +01:00
Tomasz Drwięga
6fa9393a25
Merge branch 'master' into new-jsonrpc 2017-03-20 10:30:53 +01:00
GitLab Build Bot
99c247fe9f [ci skip] js-precompiled 20170319-171327 2017-03-19 17:16:05 +00:00
Robert Habermeier
8be41ad946 Merge branch 'master' into pip-msg 2017-03-17 14:13:10 +01:00
arkpar
7e9936a3cd bump nanomsg 2017-03-17 14:10:09 +01:00
Tomasz Drwięga
8c98ddb843
Updating nanomsg 2017-03-17 13:47:05 +01:00
Tomasz Drwięga
0c051fb78e
Bumping multihash and libc 2017-03-17 13:20:10 +01:00
Tomasz Drwięga
c13f01c4f9
Using dedicated branch for jsonrpc 2017-03-17 10:13:47 +01:00
Robert Habermeier
cbb9314531 use PIP messages in on_demand, old API 2017-03-16 20:23:59 +01:00
Tomasz Drwięga
44052e7d8d
Merge branch 'master' into new-jsonrpc 2017-03-16 16:04:30 +01:00
Tomasz Drwięga
579cff478d
Fixing deprecated methods of tokio_core 2017-03-16 15:48:08 +01:00
GitLab Build Bot
f84fcfee04 [ci skip] js-precompiled 20170316-124008 2017-03-16 12:42:56 +00:00
Tomasz Drwięga
491eeb9878
Better invalid encoding messages 2017-03-16 12:48:51 +01:00
GitLab Build Bot
790bd87bc3 [ci skip] js-precompiled 20170315-182430 2017-03-15 18:27:17 +00:00
GitLab Build Bot
8d16cdf12f [ci skip] js-precompiled 20170315-155713 2017-03-15 16:00:18 +00:00
Marek Kotewicz
5f103ee33d Detect rust compiler version in Parity build script, closes 4742 (#4907) 
* Detect rust compiler version in Parity build script, closes #4742

* updated required compiler version message

* fixed typo
 2017-03-15 14:03:11 +01:00
GitLab Build Bot
240ea8a136 [ci skip] js-precompiled 20170315-124802 2017-03-15 12:50:47 +00:00
Marek Kotewicz
b27138e93f Updated gcc crate to remove one of duplicated dependencies (#4909) 2017-03-15 12:13:19 +01:00
GitLab Build Bot
43d391501e [ci skip] js-precompiled 20170314-110423 2017-03-14 11:06:46 +00:00
Tomasz Drwięga
b51d7e9f6a
Merge branch 'master' into new-jsonrpc 2017-03-14 11:48:09 +01:00
GitLab Build Bot
84fcefba1b [ci skip] js-precompiled 20170314-103037 2017-03-14 10:32:58 +00:00
Tomasz Drwięga
8bf5be0cc4
New version of jsonrpc. 2017-03-13 15:49:52 +01:00
GitLab Build Bot
29bed6ff69 [ci skip] js-precompiled 20170313-122643 2017-03-13 12:32:24 +00:00
Gav Wood
3041c95408 Chain-selection from UI (#4859) 
* First little bits for chain-selection.

* Provide RPCs and get settings through to user defaults.

* Hasty stash.

* Fix updater accidentally redownloading.

* Finish up.

* Add JS tests.

* Hypervisor should never run a binary modified before itself.

* Style.

* Help tweak.

* Fix test compile.

* Fix JS test

* Build fix for tests.

* Revert default chain name

* Another test

* Use spec name via client.

* Fix mock up.

* whitespace

[ci:skip]

* whitespace

[ci:skip]

* remove exit/restart endpoints.
 2017-03-13 12:10:53 +01:00
GitLab Build Bot
2ee8f07432 [ci skip] js-precompiled 20170312-211107 2017-03-12 21:17:02 +00:00
Marek Kotewicz
5d5e45ec0d Merge pull request #4870 from ethcore/jsonrpc-dep 
Reference JSON-RPC more changes-friendly
 2017-03-11 18:41:11 +01:00
GitLab Build Bot
79afe2d7fb [ci skip] js-precompiled 20170311-150617 2017-03-11 15:12:20 +00:00
NikVolf
429e1c7a27 bind to branch 2017-03-11 17:44:39 +03:00
GitLab Build Bot
b0264a6af2 [ci skip] js-precompiled 20170310-184737 2017-03-10 18:53:39 +00:00
GitLab Build Bot
45414e6cfe [ci skip] js-precompiled 20170310-151240 2017-03-10 15:18:28 +00:00
GitLab Build Bot
e5defeaada [ci skip] js-precompiled 20170310-123911 2017-03-10 12:45:42 +00:00
GitLab Build Bot
e15f60b819 [ci skip] js-precompiled 20170310-111654 2017-03-10 11:25:12 +00:00
GitLab Build Bot
5e54c0fa91 [ci skip] js-precompiled 20170309-190359 2017-03-09 19:09:36 +00:00
GitLab Build Bot
b196635816 [ci skip] js-precompiled 20170309-160350 2017-03-09 16:09:29 +00:00
GitLab Build Bot
5bbcf0482b [ci skip] js-precompiled 20170308-122756 2017-03-08 12:38:37 +00:00
GitLab Build Bot
81b57a57c7 [ci skip] js-precompiled 20170307-211202 2017-03-07 21:17:27 +00:00
GitLab Build Bot
7638b2c9e8 [ci skip] js-precompiled 20170307-195934 2017-03-07 20:06:34 +00:00
Arkadiy Paronyan
ae3f85bd5b v1.7 (#4730) 2017-03-07 17:29:27 +01:00
GitLab Build Bot
24aac8fa89 [ci skip] js-precompiled 20170306-142052 2017-03-06 14:26:42 +00:00
GitLab Build Bot
0de8771007 [ci skip] js-precompiled 20170306-093959 2017-03-06 09:45:14 +00:00
GitLab Build Bot
a02063f348 [ci skip] js-precompiled 20170306-080251 2017-03-06 08:08:05 +00:00
GitLab Build Bot
cabf251280 [ci skip] js-precompiled 20170305-093606 2017-03-05 09:41:41 +00:00
GitLab Build Bot
2e0d005487 [ci skip] js-precompiled 20170303-190450 2017-03-03 19:10:54 +00:00
Tomasz Drwięga
edecd951ba Revert last hyper "fix" (#4752) 2017-03-03 19:52:08 +01:00
GitLab Build Bot
ead40a8b97 [ci skip] js-precompiled 20170303-140210 2017-03-03 14:07:22 +00:00
GitLab Build Bot
4024100e74 [ci skip] js-precompiled 20170303-134752 2017-03-03 13:53:17 +00:00
GitLab Build Bot
fd19f6f449 [ci skip] js-precompiled 20170303-130222 2017-03-03 13:07:34 +00:00
GitLab Build Bot
0432b8410c [ci skip] js-precompiled 20170302-230110 2017-03-02 23:07:35 +00:00
GitLab Build Bot
96d74543fc [ci skip] js-precompiled 20170302-204757 2017-03-02 20:52:50 +00:00
GitLab Build Bot
eb37d26154 [ci skip] js-precompiled 20170302-143357 2017-03-02 14:38:43 +00:00
GitLab Build Bot
5fef950503 [ci skip] js-precompiled 20170302-123938 2017-03-02 12:44:34 +00:00
Svyatoslav Nikolsky
cb168828a2 EC math functions (#4696) 
* EC math functions

* moved math funs -> Secret methods
 2017-03-02 12:27:41 +01:00
GitLab Build Bot
54aee9db9b [ci skip] js-precompiled 20170228-153914 2017-02-28 15:44:30 +00:00
GitLab Build Bot
ea877cb91e [ci skip] js-precompiled 20170228-132909 2017-02-28 13:35:38 +00:00
GitLab Build Bot
689fe9c689 [ci skip] js-precompiled 20170227-213540 2017-02-27 21:40:33 +00:00
GitLab Build Bot
8bee714452 [ci skip] js-precompiled 20170224-171258 2017-02-24 17:18:20 +00:00
GitLab Build Bot
af45d05aee [ci skip] js-precompiled 20170224-142855 2017-02-24 14:33:38 +00:00
GitLab Build Bot
afecf5b148 [ci skip] js-precompiled 20170224-134503 2017-02-24 13:50:10 +00:00
GitLab Build Bot
5817cfdf41 [ci skip] js-precompiled 20170224-115159 2017-02-24 11:58:15 +00:00
Maciej Hirsz
f97e775498 More CLI settings for IPFS API (#4608) 
* TEMP: Bind to 0.0.0.0, don't check Origin

* More CLI options for IPFS

* CORS and Hosts filtering

* Allow current interface as origin

* Correctly handle CORS settings

* fix grumbles
 2017-02-24 10:32:42 +01:00
GitLab Build Bot
c7b3b9a565 [ci skip] js-precompiled 20170224-084932 2017-02-24 08:54:34 +00:00
Tomasz Drwięga
daf36739ce Bump hyper versions (#4645) 2017-02-24 09:22:29 +01:00
Robert Habermeier
3f78c945d7 Merge pull request #4594 from ethcore/lightrpc 
Remainder of RPC APIs implemented for the light client
 2017-02-23 19:58:27 +01:00
GitLab Build Bot
496a6dcfa0 [ci skip] js-precompiled 20170223-141355 2017-02-23 14:21:06 +00:00
GitLab Build Bot
f3b5e2074b [ci skip] js-precompiled 20170222-165052 2017-02-22 16:55:55 +00:00
GitLab Build Bot
cb3c6b1bec [ci skip] js-precompiled 20170222-150433 2017-02-22 15:09:15 +00:00
GitLab Build Bot
3df1adc3f5 [ci skip] js-precompiled 20170222-143551 2017-02-22 14:40:40 +00:00
GitLab Build Bot
49675483c3 [ci skip] js-precompiled 20170222-095134 2017-02-22 09:56:05 +00:00
GitLab Build Bot
80155ef93a [ci skip] js-precompiled 20170221-120741 2017-02-21 12:12:14 +00:00
Robert Habermeier
d8b1cfe082 Merge branch 'master' into lightrpc 2017-02-20 18:01:29 +01:00
Robert Habermeier
62b340f2b9 Save pending local transactions in the database (#4566) 
* Create new column family for local node info

* remove DBTransaction::new reliance on DB

* KeyValueDB trait

* InMemory KeyValueDB implementation

* journaldb generic over KVDB

* make most of `ethcore` generic over KVDB

* fix json tests compilation

* get all tests compiling

* implement local store (just for transactions)

* finish local store API, test

* put everything into place

* better test for skipping bad transactions

* fix warning

* update local store every 15 minutes

* remove superfluous `{}`s
 2017-02-20 17:21:55 +01:00
GitLab Build Bot
00351374e4 [ci skip] js-precompiled 20170220-160616 2017-02-20 16:12:01 +00:00
maciejhirsz
649cedd818 Updated Cargo.lock 2017-02-20 16:42:09 +01:00
Svyatoslav Nikolsky
b9665c7cfe Secret store - initial version (#4567) 
* initial secret store commit

* various fixes

* license

* (sstore, secstore) -> secretstore

* marked KeyServer trait as IPC-ready

* fixed style

* ignore requests with Origin header

* fixed tests

* fixed Origin header check
 2017-02-20 16:13:21 +01:00
GitLab Build Bot
31f5a1d205 [ci skip] js-precompiled 20170220-124210 2017-02-20 12:48:32 +00:00
GitLab Build Bot
8c9c6744fc [ci skip] js-precompiled 20170217-171830 2017-02-17 17:24:47 +00:00
Robert Habermeier
39237e9d15 Merge pull request #4545 from ethcore/mh-ipfs 
IPFS MVP
 2017-02-17 17:19:56 +01:00
Robert Habermeier
3b023c82b7 fetch gas price corpus from network when needed 2017-02-17 17:08:46 +01:00
Robert Habermeier
7a857a24ae use new histogram/corpus 2017-02-17 16:18:31 +01:00
GitLab Build Bot
062c55d51b [ci skip] js-precompiled 20170216-165434 2017-02-16 17:06:15 +00:00
GitLab Build Bot
5bd1cf352b [ci skip] js-precompiled 20170216-154550 2017-02-16 15:50:43 +00:00
maciejhirsz
c4b4a22203 Rename parity-ipfs to parity-ipfs-api 2017-02-16 14:51:33 +01:00
GitLab Build Bot
39d4e46073 [ci skip] js-precompiled 20170216-125519 2017-02-16 12:59:57 +00:00
maciejhirsz
d005410e1a No .expect on mime types 2017-02-15 18:26:35 +01:00
Tomasz Drwięga
efb95a59be Fixing evmbin compilation and added standard build. (#4561) 2017-02-15 16:58:42 +01:00
GitLab Build Bot
4889cff310 [ci skip] js-precompiled 20170215-135145 2017-02-15 13:56:12 +00:00
GitLab Build Bot
b38a874b18 [ci skip] js-precompiled 20170215-124941 2017-02-15 12:54:04 +00:00
GitLab Build Bot
3218c365e9 [ci skip] js-precompiled 20170215-110429 2017-02-15 11:08:57 +00:00
GitLab Build Bot
812017f9b3 [ci skip] js-precompiled 20170214-215513 2017-02-14 22:00:39 +00:00
Tomasz Drwięga
5369a129ae Signer provenance (#4477) 
* Signer - Tracking Request Provenance

* Basic UI

* Changing messages

* VecDeque::from

* Fix dapps tests

* Addressing UI grumbles
 2017-02-14 22:45:43 +01:00
maciejhirsz
9256aa766b Lock file 2017-02-14 19:58:46 +01:00
maciejhirsz
3c634701dd Squashed 2017-02-14 19:30:37 +01:00
GitLab Build Bot
e9eed5206e [ci skip] js-precompiled 20170214-123602 2017-02-14 12:41:22 +00:00
GitLab Build Bot
fefd53d4f4 [ci skip] js-precompiled 20170214-101112 2017-02-14 10:15:36 +00:00
GitLab Build Bot
dd0ef6b5ec [ci skip] js-precompiled 20170214-073623 2017-02-14 07:40:43 +00:00
Nikolay Volf
78917d728d Bump JSON RPC crates versions (#4530) 
* json rpc bump

* some error message deviations
 2017-02-13 21:34:16 +03:00
Tomasz Drwięga
f1e99ea2e4 Serde 0.9 (#4508) 
* Porting json

* Dapps

* Rpc & Ethstore

* New ethabi

* Last bunch of fixes

* Fixing last test

* Removing build script

* Adding ethcore-ipc-tests back

* Fixing grumbles

* Fixing blockchain tests (inference regression?)
 2017-02-13 18:38:47 +03:00
GitLab Build Bot
a2c6cd8f7b [ci skip] js-precompiled 20170213-125552 2017-02-13 13:00:14 +00:00
GitLab Build Bot
88b91b7e13 [ci skip] js-precompiled 20170210-173450 2017-02-10 17:39:23 +00:00
Robert Habermeier
48ae38eaf9 Merge pull request #4485 from ethcore/lightrpc 
Preparation for Light client RPC
 2017-02-10 17:15:03 +01:00
GitLab Build Bot
51f74f8d80 [ci skip] js-precompiled 20170210-135944 2017-02-10 14:04:00 +00:00
Robert Habermeier
b8881215f1 Merge branch 'master' into lightrpc 2017-02-10 13:47:27 +01:00
Arkadiy Paronyan
8fd694ea47 Fixed a warning and bumbed libusb-sys (#4507) 2017-02-10 12:28:57 +01:00
GitLab Build Bot
d36303365f [ci skip] js-precompiled 20170210-075200 2017-02-10 07:56:35 +00:00
Robert Habermeier
6bf97de9d8 Merge branch 'master' into lightrpc 2017-02-10 02:44:12 +01:00
GitLab Build Bot
cb772acec7 [ci skip] js-precompiled 20170210-001706 2017-02-10 00:22:18 +00:00
Arkadiy Paronyan
a7e6d8727a Ledger wallet support (#4486) 
* Ledger devices support

* structs for RPC types
 2017-02-09 19:07:06 -05:00
GitLab Build Bot
395a44e4a8 [ci skip] js-precompiled 20170209-165020 2017-02-09 16:54:35 +00:00
GitLab Build Bot
2043123db0 [ci skip] js-precompiled 20170209-161356 2017-02-09 16:17:57 +00:00
GitLab Build Bot
c69f515597 [ci skip] js-precompiled 20170209-155632 2017-02-09 16:02:22 +00:00
GitLab Build Bot
1e47133b3f [ci skip] js-precompiled 20170209-143704 2017-02-09 14:41:10 +00:00
Robert Habermeier
0246d5c734 Merge branch 'master' into lightrpc 2017-02-08 19:20:35 +01:00
GitLab Build Bot
68b8724440 [ci skip] js-precompiled 20170208-134350 2017-02-08 13:49:08 +00:00
GitLab Build Bot
428e8361ce [ci skip] js-precompiled 20170207-191009 2017-02-07 19:16:17 +00:00
Robert Habermeier
1fa5b07321 Merge branch 'master' into lightrpc 2017-02-07 17:13:18 +01:00
GitLab Build Bot
d341b49bad [ci skip] js-precompiled 20170207-120734 2017-02-07 12:11:54 +00:00
GitLab Build Bot
1d774835de [ci skip] js-precompiled 20170207-075234 2017-02-07 07:56:44 +00:00
Robert Habermeier
4172a5369c Include total difficulty in CHTs and hide implementation details from consumers (#4428) 
* CHT builder and prover

* use CHT abstraction in provider

* hide CHT internals from header chain

* fix itertools conflict by updating all to 0.5

* cht proof checker, use it in on_demand
 2017-02-06 17:21:35 +01:00
GitLab Build Bot
d7e87dbe19 [ci skip] js-precompiled 20170206-083224 2017-02-06 08:36:28 +00:00
Svyatoslav Nikolsky
2f340a547a Vaults RPCs (#4366) 
* vaults RPCs

* vault.password != vault_account.password

* moved vault RPCs to parityAccounts NS

* parity_listVaults + parity_listOpenedVaults
 2017-02-05 10:17:56 -05:00
Nikolay Volf
e257e4e3bd Ethkey - extended keys (#4377) 
* data structures initial

* hard derivation

* tabs, docs

* more docs

* soft private derivation

* public derivation

* finalize api, fix warnings

* use simple new()

* keypair api

* bump byteorder

* doc tweaks

* remove heavyness from tests

* added test vector infrastructure and examples

* initialization from seed to key pair

* add comment about panic
 2017-02-05 10:17:03 -05:00
GitLab Build Bot
f646ffbe61 [ci skip] js-precompiled 20170205-101133 2017-02-05 10:15:32 +00:00
Robert Habermeier
7c9064c856 Merge branch 'master' into lightrpc 2017-02-04 22:30:20 +01:00
Tomasz Drwięga
248cd5e036 RPC middleware: Informant & Client.keep_alive (#4384) 
* Adding RPC informant structs

* RPC informant

* Middleware counting RPC requests

* Moving client keep_alive to middleware
 2017-02-04 22:18:19 +01:00
Robert Habermeier
484b93abdc Merge branch 'cht-td' into lightrpc 2017-02-04 17:14:47 +01:00
Robert Habermeier
ca11138ce8 fix itertools conflict by updating all to 0.5 2017-02-04 17:07:39 +01:00
GitLab Build Bot
d7b937fe88 [ci skip] js-precompiled 20170204-152807 2017-02-04 15:32:05 +00:00
Jaco Greeff
b4c24d5ab3 Web view with web3.site support (#4313) 
* Web-domain based routing

* Support base32-encoded urls

* Proper support for non-domain based routing

* Handling long domain names

* Switching to web3.site

* Encoding for *.web3.site urls

* Add DappUrlInput component

* Update Web views with store

* Update spec description

* Update spec description

* edited url does not allow in-place store edits

* Fixing dapps access on 127.0.0.1:8180

* Use /web/<hash> urls for iframe

* Redirecting to parity.web3.site

* Disabling the redirection
 2017-02-04 09:52:14 +01:00
GitLab Build Bot
c9d38cac6e [ci skip] js-precompiled 20170203-221154 2017-02-03 22:18:13 +00:00
GitLab Build Bot
a68ca7444e [ci skip] js-precompiled 20170203-191721 2017-02-03 19:22:26 +00:00
GitLab Build Bot
a39324632d [ci skip] js-precompiled 20170203-190642 2017-02-03 19:12:35 +00:00
Robert Habermeier
02142e3a57 Merge branch 'master' into cht-td 2017-02-03 19:56:52 +01:00
Robert Habermeier
e874df5155 hide CHT internals from header chain 2017-02-03 19:50:23 +01:00
Robert Habermeier
9328067eac start eth RPC API for light client 2017-02-03 16:20:43 +01:00
GitLab Build Bot
85e9091b29 [ci skip] js-precompiled 20170203-133154 2017-02-03 13:36:20 +00:00
GitLab Build Bot
d1728cca28 [ci skip] js-precompiled 20170203-131026 2017-02-03 13:16:08 +00:00
Tomasz Drwięga
015425d447 Restarting fetch client every now and then (#4399) 2017-02-02 19:11:28 +01:00
GitLab Build Bot
4961422523 [ci skip] js-precompiled 20170202-163010 2017-02-02 16:33:24 +00:00
GitLab Build Bot
a0ffb3df20 [ci skip] js-precompiled 20170202-150718 2017-02-02 15:11:11 +00:00
GitLab Build Bot
8e82b2f631 [ci skip] js-precompiled 20170202-125420 2017-02-02 12:57:45 +00:00
GitLab Build Bot
3d4545fa91 js-precompiled 20170201-231534 2017-02-01 23:19:04 +00:00
GitLab Build Bot
85f75d39b3 js-precompiled 20170201-225215 2017-02-01 22:55:51 +00:00
GitLab Build Bot
52f40042b0 js-precompiled 20170201-222816 2017-02-01 22:31:43 +00:00
GitLab Build Bot
b8c0d657b4 js-precompiled 20170201-220650 2017-02-01 22:10:13 +00:00
GitLab Build Bot
ffb5ddc08b js-precompiled 20170201-214512 2017-02-01 21:48:38 +00:00
GitLab Build Bot
35e267c4fe js-precompiled 20170201-212208 2017-02-01 21:25:32 +00:00
GitLab Build Bot
43baa461b0 js-precompiled 20170201-205737 2017-02-01 21:01:07 +00:00
GitLab Build Bot
7fae67785c js-precompiled 20170201-203408 2017-02-01 20:37:33 +00:00
GitLab Build Bot
09e933a450 js-precompiled 20170201-200611 2017-02-01 20:09:34 +00:00
GitLab Build Bot
71190f6068 js-precompiled 20170201-194205 2017-02-01 19:45:25 +00:00
GitLab Build Bot
2f299d20e8 js-precompiled 20170201-185153 2017-02-01 18:55:16 +00:00
GitLab Build Bot
bc73416e45 js-precompiled 20170201-182335 2017-02-01 18:27:32 +00:00
GitLab Build Bot
22f0d648c7 js-precompiled 20170201-174728 2017-02-01 17:50:56 +00:00
GitLab Build Bot
6b77d10cac js-precompiled 20170201-172305 2017-02-01 17:26:30 +00:00
GitLab Build Bot
12c1434f09 js-precompiled 20170201-165339 2017-02-01 16:58:21 +00:00
GitLab Build Bot
653bb112bf js-precompiled 20170201-162404 2017-02-01 16:27:37 +00:00
GitLab Build Bot
8e35b2c39a [ci skip] js-precompiled 20170201-152542 2017-02-01 15:29:43 +00:00
GitLab Build Bot
a414729de9 [ci skip] js-precompiled 20170201-142626 2017-02-01 14:29:49 +00:00
GitLab Build Bot
f4a761edb7 [ci skip] js-precompiled 20170201-140028 2017-02-01 14:05:19 +00:00
GitLab Build Bot
867ca0f96c [ci skip] js-precompiled 20170131-163220 2017-01-31 16:35:42 +00:00
GitLab Build Bot
f1995b3fb0 [ci skip] js-precompiled 20170131-161018 2017-01-31 16:13:39 +00:00
GitLab Build Bot
12aadc3e2a [ci skip] js-precompiled 20170131-155752 2017-01-31 16:01:16 +00:00
GitLab Build Bot
983a0e3d0b [ci skip] js-precompiled 20170131-132131 2017-01-31 13:24:45 +00:00
GitLab Build Bot
27d00f6eca [ci skip] js-precompiled 20170131-113939 2017-01-31 11:42:56 +00:00
GitLab Build Bot
b864d0f6ec [ci skip] js-precompiled 20170131-112711 2017-01-31 11:30:36 +00:00
GitLab Build Bot
ee906467ad [ci skip] js-precompiled 20170131-104521 2017-01-31 10:50:22 +00:00
GitLab Build Bot
00c4c71176 [ci skip] js-precompiled 20170130-161417 2017-01-30 16:17:36 +00:00
GitLab Build Bot
4e7b8652c8 [ci skip] js-precompiled 20170130-142718 2017-01-30 14:30:42 +00:00
GitLab Build Bot
5a18ed7c3e [ci skip] js-precompiled 20170130-121240 2017-01-30 12:16:02 +00:00
GitLab Build Bot
f627bef08b [ci skip] js-precompiled 20170130-110455 2017-01-30 11:08:16 +00:00
Svyatoslav Nikolsky
9ac4d83ca3 Initial commit for vaults (#4312) 
* initial commit for vaults

* fixed TODO

* public docs

* vault_file.json now contains enc(pwd hash)

* removed doc
 2017-01-30 13:44:09 +03:00
GitLab Build Bot
b4dab67f83 [ci skip] js-precompiled 20170127-210258 2017-01-27 21:06:16 +00:00
GitLab Build Bot
5246d51a1a [ci skip] js-precompiled 20170127-143849 2017-01-27 14:42:01 +00:00
GitLab Build Bot
e81787da34 [ci skip] js-precompiled 20170127-134933 2017-01-27 13:53:09 +00:00
GitLab Build Bot
da032e950f [ci skip] js-precompiled 20170126-165810 2017-01-26 17:01:54 +00:00
GitLab Build Bot
f5a73ff4c8 [ci skip] js-precompiled 20170126-164625 2017-01-26 16:49:41 +00:00
GitLab Build Bot
3e2d95b272 [ci skip] js-precompiled 20170126-152421 2017-01-26 15:28:00 +00:00
GitLab Build Bot
79481b8ab5 [ci skip] js-precompiled 20170126-082319 2017-01-26 08:26:31 +00:00
GitLab Build Bot
0c913b45b2 [ci skip] js-precompiled 20170125-181524 2017-01-25 18:18:28 +00:00
GitLab Build Bot
33b02febed [ci skip] js-precompiled 20170125-132524 2017-01-25 13:28:44 +00:00
GitLab Build Bot
afa1edbeee [ci skip] js-precompiled 20170125-112240 2017-01-25 11:25:48 +00:00
Nikolay Volf
1acc8031ce Stratum up (#4233) 
* flush work

* flush work

* flush work

* flush work

* generalized notifiers

* general setup with modules

* general setup with modules

* all binded

* catch up with master

* all dependencies injected

* stratum another up

* tcp update

* submitwork routine

* finalize & fix warnings

* merge bugs, review fixes

* merge bugs, review fixes

* new cli mess cleanup

* usage.txt swap

* flush work

* cli adopt

* compilation with new cli sorted

* subid space in json

* serialization issues

* grumbles addressed

* more grumbles

* remove last_work note for now

* fix compilation

* fix tests

* merge bugs

* no obliged ipc

* moving notifiers

* no optional feature now

* refactored again

* working on tests

* refactor to new tcp/ip

* stratum lib ok

* ethcore crate ok

* wip on tests

* final test working

* fix warnings, \n-terminated response

* new compatibility

* re-pushing work once anybody submitted

* various review and general fixes

* reviewe fixes

* remove redundant notifier

* one symbol -> huge bug

* ensure write lock isn't held when calling handlers

* extern declarations moved

* options to stratum mod, SocketAddr strongly-typed instantiation

* Minor style fix.

* Whitespace and phrasing

* Whitespace
 2017-01-25 11:03:36 +01:00
GitLab Build Bot
5e18daf29e [ci skip] js-precompiled 20170124-211147 2017-01-24 21:15:10 +00:00
GitLab Build Bot
b0e7cd5c9d [ci skip] js-precompiled 20170124-194135 2017-01-24 19:44:54 +00:00
GitLab Build Bot
7b7b552ed4 [ci skip] js-precompiled 20170124-162740 2017-01-24 16:30:59 +00:00
GitLab Build Bot
5b2dd8deb2 [ci skip] js-precompiled 20170124-152454 2017-01-24 15:28:00 +00:00
GitLab Build Bot
153f2ca2f2 [ci skip] js-precompiled 20170124-151134 2017-01-24 15:14:38 +00:00
GitLab Build Bot
7aafa8a7ec [ci skip] js-precompiled 20170124-105551 2017-01-24 10:59:12 +00:00
GitLab Build Bot
b6575cb230 [ci skip] js-precompiled 20170123-184530 2017-01-23 18:48:32 +00:00
GitLab Build Bot
1c6e9bc772 [ci skip] js-precompiled 20170123-164245 2017-01-23 16:47:50 +00:00
GitLab Build Bot
f4149cc089 [ci skip] js-precompiled 20170123-160350 2017-01-23 16:06:59 +00:00
GitLab Build Bot
5fce415ac3 [ci skip] js-precompiled 20170123-155126 2017-01-23 15:54:58 +00:00
GitLab Build Bot
512612424c [ci skip] js-precompiled 20170123-153219 2017-01-23 15:35:49 +00:00
GitLab Build Bot
9994ca93f7 [ci skip] js-precompiled 20170123-124637 2017-01-23 12:49:32 +00:00
GitLab Build Bot
cff64233b4 [ci skip] js-precompiled 20170123-121125 2017-01-23 12:14:45 +00:00
GitLab Build Bot
220084d77d [ci skip] js-precompiled 20170121-134923 2017-01-21 13:53:01 +00:00
GitLab Build Bot
ebe9072836 [ci skip] js-precompiled 20170120-185430 2017-01-20 18:57:26 +00:00
GitLab Build Bot
6c5167ebb3 [ci skip] js-precompiled 20170120-184412 2017-01-20 18:47:09 +00:00
GitLab Build Bot
9ea7ec0252 [ci skip] js-precompiled 20170120-153650 2017-01-20 15:39:49 +00:00
GitLab Build Bot
888ce1ca3d [ci skip] js-precompiled 20170120-145411 2017-01-20 14:57:00 +00:00
GitLab Build Bot
685c630b4d [ci skip] js-precompiled 20170120-091224 2017-01-20 09:15:30 +00:00
GitLab Build Bot
6db17eb908 [ci skip] js-precompiled 20170119-131530 2017-01-19 13:19:21 +00:00
GitLab Build Bot
ab073efbd9 [ci skip] js-precompiled 20170119-100631 2017-01-19 10:09:51 +00:00
GitLab Build Bot
a6365577e5 [ci skip] js-precompiled 20170119-093724 2017-01-19 09:41:00 +00:00
GitLab Build Bot
f9509cc8b8 [ci skip] js-precompiled 20170119-075016 2017-01-19 07:53:32 +00:00
GitLab Build Bot
779440450f [ci skip] js-precompiled 20170118-121219 2017-01-18 12:15:38 +00:00
Arkadiy Paronyan
d608ad2011 jsonr rpc bump for IPC fix (#4200) 2017-01-18 12:54:35 +01:00
GitLab Build Bot
1cb37e53c0 [ci skip] js-precompiled 20170118-114926 2017-01-18 11:52:24 +00:00
GitLab Build Bot
6339b3c88a [ci skip] js-precompiled 20170117-102646 2017-01-17 10:34:02 +00:00
GitLab Build Bot
aee70c4f16 [ci skip] js-precompiled 20170116-033453 2017-01-16 03:37:54 +00:00
GitLab Build Bot
d6ed42bff5 [ci skip] js-precompiled 20170115-041925 2017-01-15 04:22:19 +00:00
GitLab Build Bot
4b85e3ee57 [ci skip] js-precompiled 20170114-041818 2017-01-14 04:21:24 +00:00
GitLab Build Bot
af00986456 [ci skip] js-precompiled 20170113-172058 2017-01-13 17:23:57 +00:00
Tomasz Drwięga
d0cebc3982 Bumping hyper (#4167) 2017-01-13 16:30:49 +01:00
GitLab Build Bot
7611bbd3ee [ci skip] js-precompiled 20170113-145733 2017-01-13 15:00:41 +00:00
Robert Habermeier
f0eab337d8 Merge pull request #4036 from ethcore/on-demand-les-request 
On demand LES request
 2017-01-13 14:36:48 +01:00
GitLab Build Bot
f3717b96ff [ci skip] js-precompiled 20170113-090039 2017-01-13 09:03:30 +00:00
Arkadiy Paronyan
cfb6dd2ea8 Optimized hash lookups (#4144) 
* Optimize hash comparison

* Use libc
 2017-01-13 08:52:23 +00:00
Tomasz Drwięga
e11353f94c UnverifiedTransaction type (#4134) 
* Introducing ValidSignedTransaction

* Verifiying transactions in engines

* Widening use of VerifiedSignedTransaction

* Renaming Transactions

* Uncommenting banning queue & Fixing tests

* Fixing json tests

* Fixing pre-homestead test

* Fixing imports

* Addressing grumbles

* Fixing test
 2017-01-13 08:51:36 +00:00
GitLab Build Bot
3d06456fa5 [ci skip] js-precompiled 20170113-042838 2017-01-13 04:31:31 +00:00
GitLab Build Bot
54b06cea16 [ci skip] js-precompiled 20170112-222827 2017-01-12 22:31:32 +00:00
GitLab Build Bot
887e5f730e [ci skip] js-precompiled 20170112-142354 2017-01-12 14:26:49 +00:00