maciejhirsz
516c41c1ee
Move hints to constants
2017-01-04 14:48:32 +01:00
maciejhirsz
4b1b67bfeb
Analog error messages for unlocking accounts
2017-01-04 14:05:32 +01:00
maciejhirsz
8ca0e09ffc
Better error messages for PoA chains
2017-01-04 12:50:50 +01:00
Robert Habermeier
29e8b2a3b8
parse testnet chain as ropsten
2016-12-30 15:52:49 +01:00
Robert Habermeier
e6324a83f1
Merge branch 'master' into lightsync
2016-12-28 15:53:11 +01:00
Robert Habermeier
fe1f542c4f
Owning views of blockchain data ( #3982 )
...
* owning views of blockchain data
* port blockchain and client traits to owning views
* fix ethcore tests
* use strong headers and bodies in ethcore_light
* port ethsync to use owning views
* port rpc to owning views
* port parity informant and blockchain export
2016-12-28 12:44:51 +00:00
Tomasz Drwięga
bc3dacc952
Fetch tests (first batch) ( #3977 )
...
* Customizable fetch
* Some basic Fetch tests
2016-12-27 15:38:55 +00:00
Robert Habermeier
8125b5690c
Port try
macro to new ?
operator. ( #3962 )
...
* initial untry sweep
* restore try in ipc codegen, fix inference
* change a few missed try instances
2016-12-27 12:53:56 +01:00
Tomasz Drwięga
c7c309d152
Web Based Dapps ( #3956 )
...
* Dapps web
Conflicts:
dapps/src/apps/fetcher.rs
dapps/src/handlers/fetch.rs
* Rewriting fetch
* Parity-wide fetch service
* Obey the limits and support cancellation.
* Removing temporary files.
* Actually use Fetch for dapps
* Re-implementing file fetching to avoid temporary files.
* Serde to 0.8.19
* Fixing content & dapps fetch
* Serving web content and injecting scripts
* Don't wait for old content, start a new download
* Supporting timeouts and query
* Simple GUI for the browser
* Proxy tokens validation
* Recovering from invalid web-based requests
* Remember last visisted URL
* Removing unused variables
* Addressing review comments
* Setting default account in web3
* Adding WebBrowser dapp to the list
* Actually prune old entries when generating new token
2016-12-27 10:15:02 +00:00
Robert Habermeier
612f14188f
remove unused fields in informant ( #3963 )
2016-12-23 18:45:51 +01:00
Arkadiy Paronyan
5a3c3bcb45
Sync reorg up to history size ( #3874 )
...
* Allow sync reorg up to pruning history size
* Peer difficulty tracking
* Abort downloading block if received with NewBlock
* Set pruning history to 1200
* Renamed history size field
2016-12-23 18:43:40 +01:00
Robert Habermeier
d0194f3ad3
Merge branch 'master' into lightsync
2016-12-23 13:39:06 +01:00
Tomasz Drwięga
f0387c33c6
Global Fetch Service ( #3915 )
...
* Dapps web
Conflicts:
dapps/src/apps/fetcher.rs
dapps/src/handlers/fetch.rs
* Rewriting fetch
* Parity-wide fetch service
* Obey the limits and support cancellation.
* Removing temporary files.
* Actually use Fetch for dapps
* Re-implementing file fetching to avoid temporary files.
* Serde to 0.8.19
* Fixing content & dapps fetch
2016-12-22 18:26:39 +01:00
Robert Habermeier
b44cd7b1db
Merge pull request #3940 from gguoss/auth-bft
...
Fixed compile error.
2016-12-22 12:54:14 +01:00
gavinGuo
70c9f7c80d
Fixed compile error.
2016-12-22 14:51:25 +08:00
Robert Habermeier
01b494ca2c
Merge branch 'master' into lightsync
2016-12-21 13:42:07 +01:00
Gav Wood
cd8af0a497
Merge pull request #3904 from ethcore/new-dirs
...
Fixed upgrading keys on the first run
2016-12-19 22:24:37 +01:00
Robert Habermeier
70d53dcfd6
Merge branch 'master' into lightsync
2016-12-19 18:53:52 +01:00
arkpar
ddb242c969
Fixed upgrading keys on the first run
2016-12-19 17:41:55 +01:00
Gav Wood
002cec9e6f
Merge pull request #3872 from ethcore/disable-light-server
...
remove light server capability temporarily
2016-12-19 15:22:44 +01:00
Robert Habermeier
2b1f51694b
fix cli test
2016-12-19 14:01:19 +01:00
Robert Habermeier
a48435ca60
Merge branch 'master' into lightsync
2016-12-19 13:15:37 +01:00
Gav Wood
adb0f6fb26
Merge pull request #3880 from ethcore/fix-updater-permissions
...
Fix updater permissions
2016-12-17 12:15:05 +01:00
Robert Habermeier
5b0531e964
fix compiler warnings
2016-12-17 00:44:18 +01:00
Robert Habermeier
bd59ef05ac
prettier informant
2016-12-17 00:41:02 +01:00
Robert Habermeier
8970946b74
basic --light parameter
2016-12-16 21:45:51 +01:00
Gav Wood
fa721f5cdf
Merge pull request #3875 from ethcore/config-fix
...
Loading default config from default path
2016-12-16 20:24:12 +01:00
Gav Wood
14e4fefbcf
Fix updater permissions and refactor existing code.
2016-12-16 18:17:15 +01:00
Gav Wood
b9cd68e7e6
Minor paths change
2016-12-16 17:38:02 +01:00
arkpar
6966fd6c63
New paths
2016-12-16 15:25:53 +01:00
Tomasz Drwięga
f345458b65
Loading config from default path
2016-12-16 15:03:31 +01:00
Gav Wood
72f278efed
Merge pull request #3868 from ethcore/new-dirs
...
Base directory option
2016-12-16 13:04:31 +01:00
Gav Wood
90d3d330f5
Use info! for blockchain status rather than stdout.
2016-12-16 11:00:17 +01:00
Gav Wood
396ab5b361
Refactor and make is_syncing.
2016-12-16 10:31:10 +01:00
Robert Habermeier
8f65a7bcc8
remove light server capability temporarily
2016-12-15 23:50:16 +01:00
Gav Wood
ca0d87da10
125 -> 69.
2016-12-15 22:05:54 +01:00
arkpar
e2371632c5
Base dir option
2016-12-15 21:56:45 +01:00
Gav Wood
4410fb635a
Respect system paths.
2016-12-15 19:53:13 +01:00
Gav Wood
801596395e
--release-track.
2016-12-15 19:23:25 +01:00
Gav Wood
995fafebee
Fix last remaining test.
2016-12-15 19:19:50 +01:00
Gav Wood
d737de0fc0
Fix tests.
2016-12-15 19:17:44 +01:00
Gav Wood
4a2b418fc2
Configurable update tracks to help testing.
2016-12-15 18:51:59 +01:00
Gav Wood
c12702fc51
Merge remote-tracking branch 'origin/master' into check-updates
2016-12-15 18:23:02 +01:00
Gav Wood
590428e7f2
Merge remote-tracking branch 'origin/master' into check-updates
2016-12-15 15:12:09 +01:00
Gav Wood
0da564a4c2
Merge branch 'master' into cli-rpc
2016-12-15 14:45:15 +01:00
Gav Wood
20b2f84d48
Merge pull request #3828 from ethcore/new-dirs
...
New directory structure
2016-12-15 14:34:01 +01:00
Jaco Greeff
054a6a9daf
Merge branch 'master' into check-updates
...
# Conflicts:
# .gitlab-ci.yml
# js/webpack/dev.server.js
2016-12-15 13:52:28 +01:00
Gav Wood
a74bce2c06
Merge pull request #3759 from ethcore/auth-bft
...
Tendermint Engine
2016-12-15 13:18:15 +01:00
Vincent Serpoul
339b889ac4
spelling ( #3839 )
2016-12-14 15:15:19 +01:00
Jaco Greeff
2588aea6b2
Merge branch 'master' into check-updates
2016-12-14 14:37:38 +01:00
Tomasz Drwięga
1d80725f66
Merge branch 'master' into cli-rpc
2016-12-14 14:12:27 +01:00
arkpar
3280f071b1
Fixed moving dirs on windows
2016-12-14 01:33:57 +01:00
arkpar
be5fefe772
Merge branch 'master' of github.com:ethcore/parity into new-dirs
2016-12-14 00:04:11 +01:00
arkpar
6e3e1ea88b
XDG paths
2016-12-13 23:38:29 +01:00
Gav Wood
6a48e9d9e5
Print output for commands, don't info!
2016-12-13 20:20:10 +01:00
Gav Wood
80d6e49070
Merge pull request #3812 from ethereumproject/splix/classic-replay-protection
...
Network configuration for Ethereum Classic
2016-12-13 17:39:33 +01:00
arkpar
5fd2e15313
Style and docs
2016-12-12 23:21:44 +01:00
keorn
fa504e510f
Merge branch 'master' into auth-bft
2016-12-12 21:28:46 +01:00
Igor Artamonov
e61d14d7f7
reuse Morden for Classic Testnet
2016-12-12 19:50:32 +00:00
arkpar
85fd62917a
Updated tests
2016-12-12 17:53:17 +01:00
arkpar
edb853ca35
KillDB command
2016-12-12 17:19:41 +01:00
arkpar
6601fde328
New data paths with upgrade
2016-12-12 16:51:07 +01:00
Gav Wood
758744449f
Expose all other RPCs.
2016-12-12 02:57:19 +01:00
Gav Wood
d81d9d77b2
Wire-in Updater to parity RPC
2016-12-11 23:15:52 +01:00
Gav Wood
58b72c521d
Rename ethcore -> parity in licenses.
2016-12-11 19:31:31 +01:00
Gav Wood
17cc2be4b5
Rename ethcore -> parity in license.
2016-12-11 19:30:54 +01:00
Gav Wood
10b0898bdf
Crate tidyups.
...
- Move Updater into its own crate.
- Change ethcore -> parity in authors, homepages and licenses.
2016-12-11 19:14:42 +01:00
Gav Wood
22cb5753d0
Improve capability information and disable old clients.
2016-12-11 16:52:41 +01:00
Gav Wood
74a6203f72
Merge remote-tracking branch 'origin/master' into check-updates
2016-12-11 15:43:28 +01:00
Gav Wood
0e17cf8d3a
Fix tests.
2016-12-11 15:41:49 +01:00
Igor Artamonov
aed633d7df
Testnet for Ethereum Classic
2016-12-11 19:25:02 +06:00
arkpar
a49ff3fb32
Merge branch 'master' of github.com:ethcore/parity into cli-rpc
2016-12-11 13:30:48 +01:00
Gav Wood
8d7a63bbea
Join up the final dots.
2016-12-11 13:10:33 +01:00
arkpar
a56443aa6c
Tolerate error is user_defaults
2016-12-11 13:00:49 +01:00
arkpar
c777362d02
Sync channel for consensus test
2016-12-11 12:32:01 +01:00
Gav Wood
d9f6ea56ef
Don't restart if we're not in the cradle.
2016-12-11 04:05:02 +01:00
Gav Wood
2865cbaf70
Use file contents instead of symlink.
2016-12-11 03:33:10 +01:00
Gav Wood
7a1539cfb5
Fix deadlock.
2016-12-11 02:39:56 +01:00
Gav Wood
0302d582d2
Fix build.
2016-12-11 02:02:40 +01:00
Gav Wood
fa30dfd4b9
Refactor into system service, add exe redirect.
2016-12-10 23:58:39 +01:00
keorn
f3af0f46be
Merge branch 'master' into auth-bft
2016-12-10 18:14:35 +01:00
Gav Wood
316c25d9f8
Merge remote-tracking branch 'origin/master' into check-updates
2016-12-10 14:08:41 +01:00
Gav Wood
82efa2675e
Merge remote-tracking branch 'origin/master' into consistent-id
2016-12-10 13:36:30 +01:00
keorn
e5f8044cad
Merge branch 'master' into auth-bft
2016-12-10 11:01:23 +01:00
Gav Wood
5f1fcf95e0
Make *ID names consistent with std Rust (Id)
2016-12-09 23:01:43 +01:00
Kristoffer Ström
0e516162c3
Rebased on master
2016-12-09 22:27:32 +01:00
Kristoffer Ström
7a176094d5
* Use try!/map_err instead of match
...
* Use jsonrpc_core for serializing/deserializing rpc messages
* Factor out unwraps
* Remove mem::replace
* Add nicer formating of ConfirmationRequests
2016-12-09 22:26:07 +01:00
Kristoffer Ström
273d7c00c3
Pass cli tests, remove compiler warnings
2016-12-09 22:26:07 +01:00
Kristoffer Ström
4e3f8bab10
Add Ws Json rpc client and command line utils
2016-12-09 22:26:05 +01:00
Gav Wood
46af3d18da
Merge remote-tracking branch 'origin/master' into check-updates
2016-12-09 20:45:15 +01:00
Gav Wood
c2b6be95c8
Fetch and place in updates path.
2016-12-09 19:02:42 +01:00
keorn
fb71caffbd
remove double registration
2016-12-09 11:05:44 +01:00
Robert Habermeier
eec1929658
Merge branch 'master' into lightserv
2016-12-09 01:29:46 +01:00
Robert Habermeier
6f5f1f5e26
light: integrate with sync + serve_light CLI
2016-12-08 23:21:47 +01:00
keorn
9ecb07434f
fix informant
2016-12-08 21:13:32 +01:00
Gav Wood
2d6656fc43
Merge pull request #3725 from ethcore/engine-password
...
Make engine hold AccountProvider
2016-12-08 20:52:12 +01:00
Gav Wood
8903384840
Merge branch 'master' into check-updates
2016-12-07 19:19:44 +01:00
keorn
aa9caac750
revert cli default
2016-12-07 15:36:20 +01:00
keorn
e9743a3a75
Merge branch 'master' into auth-bft
2016-12-07 14:50:17 +01:00
keorn
5c333fce31
Merge branch 'engine-password' into auth-bft
2016-12-07 10:35:52 +01:00
keorn
71a96588b0
add the methods to engines
2016-12-07 10:34:06 +01:00
Robert Habermeier
398b94e6e2
Merge branch 'master' into opt-in-verifier-scaling
2016-12-06 15:37:10 +01:00
keorn
8f641e67f3
Merge branch 'engine-password' into auth-bft
2016-12-06 13:13:02 +00:00
keorn
b089aa7a6b
fix password loading
2016-12-06 08:38:41 +00:00
keorn
0a2ec319ac
rename to engine_signer
2016-12-05 21:31:38 +00:00
keorn
5e7c21ad4a
add a cli flag
2016-12-05 19:23:03 +00:00
keorn
81a756394a
Merge branch 'master' into engine-password
2016-12-05 17:08:57 +00:00
keorn
529a7fc33c
add password and AccountProvider
2016-12-05 17:08:16 +00:00
keorn
6fc943ca6d
Merge branch 'master' into auth-bft
2016-12-05 16:37:35 +00:00
Gav Wood
43ec3d8f79
network_id -> u64
2016-12-05 06:54:31 -08:00
Robert Habermeier
767d486014
fix config test
2016-12-05 14:12:40 +01:00
keorn
c946ffebf3
Merge branch 'master' into auth-bft
2016-12-05 11:30:11 +00:00
Gav Wood
2911c549e3
Encode networkid as a u64.
2016-12-04 10:48:26 -08:00
Gav Wood
b8c492644b
Fix more build.
2016-12-04 10:47:05 -08:00
Gav Wood
356aca2db5
Fix build.
2016-12-04 09:13:23 -08:00
Gav Wood
90a20a217f
Merge branch 'master' into check-updates
2016-12-04 09:01:50 -08:00
Robert Habermeier
80f98bc8b7
fix tests
2016-12-02 18:52:02 +01:00
Robert Habermeier
cd5b6fdf59
queue: CLI for auto-scaling and num verifiers
2016-12-02 18:21:54 +01:00
Gav Wood
1dd13372b6
Merge remote-tracking branch 'origin/master' into rpc-middleware
2016-12-01 19:43:31 -08:00
keorn
155da50fcd
Merge branch 'master' into auth-bft
2016-11-30 13:06:21 +00:00
keorn
4ef5badcea
fix parity tests merge
2016-11-30 12:58:45 +00:00
Gav Wood
d525a6d7f0
Merge pull request #3654 from ethcore/clippy-bump
...
Bumping clippy
2016-11-29 18:00:13 +01:00
Gav Wood
9115214cea
Merge pull request #3636 from ethcore/fatdb
...
Return of the Fat DB
2016-11-29 16:47:09 +01:00
Tomasz Drwięga
c97c59f62f
returning errors with extra fields in config file ( #3663 )
2016-11-29 13:23:28 +01:00
Tomasz Drwięga
2b3d100de2
Fixing some clippy warnings
2016-11-28 15:54:22 +01:00
arkpar
dfd17949ef
Added a test
2016-11-28 12:08:12 +01:00
keorn
5c0e89ae9a
Merge branch 'master' into auth-bft
2016-11-28 09:50:22 +00:00
arkpar
fa45413a90
Extened API
2016-11-28 01:37:25 +01:00
arkpar
c7b359fcee
Style
2016-11-28 01:37:25 +01:00
arkpar
d0c80a6903
Updated tests
2016-11-28 01:37:25 +01:00
arkpar
3aceac60de
Use sha3 for fat key
2016-11-28 01:37:24 +01:00
arkpar
e91f7977fb
Storage export
2016-11-28 01:37:24 +01:00
arkpar
b0555fbe7c
State export
2016-11-28 01:37:24 +01:00
Gav Wood
ce3f4911a2
Merge remote-tracking branch 'origin/master' into check-updates
2016-11-27 15:01:17 +01:00
Tomasz Drwięga
3b595a01ad
Merge branch 'master' into rpc-middleware
2016-11-25 21:46:35 +01:00
Tomasz Drwięga
a9028ca986
Merge branch 'master' into rpc-middleware
...
Conflicts:
Cargo.lock
rpc/src/v1/tests/mocked/parity_accounts.rs
2016-11-25 21:18:02 +01:00
arkpar
ffa123c949
Set default tx price to 0.0025 USD
2016-11-25 15:13:51 +01:00
Tomasz Drwięga
9b9bdaa1b1
Appending logs by default ( #3609 )
2016-11-25 13:04:02 +01:00
keorn
a143da2cb8
fix complete build
2016-11-25 11:36:25 +00:00
keorn
1692c07ba6
Merge branch 'master' into auth-bft
2016-11-25 10:51:06 +00:00
Gav Wood
735df6c30f
More work.
2016-11-24 17:19:48 +01:00
Gav Wood
03ef95ba50
Compiles.
2016-11-23 20:35:21 +01:00
Gav Wood
5d62cfdf6f
Merge remote-tracking branch 'origin/master' into check-updates
2016-11-23 18:15:21 +01:00
Gav Wood
9d3b2352cc
More work.
2016-11-23 16:29:15 +01:00
Tomasz Drwięga
cd6f565f69
RPC Middleware & Get/Set dapp-specific accounts
2016-11-23 16:27:05 +01:00
arkpar
7da8f019d5
--no-ancient-blocks
2016-11-22 18:15:55 +01:00
keorn
340d377930
Revert "dont keep account provider in miner"
...
This reverts commit 11ccacd6d0
.
2016-11-22 16:05:27 +00:00
Gav Wood
bf9ed2d444
Merge remote-tracking branch 'origin/master' into check-updates
2016-11-22 10:25:34 +01:00
Gav Wood
45dead9d49
Naming consistency and make Updater improvements.
...
- ID -> Id (consistency with rust libs)
2016-11-22 10:24:22 +01:00
Gav Wood
4c83eff912
Merge pull request #3552 from ethcore/import-msg
...
Import account message
2016-11-22 00:03:36 +01:00
arkpar
efdf017c43
Import account message
2016-11-21 15:03:20 +01:00
arkpar
8bb8ecac2d
--testnet set to ropset
2016-11-21 14:39:26 +01:00
keorn
6e0bd4072b
Merge branch 'master' into auth-bft
2016-11-21 12:17:00 +00:00
Tomasz Drwięga
94328e9784
Fixing main
2016-11-20 22:40:23 +01:00
Arkadiy Paronyan
efd1d9bd0e
Ropsten network ( #3539 )
...
* Ropsten network
* Sorted premine
* Comas
* Removed trailing coma
2016-11-20 16:38:45 +01:00
keorn
9d61071dd7
Merge branch 'miner-no-ap' into auth-bft
2016-11-17 22:04:07 +00:00
keorn
11ccacd6d0
dont keep account provider in miner
2016-11-17 18:32:12 +00:00
keorn
6cb892f605
Merge remote-tracking branch 'parity/master' into bft
2016-11-17 12:19:30 +00:00
Gav Wood
25950345db
Merge pull request #3379 from ethcore/new-token
...
Signer new-token generates a link and opens browser
2016-11-16 23:48:21 +08:00
keorn
8ac989cbeb
Merge remote-tracking branch 'parity/master' into bft
2016-11-16 10:29:54 +00:00
Tomasz Drwięga
29271383dd
signer new-token doesn't open the browser
2016-11-16 09:38:09 +01:00
Gav Wood
8ad2526826
Merge pull request #3460 from ethcore/drop-spec
...
drop spec when no longer useful
2016-11-16 11:20:13 +08:00
Robert Habermeier
8c8bf30de5
drop spec when no longer useful
2016-11-15 19:07:23 +01:00
keorn
d19e8c5505
Merge remote-tracking branch 'parity/master' into bft
2016-11-15 10:26:37 +00:00
Tomasz Drwięga
6ea4b25859
Create directories only if feature is enabled
2016-11-15 10:28:52 +01:00
Tomasz Drwięga
7f011afacb
Tokens retention policy
2016-11-14 12:17:05 +01:00
keorn
d8e6dbd981
Merge branch 'master' into dev-chain
2016-11-14 10:05:34 +00:00
keorn
2d4b4cf5c9
revert moves to Spec
2016-11-14 10:04:34 +00:00
Jaco Greeff
373eb6c01b
Merge branch 'master' into new-token
2016-11-12 16:25:21 +01:00
Tomasz Drwięga
c17ef2c1a4
Fixing parsing passwords from file ( #3367 )
...
* fixing parsing passwords as inputs
* Fixing typo in test
2016-11-12 10:06:40 +01:00
keorn
15d748c2f7
Merge branch 'master' into dev-chain
2016-11-11 20:40:05 +00:00
keorn
4a65394269
change instant spec, update doc
2016-11-11 18:38:44 +00:00
keorn
53258cca6c
add new dev spec
2016-11-11 17:27:20 +00:00
keorn
225d0b02e7
update parity module
2016-11-11 17:10:47 +00:00
Tomasz Drwięga
ba699fdb25
new line [ci:skip]
2016-11-11 18:02:36 +01:00
Tomasz Drwięga
be6023b602
Opening a browser
2016-11-11 17:56:52 +01:00
Tomasz Drwięga
aa147461b0
Generating browser link on signer new-token
2016-11-11 17:38:45 +01:00
Tomasz Drwięga
4bf75d6f2f
Remove some unwraps from parity/helpers ( #3364 )
...
* Fixing no stdin
* Removing unwrap when reading passwords
2016-11-11 16:53:51 +01:00
Tomasz Drwięga
88c9cea04d
Dapps interface RPC ( #3311 )
...
* Dapps Interface RPC
* Adding JS apis
* Support for signer interface in proxypac and embeds
* Fixing tests
* fixing tests again
2016-11-09 19:41:47 +01:00
Gav Wood
7b5824d4a2
Fixes for 1.4 ( #3260 )
...
* Fix --geth
* Fix mac installer.
* Fix up installer.
* Additional tweaks.
* Fix for empty APIs
* Another case of empty apis
2016-11-08 21:45:22 +01:00
Robert Habermeier
d18bb9d152
verify chunk hashes in cli restore ( #3241 )
2016-11-07 19:33:55 +01:00
keorn
52ea597d6f
Rename cli and config options signer->ui ( #3232 )
...
* rename options signer->ui
* rename config signer->ui
2016-11-07 17:40:53 +01:00
keorn
ea960f1c27
Merge remote-tracking branch 'parity/master' into bft
2016-11-07 11:34:45 +00:00
Tomasz Drwięga
9c4979681c
Cleaning up polluted namespaces ( #3143 )
...
* Renaming ethcore_ to parity_
* Renaming files
* Renaming poluted EthSigning
* Tidy up the namespaces
* Renaming files to match new structure
* Splitting EthSigning into separate traits
* jsapi move ethcore.* -> parity.*
* Move jsonrpc parity definitions
* Update UI API calls for parity interfaces
* Move jsapi signer interfaces from personal to signer
* Update UI to use signer.* where applicable
* Updsate jsapi subscriptions for signer
* Fix dodgy merge.
* Update README.
* Fix some tests.
* Move parity-only personal.* to parity.*
* Update UI for personal -> parity API moves
* Update subscription APIs after personal -> parity move
* personal. generateAuthorizationToken -> parity. generateAuthorizationToken (UI)
* enode, dappsPort & signerPort (UI)
* Update subscription tests (accountsInfo)
* subscription update
* personal -> parity
* Additional error logging on method failures
* move postTransaction to parity
* Additional debug info with method failures
* Fix personal tests.
* Console wrning shows parameters, error object does not
* Include parity_ signing methods.
* Console log http transport info
* Fix failing tests
* Add RPC stubs for parity_accounts.
* Allow some secure built-in dapps
* Use parity_accounts in place of accountsInfo
* Improve error reporting
* Cleanup GHH error handling
2016-11-06 12:51:53 +01:00
Gav Wood
744501c454
Mode improvements for UI ( #3109 )
...
* `--mode=off` now works.
* Add Mode::Off as a persistent CLI option.
* "last" not "auto" as default.
* Commit accidentally unsaved file.
* Whitespace
[ci:skip]
* Mode CLI parse fix
* or offline
* Save mode when it gets changed.
* Fix Offline mode
* Fix up mode operations.
* Make passive default, but not overriding.
* Fix test
* Maybe not everyone wants to run an archive node...
2016-11-05 10:38:00 +01:00
Tomasz Drwięga
68f60596dc
Enabling personal RPC over IPC by default ( #3165 )
2016-11-04 09:58:39 +01:00
Gav Wood
d3de475205
EIPs 155, 160, 161 ( #2976 )
...
* The front-end for each hard-fork, also EIP-160.
* Address EIP161 a/c
* Include EIP-161b
* EIP-161 part d.
* Fix test build.
* Fix one test, add another.
* Fix use of bloom & renaming.
* Initial groundwork for EIP-155
* Fix minor bug.
* Fix all tests finally.
* Rest of EIP-155.
* Add tests for EIP-155 algorithm.
Update transaction tests validation.
* Minor reformat.
* Address grumbles.
* Remove unused code.
* Fix SUICIDE gas mechanism and add consensus tests.
* Remove commented code.
* Set Frontier hardfork block number
* Fix warning.
* Transaction tests,
2016-11-03 22:22:25 +01:00
Arkadiy Paronyan
8f4bd3590a
Fix windows build ( #3125 )
2016-11-03 16:11:08 +01:00
Arkadiy Paronyan
d101cb5247
Windows tray app ( #3103 )
...
* Check if already running in ui command
* Windows tray app
* Upadted CI scripts
2016-11-03 12:00:39 +01:00
Tomasz Drwięga
7fb39d1511
Displaying errors on stderr ( #3116 )
2016-11-03 12:00:26 +01:00
Tomasz Drwięga
cf8f27ce0f
Initializing logger for each command ( #3090 )
...
* Initializing logger for each command
* Single logger setup
* Whitespace [ci:skip]
2016-11-02 19:42:21 +01:00
Gav Wood
94e3a98524
Fix minor type in informant ( #3056 )
2016-11-01 22:44:24 +01:00
Robert Habermeier
19d5f93745
Merge pull request #3020 from ethcore/fix-old-migrations
...
apply post-consolidation migrations after consolidating
2016-11-01 14:32:23 +01:00
Robert Habermeier
8599a11a0b
Snapshot sync and block gap info in eth_syncing
( #2948 )
...
* provide snapshot sync info in eth_syncing
* specify block gap in eth_syncing
* Extend eth_syncing with warp, format the output properly
* adjust serialization tests for sync info
* whitespace
2016-10-31 17:32:53 +01:00
Robert Habermeier
0139dfcc39
apply post-consolidation migrations after consolidating
2016-10-31 16:18:20 +01:00
Arkadiy Paronyan
cf027d74f9
Print messages to stderr ( #2991 )
2016-10-30 17:48:36 +01:00
Arkadiy Paronyan
6931878ff1
Networking and syncing tweaks ( #2990 )
...
* Reduce periodic snapshot delay
* Prevent connecting to peers over the min_peers limit
* Smaller block requests for slower connections
2016-10-30 15:39:36 +01:00
Tomasz Drwięga
f17cad9dff
Fixing clippy warnings 2 ( #2961 )
2016-10-29 13:08:49 +02:00
Tomasz Drwięga
152a551e8b
Transaction Queue banning ( #2524 )
...
* Blacklisting transaction queue
* Using blacklisting queue in miner
* Restoring todo [ci:skip]
* Blacklisting recipients and code
* Renaming blacklisting->banning
* CLI option for banning.
* Fixing submodule commit [ci:skip]
* Fixing RPC tests
* Additional logging when dropping transactions
* whitespace
[ci:skip]
* Configurable ban duration
* Reverting fix for pruning history from config file
2016-10-27 19:28:34 +02:00
Tomasz Drwięga
ce37b6dcb9
Revert to gas price ordering ( #2919 )
2016-10-27 19:27:08 +02:00
Jaco Greeff
8dff4012a6
Personal split ( #2879 )
...
* Split personal namespace into Safe and Unsafe part
* Re-add api.personal.accountsInfo() calls to dapps
* Removing listGethAccounts from safe personal
2016-10-27 19:26:34 +02:00
Tomasz Drwięga
8cef517788
Fixing config values for pruning_history ( #2918 )
2016-10-27 16:56:18 +02:00
Gav Wood
c9298981f8
Fix up informant. ( #2865 )
...
Just ensure as many transactions/blocks are reported as possible.
2016-10-26 13:57:54 +02:00
keorn
8d0cff3599
Nicer port in use errors ( #2859 )
...
* dapps port
* rpc port
* signer port
* different instance as possible cause
* network port
2016-10-25 15:55:53 +02:00
Robert Habermeier
bc81ae0407
Snapshot and blockchain stability improvements ( #2843 )
...
* allow taking snapshot from just-restored database without error
* make creation informant less spammy
* Ancestry iterator failure-resilient
* make uncle hash searching resilient to incomplete chain
* deduce pre-chunk info from last written block's details
2016-10-24 18:27:23 +02:00
Arkadiy Paronyan
1a5bae8ef1
Extended network options ( #2845 )
...
* More network configuration options
* Filter UDP requests
* Fixed tests
* Fixed test warning
2016-10-24 18:25:27 +02:00
Tomasz Drwięga
4ea67ff91d
Disable personal APIs by default ( #2834 )
2016-10-24 15:10:13 +02:00
Arkadiy Paronyan
44a560e964
CLI option to skip seal check when importing ( #2842 )
2016-10-24 15:09:13 +02:00
Tomasz Drwięga
e5f86c62ad
Dapps port RPC ( #2819 )
2016-10-24 12:21:15 +02:00
keorn
479657b23b
Automatic compaction selection on Linux ( #2785 )
...
* add auto compaction types
* pass db paths
* detect drive type on Linux
* use base db path
* add docstring
* limit the test to be side effect free
* use base db path
* more docs
* fix parsing test
* update error
* detect only on Linux
* make test Linux only
* add second device letter, update cli doc
* use spaces in cli doc
* import only on linux
* default->auto
2016-10-21 23:21:57 +02:00
keorn
866ab9c7a3
Check queue to determine major importing ( #2763 )
...
* simplify major sync detection
* fix typos
* fix merge
* more realistic EthTester
* add new synced state
* remove Blocks synced state
* move is_major_importing to rpc crate and check queue
* add tests
2016-10-20 23:36:18 +02:00
keorn
aa52b04e31
Unify major syncing detection ( #2699 )
...
* simplify major sync detection
* fix typos
* fix merge
* more realistic EthTester
* add new synced state
2016-10-19 18:35:39 +02:00
Tomasz Drwięga
5e67c89b4b
Remove obsolete dapps and update security headers ( #2694 )
...
* Embed allowed only on signer port
* Adding security headers to dapps
* Adding security headers to signer
* Removing old dapps
2016-10-19 11:02:21 +02:00
Arkadiy Paronyan
487dfb0208
Snapshot sync part 2 ( #2098 )
...
* Split block downloader into a module
* Snapshot sync progress
* Warp sync CLI option
* Increased snapshot chunk and ping timeouts
* Fixed an issue with delayed writes
* Updated bootnodes
* Don't run pending IO tasks on shutdown
* Optional first_block; removed insert_snapshot_block
* Fixing expect calls
* Fixed stalled sync
* style and docs
* Update block_sync.rs
[ci:skip]
2016-10-18 18:16:00 +02:00
Nikolay Volf
dba2d79b56
fix issues with no test dir present ( #2659 )
2016-10-18 16:44:40 +02:00
Tomasz Drwięga
cceca916a1
[frontport] CLI to specify queue ordering strategy ( #2494 ) ( #2623 )
...
* CLI to specify queue ordering strategy (#2494 )
* Alter gas priorities to include gas_price also
* CLI options and tests
* Adding ordering by gas
* whitespace
Conflicts:
ethcore/src/miner/miner.rs
ethcore/src/miner/mod.rs
ethcore/src/miner/transaction_queue.rs
parity/cli/usage.txt
parity/configuration.rs
* fix build
2016-10-15 14:46:33 +02:00
Robert Habermeier
f28b8352c1
Configurable history size in master ( #2606 )
...
* split journaldb commit into two functions: journal_under and mark_canonical
* use new commit mechanism in client
* Configurable history size in master
* Reduce DB history
* Configurable history size
* Set min history size
* Test
* Fixed a test and reduced the limit
2016-10-14 15:44:56 +03:00
Arkadiy Paronyan
f9440f20b8
Fixed tx queue limit for local transactions ( #2616 )
...
* Fixed tx queue limit for local tx
* Fixing test
* Increas gas limit to 20x
2016-10-14 13:56:00 +02:00
Robert Habermeier
4bcc9e3b49
Merge pull request #2516 from ethcore/canon-cache-size
...
Mostly configurable canonical cache size
2016-10-12 21:48:29 +02:00
keorn
e343153f06
mixed merge and changes...
2016-10-11 18:37:31 +01:00
Robert Habermeier
ea68546616
Network-specific nodes file ( #2569 )
...
* network-specific nodes.json
* save nodes.json periodically
* squash warnings
2016-10-11 18:42:20 +02:00
Arkadiy Paronyan
26d7712d30
TX queue gas limit config and allow local transactions over the gas limit ( #2553 )
...
* Gas limit config; Allow local transactions over the limit
* Fix typo
[ci:skip]
2016-10-10 23:04:43 +02:00
Arkadiy Paronyan
d6cad29f49
Print backtrace on panic ( #2535 )
2016-10-08 17:33:38 +02:00
Robert Habermeier
299ceb8092
Merge branch 'master' into canon-cache-size
2016-10-07 12:42:51 +02:00
Robert Habermeier
8a0e98d4cc
configurable jump table cache size
2016-10-07 12:18:42 +02:00
keorn
5f0ed9ddce
Trim password from file ( #2503 )
...
* trim password
* indicate trimming in doc
2016-10-07 09:39:16 +02:00
Robert Habermeier
745a50dfdf
configurable state cache size
2016-10-07 00:28:42 +02:00
Tomasz Drwięga
a9391f91f7
Increase size of transaction queue by default
2016-10-06 10:20:05 +02:00
Nikolay Volf
7526b1d44b
Derive IPC interface only when ipc feature is on ( #2463 )
...
* derive -> ipc
* accident repair
* conditional ipc deriving
* fix test
2016-10-05 19:42:57 +02:00
svyatonik
0e8dda740f
* PR 2464: human-readable error message + struct documentation
2016-10-05 00:13:07 +03:00
svyatonik
abc5db0f80
Remove redundant Box-ing.
2016-10-04 16:01:39 +03:00
svyatonik
cb0e0abc4a
closes ethcore/parity#1918
2016-10-04 11:44:47 +03:00
Robert Habermeier
d205c0800c
Merge pull request #2437 from ethcore/signer
...
Fixing Signer token RPC API
2016-10-03 20:34:55 +02:00
Arkadiy Paronyan
10d572e24f
Fixed FatDB check ( #2443 )
2016-10-03 19:31:50 +02:00
Tomasz Drwięga
a0a13600ef
Fixing Signer token RPC API
2016-10-03 15:01:10 +02:00
Nikolay Volf
e1d3b3fff8
Accounts bloom in master ( #2426 )
...
* bloom crate link
* database layout and outdated tests
* state db alterations
* v10 migration run
* using arc
* bloom migration
* migration fixes and mess
* fix tests
2016-10-03 12:02:43 +02:00
Marek Kotewicz
06fe768ac2
Polishing Actually enable fat db pr ( #1974 ) ( #2048 )
...
* Actually enable fat db, and do RPCs for it.
* Implement HashDB traits for AccountDB.
* user defaults
* finished user defaults
* user defaults are network-dependent
* added tests for newly added functions, logger is initialized first
* dir cleanup in progress
* user_file is placed next to snapshots
* fixing requested change
2016-10-03 11:13:10 +02:00
Nikolay Volf
1029f8438c
using arc ( #2420 )
2016-10-01 14:33:19 +02:00
Gav Wood
bb96849620
Revert #2172 , pretty much. ( #2387 )
...
* Revert #2172 , pretty much.
* Tidy up whitespace.
[ci:skip]
* Force CI.
2016-09-28 23:31:59 +02:00
Nikolay Volf
6df1c3d157
Merge pull request #2334 from ethcore/fix-migrations
...
fix migration system for post-consolidation migrations, better errors
2016-09-28 19:54:34 +04:00
Gav Wood
15a14a5f49
Expanse compatibility ( #2369 )
...
* Add support for Expanse.
* Fix build.
* Refactor to be able to alter the eth subprotocol name
* Fix JSON.
* Support exp hardfork.
* Fix exp json again.
* Fixed test
* Fix tests.
2016-09-28 14:21:59 +02:00
Robert Habermeier
fb92a98451
Specify column cache sizes explicitly; default fallback of 2MB ( #2358 )
...
* allow specifying cache sizes for specific columns
* initialize client with correct cache size
* set cache size in client service
* default cache size for unspecified columns
* fix comment
* fix column selection logic
* fix migrations module
2016-09-27 18:16:32 +02:00
Marek Kotewicz
56eb97abbf
user defaults ( #2014 )
...
* user defaults
* finished user defaults
* user defaults are network-dependent
* added tests for newly added functions, logger is initialized first
* dir cleanup in progress
* user_file is placed next to snapshots
2016-09-26 19:21:25 +02:00
Robert Habermeier
3ebfbf3342
fix migration system, better errors
2016-09-26 18:08:04 +02:00
Gav Wood
84ba75f7cb
Add hash as CLI function ( #1995 )
...
* Add hash as CLI function
* Use streaming SHA3.
2016-09-23 15:28:09 +02:00
Tomasz Drwięga
b7e2afd5c0
New signer token RPC & Initial signer connection without token. ( #2096 )
...
* Allowing signer to use initial token
* Generating new tokens via RPC
* Fixing RPC tests
* Fixing signer doctest
* whitespace
[ci:skip]
* whitespace
[ci:skip]
2016-09-21 11:44:49 +01:00
Tomasz Drwięga
7f7e74869c
Bump clippy & Fix warnings ( #2109 )
...
* Bump clippy
* Fixing warnings
2016-09-16 23:03:26 +02:00
arkpar
0124f985c3
Added docs
2016-09-16 12:18:27 +02:00
arkpar
cc845c61d3
Import summary
2016-09-15 16:56:10 +02:00
Tomasz Drwięga
27d30fca22
Fixing tests
2016-09-12 14:18:33 +02:00
Tomasz Drwięga
d046a7d5d4
no-config flag
2016-09-12 09:01:47 +02:00
Tomasz Drwięga
db59d9a4ae
Merge branch 'master' into config-files
2016-09-12 00:57:25 +02:00
Tomasz Drwięga
b7bf10d62d
Adding nice error messages for invalid configs.
2016-09-12 00:36:38 +02:00
Robert Habermeier
dcfd7eab6d
Local snapshot restore ( #2058 )
...
* restore from local snapshot
* update status with chunks done
* rework local restore trigger
2016-09-11 14:05:59 +02:00
Robert Habermeier
fd4361e284
import: keep informant going until finished ( #2065 )
2016-09-11 14:04:56 +02:00
Tomasz Drwięga
62de1c3891
Config files WiP
2016-09-10 22:14:15 +02:00
Robert Habermeier
53b22da1c1
Merge pull request #2046 from ethcore/ipc-tweaks-3
...
IPC tweaks
2016-09-09 17:31:59 +02:00
Robert Habermeier
57d5c35bb6
Use proper database configuration in snapshots. ( #2052 )
...
* use proper database config in snapshot service
* add snapshot path to parity directories struct
* fix RPC tests
2016-09-07 15:27:28 +02:00
Robert Habermeier
541b14a4ab
periodic snapshot tweaks ( #2054 )
...
* periodic snapshot tweaks
* set SNAPSHOT_HISTORY to 500
2016-09-07 15:27:14 +02:00
debris
ba806a6359
Merge branch 'master' of github.com:ethcore/parity into spec_load_errors
2016-09-07 10:24:58 +02:00
Robert Habermeier
1e2cdedc9b
merge with master
2016-09-06 15:41:56 +02:00
Arkadiy Paronyan
5c5d9c8ccd
Snapshot sync ( #2047 )
...
* PV64 sync
* Tests
* Client DB restore
* Snapshot restoration over IPC
* Upating test
* Minor tweaks
* Upating test
2016-09-06 15:31:13 +02:00
Robert Habermeier
09bc675e6a
address grumbles
2016-09-05 22:59:34 +02:00
debris
aa8b871e49
handling invalid spec jsons properly, additional tests, closes #1840
2016-09-05 17:41:34 +02:00
Robert Habermeier
f0ef5e6943
keep snapshot watcher alive
2016-09-05 14:25:56 +02:00
Tomasz Drwięga
e2377dd510
Merge branch 'master' into dapps-sync
...
Conflicts:
dapps/src/handlers/fetch.rs
2016-09-05 08:43:07 +02:00
Nikolay Volf
2fc70902e7
further tweaking of ipc entities lifecycle
2016-09-03 11:31:29 +03:00
Robert Habermeier
a0541738ab
disabling of periodic snapshots with the --no-periodic-snapshot flag
2016-09-02 20:30:06 +02:00
Robert Habermeier
1c450f616d
register the watcher as a ChainNotify
2016-09-02 18:48:07 +02:00
Robert Habermeier
bb6243c550
merge with master
2016-09-01 15:07:06 +02:00
Robert Habermeier
74ffcff99c
port parity itself
2016-09-01 14:55:07 +02:00
Nikolay Volf
3439c06a1c
Synchronization tweaks for IPC services ( #2028 )
...
* using sequentally consistent checks
* making shutdown method synchronous
* redndant line
2016-09-01 12:04:19 +02:00
Tomasz Drwięga
89f1444c51
Displaying special page when syncing. 404 instead of redirection
2016-09-01 11:16:19 +02:00
Nikolay Volf
efc846bb3e
Control service for IPC ( #2013 )
...
* hypervisor extension
* sorted with shutdown-wait
* hypervisor lifecycle alter
2016-08-30 14:05:02 +02:00
Marek Kotewicz
6da60afaba
Merge pull request #2005 from ethcore/dapps-hosts
...
CLI for valid hosts for dapps server
2016-08-29 16:58:09 +02:00
Nipunn Koorapati
4389742ca3
Make the block header struct's internals private ( #2000 )
...
* Make the block header struct's internals private
Currently, this involves a lot of explicit cloning, but we
could migrate the return types of the get_* functions to
be copies rather than references since they are mostly copy
types anyway.
I opted to eliminate the constructor in favor of using
Default::default() plus calling a bunch of setters. This
is similar to the model that a Google Protobuf client uses
and I think it looks fine.
* Drop some unnecessary cloning by comparing references
* Fix compiler errors from callsites in tests.
2016-08-29 11:35:23 +02:00
Robert Habermeier
1c19a807d9
Take control of recovered snapshots, start restoration asynchronously ( #2010 )
...
* take control of given snapshot
* start snapshot restoration asynchronously,
2016-08-25 22:20:44 +02:00
Robert Habermeier
b18407b9e3
Snapshot optimizations ( #1991 )
...
* apply RLP compression to abridged blocks
* add memorydb consolidate
* code hash optimization
* add warning to snapshot restoration CLI
2016-08-25 14:28:45 +02:00
Tomasz Drwięga
0baa8a53a5
dapps-hosts configuration
2016-08-25 09:00:05 +02:00
Nikolay Volf
d631162440
Stratum IPC service ( #1959 )
...
* boot binaries reorg & helpers
* stratum ipc service
* spaces in cli
2016-08-24 18:35:38 +02:00
Tomasz Drwięga
124a5da75e
Resolving URLs from contract ( #1964 )
...
* Fetching dapp from github.
* Unpacking dapp
* Removing hardcodes
* Proper Host validation
* Randomizing paths
* Splitting into files
* Serving donwloaded apps from different path
* Extracting URLHint to separate module
* Whitespace and docs
* Resolving from URLHint contract
* Fixing test
* Resolving githubhint url from registrar
* Proper redirections
* Fixing test
* fixing ethstore [ci skip]
* Correct version of registrar
* Removing superfluous Box
2016-08-23 19:28:21 +02:00
Tomasz Drwięga
59ede63eda
CLI for Signer interface ( #1980 )
...
* # This is a combination of 2 commits.
# The first commit's message is:
CLI to specify signer interface
# This is the 2nd commit message:
Fixing paths on windows
* CLI to specify signer interface
2016-08-23 16:53:24 +02:00
Nikolay Volf
f2be2aec68
Merge pull request #1983 from ethcore/ipc-rel-dir
...
Use relative path for IPC sockets
2016-08-23 16:36:23 +04:00
Gav Wood
35ecb396b6
Market-orientated transaction pricing ( #1963 )
...
* Market-orientated transaction pricing
Avoid a strict gas-limit and let the market decide through using
a priority queue based around gas pricing for transactions. In
periods of low transaction volume, they'll be processed for a lower
fee.
* Fix tests, add/clarify documentation, fix some logic.
* Change default to reflect CLI.
* Specify type.
* Make test more precise.
* Fix doc test
2016-08-23 13:30:33 +02:00
Chiu-Hsiang Hsu
869803f60e
Fix open on FreeBSD
2016-08-23 13:53:27 +08:00
Nikolay Volf
7c5435d3bb
fix to use relative socket path
2016-08-22 19:41:58 +03:00
Tomasz Drwięga
f69b3f8522
Create network-specific nodes files ( #1970 )
2016-08-21 11:23:47 +02:00
Nikolay Volf
34de330ed9
remove binaries from hypervisor ( #1960 )
2016-08-19 14:49:58 +02:00
Robert Habermeier
9adf77581c
move column family constants into db module ( #1955 )
2016-08-18 18:24:49 +02:00
Tomasz Drwięga
bcf6b0b7d8
Bump clippy, fix warnings ( #1939 )
...
* Bumping clippy
* Fixing warnings
2016-08-17 16:06:41 +02:00
Arkadiy Paronyan
e2cf8a894f
DB WAL size limit ( #1935 )
...
* Limit WAL size
* Check pruning by db modification date (#1924 )
2016-08-17 15:55:26 +02:00
Gav Wood
ca54b8e493
RPC for importing geth keys ( #1916 )
...
* Address book for local addresses.
* Simple disk-backed address book.
* Add test and keep file with keys.
* View and import Geth keys.
* Fix test.
* Fix up author info.
[ci:skip]
2016-08-11 18:31:28 +02:00
Tomasz Drwięga
f114a933a3
Peers RPC + UI displaying active/connected/max peers ( #1915 )
...
* Peers API
* Bumping Parity-UI
* Fixing tests
2016-08-11 17:19:20 +02:00
Nikolay Volf
588529e578
polling & connection timeouts ( #1910 )
2016-08-10 21:07:01 +02:00
Tomasz Drwięga
a427208f79
Purging .derefs, fixing clippy warnings. ( #1890 )
...
* Fixing clippy warnings
* Purging derefs
* Simplifying engine derefs
* Simplifying more engine derefs
2016-08-10 16:29:40 +02:00
Nikolay Volf
4ae83f3004
Fix ipc compilation and add ipc feature to test targets ( #1902 )
...
* fix compilation and add it to the ci run
* no separator?
* use quotes and spaces
2016-08-10 13:06:24 +02:00
NikVolf
dcdd42fec4
fix regression with geth dir
2016-08-09 18:59:01 +03:00
Robert Habermeier
2f1ade8116
take snapshot at specified block and slightly better informants ( #1873 )
...
* prettier informant for snapshot creation
* allow taking snapshot at a given block
* minor tweaks
* elaborate on cli
2016-08-08 18:41:30 +02:00
Robert Habermeier
e72fc5398a
miner and client take spec reference ( #1853 )
...
* miner and client take spec reference
* fix tests
2016-08-05 23:33:55 +02:00
Arkadiy Paronyan
2f52425387
Unlock account with timeout for geth compatibility ( #1854 )
...
* Unlock account with timeout for geth compatibility
* Fixed test
2016-08-05 23:33:14 +02:00