grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,428 Commits 1 Branch 329 Tags 59 MiB
097815cb71
Commit Graph

1056 Commits

Author SHA1 Message Date
Gav Wood
d455ac4a40
Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc 2016-12-15 17:12:18 +01:00
Gav Wood
db2e1dd01a
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 17:11:22 +01:00
Gav Wood
817a58cf64 Merge pull request #3844 from ethcore/trace-macros 
Converting traces API to AutoArgs
 2016-12-15 15:21:35 +01:00
Gav Wood
0da564a4c2 Merge branch 'master' into cli-rpc 2016-12-15 14:45:15 +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
db73b0d66f
Merge remote-tracking branch 'origin/master' into dapps-accounts-rpc 2016-12-15 13:28:37 +01:00
Tomasz Drwięga
d2b9bc5bd8 Traces to AutoArgs 2016-12-14 20:09:14 +01:00
Tomasz Drwięga
6e51b23e30 Adding traces tests 2016-12-14 20:07:33 +01:00
Tomasz Drwięga
1d80725f66 Merge branch 'master' into cli-rpc 2016-12-14 14:12:27 +01:00
Tomasz Drwięga
7eb9112613 Merge branch 'master' into rotating-key 
Conflicts:
	rpc/src/v1/traits/signer.rs
 2016-12-14 14:10:44 +01:00
Gav Wood
c6281fc1c7
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-13 17:26:09 +01:00
Tomasz Drwięga
65d62ccf04 Altering the order [ci:skip] 2016-12-13 14:59:19 +01:00
Tomasz Drwięga
f47be50843 Using jsonrpc-macros 2016-12-13 14:40:35 +01:00
Tomasz Drwięga
5affefc763 Fixing CLI signer 2016-12-13 12:17:01 +01:00
Gav Wood
ab4d666681
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-12 16:35:11 +01:00
Gav Wood
7975d475e1
Flesh out RPC tests. 2016-12-12 04:29:55 +01:00
Gav Wood
c0a2d5c8f5 Merge pull request #3796 from ethcore/tx-broadcast 
Avoid broadcasting transactions to peers that send them
 2016-12-12 04:13:56 +01:00
Gav Wood
2844a4e85e Merge pull request #3800 from ethcore/eth-sign 
eth_sign RPC now hashes given data instead of getting the hash
 2016-12-12 04:12:27 +01:00
Gav Wood
4c9ea55e49
Add an Updater mockup and provide a test for it. 2016-12-12 03:49:50 +01:00
Gav Wood
758744449f
Expose all other RPCs. 2016-12-12 02:57:19 +01:00
Gav Wood
2d0d4682ad
Add first Updater RPC. 2016-12-11 23:36:38 +01:00
Gav Wood
d81d9d77b2
Wire-in Updater to parity RPC 2016-12-11 23:15:52 +01:00
Gav Wood
94f5501c61
authors & homepage => Parity 2016-12-11 19:43:58 +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
Tomasz Drwięga
627b8a8414 Changing default policy 2016-12-11 17:56:12 +01:00
Tomasz Drwięga
b56f12adc6 Merge branch 'master' into tx-broadcast 
Conflicts:
	ethcore/light/src/net/context.rs
	ethcore/light/src/net/tests/mod.rs
 2016-12-11 17:31:56 +01:00
arkpar
a49ff3fb32 Merge branch 'master' of github.com:ethcore/parity into cli-rpc 2016-12-11 13:30:48 +01:00
arkpar
2c653d2c2e Merge w master 2016-12-11 13:11:08 +01:00
Tomasz Drwięga
19ca9ad460 Prevent broadcasting transactions to peer that send them. 2016-12-10 21:22:19 +01:00
Tomasz Drwięga
08a47ea2d4 Allow modifications of gas when confirming in signer (#3798) 2016-12-10 20:18:42 +01:00
Tomasz Drwięga
9b5fd93290 removing println [ci:skip] 2016-12-10 20:07:12 +01:00
Tomasz Drwięga
76a93d4eff eth_sign RPC now hashes given data 2016-12-10 20:01:04 +01:00
Tomasz Drwięga
e66157f922 fixing test 2016-12-10 16:40:32 +01:00
Tomasz Drwięga
704054ef40 Merge branch 'master' into tx-broadcast 
Conflicts:
	ethcore/src/client/traits.rs
 2016-12-10 15:23:53 +01:00
Tomasz Drwięga
e1ade5b375 Maintaining a list of transactions propagated from other peers 2016-12-10 15:18:44 +01:00
Tomasz Drwięga
27503e8e8c Merge branch 'master' into rotating-key 
Conflicts:
	ethstore/src/ethstore.rs
	ethstore/src/secret_store.rs
 2016-12-10 15:13:58 +01:00
Tomasz Drwięga
4696d7f606 Additional RPCs for dapps accounts management 2016-12-10 12:36:04 +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
1d0ccb1c30 Move format_ether into transaction_request.rs 2016-12-09 22:26:08 +01:00
Kristoffer Ström
68df68ca1d Use Signer mock from the signer crate 2016-12-09 22:26:08 +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
4e3f8bab10 Add Ws Json rpc client and command line utils 2016-12-09 22:26:05 +01:00
Tomasz Drwięga
3ccdb7c143 Fixing unused imports 2016-12-09 10:52:42 +00:00
Tomasz Drwięga
93230dd4c2 Merge branch 'master' into rotating-key 
Conflicts:
	ethcore/src/account_provider/mod.rs
	rpc/src/v1/types/mod.rs.in
 2016-12-09 07:37:34 +00:00
Gav Wood
2d6656fc43 Merge pull request #3725 from ethcore/engine-password 
Make engine hold AccountProvider
 2016-12-08 20:52:12 +01:00
Robert Habermeier
de4715bc67 Merge pull request #3732 from ethcore/jg-duplicate-accounts 
Give accounts precedence over address_book entries
 2016-12-08 12:27:26 +01:00
Arkadiy Paronyan
15ec63750e Enable Panic=abort (#3423) 
* Enable panic=abort

* Update remaining crate versions to 1.5

* Run tests in release mode

* Enable panic=abort for release profile only

* Added travis_wait

* Travis timeout set to 40
 2016-12-08 11:31:57 +01:00
Jaco Greeff
dba8cf3a3b Add test for RPC side 2016-12-07 17:58:22 +01:00
Jaco Greeff
46840d36c9 Add parity_removeAddress RPC 2016-12-07 16:53:46 +01:00
Jaco Greeff
21a3cf7b65 Swap order of addressbook & acocunts merge 2016-12-07 11:44:45 +01:00
keorn
0a2ec319ac rename to engine_signer 2016-12-05 21:31:38 +00:00
keorn
46dd2543e5 rename rpc to match cli 2016-12-05 19:27:24 +00:00
Gav Wood
ff7b918d82
Fix build. 2016-12-05 10:55:53 -08:00
Gav Wood
5e1fdc4b11
Merge remote-tracking branch 'origin/master' into fix-tx-rpc 2016-12-05 10:44:19 -08:00
keorn
529a7fc33c add password and AccountProvider 2016-12-05 17:08:16 +00:00
Gav Wood
43ec3d8f79
network_id -> u64 2016-12-05 06:54:31 -08:00
Gav Wood
1dd13372b6
Merge remote-tracking branch 'origin/master' into rpc-middleware 2016-12-01 19:43:31 -08:00
Gav Wood
d3e684698a
Merge remote-tracking branch 'origin/master' into fix-tx-rpc 2016-11-30 17:15:05 -08:00
Gav Wood
c630fc5c1c Merge pull request #3642 from ethcore/confirmation 
Splitting serialization of signTransaction and sendTransaction confirmation requests
 2016-12-01 01:09:07 +00:00
Tomasz Drwięga
dcb7e1e638 Implementing RPC 2016-11-30 17:08:45 +01:00
Tomasz Drwięga
022ccb5bce Fixing tests 2016-11-30 16:33:42 +01:00
Tomasz Drwięga
c028f106b1 RPC for confirming with token 2016-11-30 16:11:41 +01: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
Gav Wood
63c28253d8
Merge remote-tracking branch 'origin/master' into fix-tx-rpc 2016-11-29 15:37:49 +01:00
Gav Wood
0e0bdc8ae9
Deduplicate code. 2016-11-29 13:48:28 +01:00
Gav Wood
436016ef02
Introduce to_hex() utility in bigint. Fix tests. 2016-11-29 13:46:06 +01:00
Gav Wood
1166013c2b Merge pull request #3662 from ethcore/strict-rpc 
Strict deserialization
 2016-11-29 12:10:31 +01:00
Tomasz Drwięga
44314c5d02 Merge branch 'master' into clippy-bump 
Conflicts:
	rpc/src/v1/types/filter.rs
 2016-11-29 11:56:55 +01:00
Tomasz Drwięga
24f72716b9 Strict deserialization 2016-11-28 17:55:46 +01:00
Tomasz Drwięga
424638f89d Unlock expecting quantity 2016-11-28 17:15:40 +01:00
Tomasz Drwięga
2b3d100de2 Fixing some clippy warnings 2016-11-28 15:54:22 +01:00
Tomasz Drwięga
e1e7886918 Bumping clippy 2016-11-28 12:23:06 +01:00
Tomasz Drwięga
3e69ff0b88 Separating serialization of send and signTransaction 2016-11-28 11:41:46 +01:00
arkpar
fa45413a90 Extened API 2016-11-28 01:37:25 +01:00
arkpar
b0555fbe7c State export 2016-11-28 01:37:24 +01:00
Gav Wood
0cf8db58b8
Fix tests. 2016-11-27 14:49:30 +01:00
Gav Wood
3b6d886860
Fix up the transaction JSON serialisation for RPC. 2016-11-27 14:11:37 +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
Tomasz Drwięga
789d6608cf Bumping jsonrpc 2016-11-25 16:16:24 +01:00
Gav Wood
6c686023e0 Use tester.accounts 2016-11-23 20:37:35 +01:00
Gav Wood
9f3a042f55 Update message 2016-11-23 20:16:33 +01:00
Tomasz Drwięga
cd6f565f69 RPC Middleware & Get/Set dapp-specific accounts 2016-11-23 16:27:05 +01:00
Gav Wood
2d9369e5ba
Introduce test. 2016-11-21 11:03:18 +01:00
Gav Wood
2b8bed434c
RPC for deleting accounts. 2016-11-20 16:17:57 +01:00
Gav Wood
0848a9ec3c
Merge branch 'master' into transactions-propagate 2016-11-20 13:24:08 +01:00
Gav Wood
c4f2b71f1b Merge pull request #3503 from ethcore/signTransaction-format 
Correct format of eth_signTransaction
 2016-11-19 02:58:53 +08:00
Tomasz Drwięga
5897e01dbd Correct format of eth_signTransaction 2016-11-18 11:03:29 +01:00
Gav Wood
e02d4d9205
Fix test. 2016-11-17 23:39:48 +08:00
Tomasz Drwięga
5c62e38a7c Cleanup 2016-11-17 13:52:09 +01:00
Tomasz Drwięga
2cd2b10327 Local transactions RPC 2016-11-16 17:54:54 +01:00
Tomasz Drwięga
78b5c743f6 Stats RPC 2016-11-16 13:54:58 +01:00
Tomasz Drwięga
2f98169539 In-browser signing support (#3231) 
* Signer RAW confirmations

* Returning address book as eth_accounts

* UI support for in-browser signing

* Post review fixes

* Adding new methods to jsonrpc

* Fixing eth_accounts

* Deterministic accounts ordering
 2016-11-10 11:27:05 +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
Tomasz Drwięga
b33b237f76 Refactoring Signer to auto_args + eth_signTransaction (#3261) 
* Sign transaction initial

* Refactoring signer to auto_args
 2016-11-09 13:13:35 +01: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
501b2cdd18 Add error for sendRawTransaction and estimateGas (#3194) 
* sendRawTransaction invalid RLP error

* Returning proper error for estimate_gas
 2016-11-04 18:33:10 +01:00
Tomasz Drwięga
f31d42d0c5 Exposing engine extra info in block RPC (#3169) 
* Exposing extra info in RPC

* Proper serialization and client trait API
 2016-11-04 17:35:02 +01:00
Arkadiy Paronyan
d37f4cc82f v1.5 (#3195) 2016-11-04 17:27:11 +01:00
Tomasz Drwięga
145e766db2 Fixing possible race condition in ethcore_hashContent (#3191) 2016-11-04 16:59:42 +01:00
Tomasz Drwięga
2e47842d66 Exposing state root and logsBloom in RPC receipts (#3174) 2016-11-04 12:33:13 +01:00
Tomasz Drwięga
7ff73a9533 Exposing v,r,s from transaction signature in RPC (#3172) 2016-11-04 12:05:10 +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
keorn
36d17d5c28 Add RPC enode lookup (#3096) 
* add enode rpc

* spaces -> tabs
 2016-11-02 19:43:21 +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
Tomasz Drwięga
ff90fac125 Moving personal_ to autoargs (#3000) 2016-10-31 17:11:56 +01:00
Gav Wood
547871f933 RPCs for mode change (#3002) 
* Allow warnings.

* Add RPCs to allow ad-hoc mode changes.

* Add the JSAPI interfaces

* Add missing file.
 2016-10-31 16:58:35 +01:00
keorn
7af20a5db0 Modify gas price statistics (#2947) 
* gas price distribution + median + tests

* put histogram in util

* use the util histogram

* remove the default gas price implementation

* histogram rpc

* fix empty corpus

* Add JS ethcore_gasPriceHistogram

* Fix typo (s/types/type/) & subsequent failing test

* Fix return type & formatting

* bucketBounds

* Add jsapi e2e test verification
 2016-10-31 12:57:48 +01:00
Jaco Greeff
8d66fc50e2 Add import of raw private key RPCs (#2942) 
* Importing an account from raw secret

* Add jsapi & jsonrpc for personal_newAccountFromSecret
 2016-10-28 16:46:25 +02:00
Tomasz Drwięga
0f0334275e Validating minimal required gas for a transaction (#2937) 
* Validating minimal required gas for a transaction

* Adding RPC case and note

* Fixing whitespace [ci skip]
 2016-10-28 16:42:24 +02:00
Tomasz Drwięga
07fca24b44 Next nonce RPC (#2917) 2016-10-27 19:29:55 +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
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
88997801d0 Clippy bump (#2877) 
* Bumping clippy

* Fixing warnings

* Fix the "fix"
 2016-10-27 08:28:12 +02:00
Tomasz Drwięga
e5f86c62ad Dapps port RPC (#2819) 2016-10-24 12:21:15 +02:00
Gav Wood
37a2ee98de Additional RPCs for password management (#2779) 
* Add personal_testPassword and stub for personal_changePassword

* Add change-password functionality.

* Address grumble.

* Update tests.

* Update build.
 2016-10-22 14:24:02 +01: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
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
Tomasz Drwięga
709f00ceb7 Fixing compilation without default features (#2638) 
* Fixing compilation without default features

* Removing unused import
 2016-10-16 00:20:11 +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
Tomasz Drwięga
03c1559ead Support for decryption in Signer (#2421) 
* Adding some tests

* Implementing decrypt in queue

* Removing code duplication.

* Printing public key in ethstore

* Bump UI

* Normalizing dapps format for signer.

* Fixing tests compilation

* fix whitespace

[ci:skip]
 2016-10-15 14:44:08 +02:00
Gav Wood
85eeb3ea6e EIP150.1c (#2591) 
* EIP150.1b first part.

* Add documentation.

[ci:skip]

* Tweak comment

* Fix some tests.

* Fix create

* Add the new EIP150 test. (#2563)

* Fix create some more.

* Another fix for create.

* Final fixes.

* Enable EIP150 test.

* Revert the costly suicides to respect EIP150.1b.

* Fixups for EIP150.1c

* Update tests.

* Updating tests

* Adding state tests

* Updating tests

* Updating HF block

* Removing flushln [ci:skip]

* Commenting out suicide test

* New tests.

* Switch to EIP tests.

* Rename some stuff, combine transition tests.

* Fix U256 overflows.

* Name cleanups and an effort to fix tests.

* Rename back for clarity.

* Fix non-EIP-150 OOG CALLs

* New transition block number & additional EIP150 tests

* Morden transition block set; Tests updated

* Added missing test
 2016-10-15 14:39:15 +02:00
Svyatoslav Nikolsky
c9ce25c8f3 Added peers details to ethcore_netPeers RPC (#2580) 
* added peers details to ethcore_netPeers RPC

* fixed build (traits autoimplemented)

* - documentation fixes
- spaces -> tabs
- Rust-way Option's handling

* prepare for new protocols in ethcore_netPeers

* commas & documentation
 2016-10-12 20:18:59 +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
keorn
271bcf4d5d Return errors from eth_call RPC (#2498) 
* propagate call errors

* add error code for execution error
 2016-10-09 11:45:12 +02:00
Tomasz Drwięga
4655fd04a5 Using pending block only if not old (#2514) 2016-10-07 11:13:15 +01:00
Tomasz Drwięga
d9ca01cb6b Fixing RPC Filter conversion to EthFilter (#2500) 2016-10-07 09:18:32 +02:00
Tomasz Drwięga
0c7a28779d Fixing error message for transactions (#2496) 2016-10-06 20:35:31 +02:00
Robert Habermeier
b7814fa65c Port a couple more RPC APIs to the new auto args (#2325) 
* add auto-args deserialization for RPC

* make block param member public

* change BlockParam to a more generic Trailing<T> mechanism

* define work type

* build_rpc_trait macro, implement eth protocol

* fix up tests

* move eth_filter API to new macro

* port ethcore module to new rpc macro

* port ethcore_set to auto_args

* port net RPC to auto_args

* port rpc meta api to new

* skeleton for async RPC auto_args

* macro implementations for strongly-typed async RPC wrapper

* clarify docs

* reflect new required Rust version in README

[ci skip]
 2016-10-04 19:05:46 +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
Arkadiy Paronyan
0dcdaa7a2a Jumptable cache (#2427) 
* Jumptable cache

* Updated registrar address
 2016-10-02 18:45:36 +02:00
Robert Habermeier
eb4e00114c fix broken beta compilation 2016-09-29 17:55:39 +02:00
Gav Wood
948b614f40 Fix the traceAddress field in transaction traces. (#2373) 
* Fix the traceAddress field in transaction traces.

* Add test

* Fix warning.

* Fix test

* Additional fix.

* Fix tests content.
 2016-09-28 17:24:26 +02:00
Tomasz Drwięga
d7bbc5cc3f Hash Content RPC method (#2355) 
* Moving file fetching to separate crate.

* ethcore_hashContent

* Tests running on mocked fetch.

* Limiting size of downloadable assets
 2016-09-27 16:27:06 +02:00
Gav Wood
3fb3f1f54e Reorder transaction_by_hash to favour canon search (#2332) 
* Reorder transaction_by_hash to favour canon search

* Fix build.

* Slightly cleaner function.

* Fix test.
 2016-09-27 12:17:02 +02:00
Tomasz Drwięga
2135ba467c Error when deserializing invalid hex (#2339) 
Conflicts:
	rpc/src/v1/types/bytes.rs
 2016-09-27 11:26:23 +02:00
Robert Habermeier
fe4f10382b Merge pull request #2292 from ethcore/txqueue 
Tx Queue improvements
 2016-09-26 18:29:29 +02:00
Tomasz Drwięga
92451ef268 Lenient bytes deserialization (#2036) 
* Lenient bytes deserialization

* Printing warning
 2016-09-26 15:55:44 +02:00
Tomusdrw
4acd6cbe3b Fixing tests 2016-09-26 12:24:52 +02:00
Tomasz Drwięga
3e474216ac Peek transaction queue via RPC (#2270) 
* Handle RLP to string UTF-8 decoding errors (#2217)

* pending transactions

Conflicts:
	rpc/src/v1/impls/ethcore.rs
	rpc/src/v1/traits/ethcore.rs
 2016-09-23 20:53:21 +02:00
Robert Habermeier
ff0be9f361 Separate RPC serialization from implementation (#2072) 
* add auto-args deserialization for RPC

* make block param member public

* change BlockParam to a more generic Trailing<T> mechanism

* define work type

* build_rpc_trait macro, implement eth protocol

* fix up tests

* move eth_filter API to new macro
 2016-09-23 19:42:33 +02:00
Tomasz Drwięga
368aca521b Fails when deserializing non-hex uints (#2247) 2016-09-22 18:02:47 +02:00
Tomasz Drwięga
15488b3e40 Fixing output of eth_call and Bytes deserialization (#2230) 
* Fixing eth_call to builtins

* Fixing bytes deserialization

* Removing comment
 2016-09-22 14:50:00 +02:00
Gav Wood
07b5e9a5c7 Encryption, decryption and public key RPCs. (#1946) 
* Fix up pending receipts details.

* Add support for additional params and registry over RPC.

* Fix tests.

* Add test, additional fix.

Fixes #1932.

* Fix up tests.

* Fix test.

* Fix test.

* Remove unused use.

* Add encryption, decryption and public-key RPCs.

* Remove &
 2016-09-22 14:48:22 +02:00
Tomasz Drwięga
8c111da70b Limit for logs filter. (#2180) 
* Limit for logs filter.

* Moving limit inside the filter object

* Fixing tests
 2016-09-21 11:51:10 +01: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
Tomasz Drwięga
9ed9857fba Logs limit & log_index bug (#2073) 
* Limiting number of logs

* Test for logs

* Fixing logs ordering and indexing

* Fixing sort

* unwrap -> expect

* Revert "unwrap -> expect"

This reverts commit e99e6e77f37692fe568448e768aa72775de8d0cd.
 2016-09-14 12:02:30 +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
debris
61d3d74934 fixed compiling rpc tests 2016-09-07 10:36:18 +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
Marek Kotewicz
da2c2e5fc6 facelift for traces, added errors (#2042) 
* evm errors facelift

* facelift for traces, added errors with description

* additional tests for traces json serialization
 2016-09-05 11:56:44 +02:00
Robert Habermeier
e0feaa9d4d Merge pull request #2034 from ethcore/rlp-crate 
rlp as separate crate
 2016-09-02 13:48:09 +02:00
Tomasz Drwięga
e2e6b11dc7 Fixing uint serialization (#2037) 2016-09-02 11:38:15 +02:00
Robert Habermeier
bb6243c550 merge with master 2016-09-01 15:07:06 +02:00
Robert Habermeier
d763664d16 port network, sync, rpc 2016-09-01 14:49:12 +02:00
Tomasz Drwięga
b4f3c4bd7a Asynchronous RPC support (#2017) 
* Async RPC

* Limiting number of transactions in queue

* Fixing tests

* Bumping serde and jsonrpc-core

* serde updated to 0.8

* fixed failing tests

* Bumping ipc server

* Fixing API for endpoints

* Experimenting with tests without --release mode
 2016-09-01 12:00:00 +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
Marek Kotewicz
b0d462c6c9 Signature cleanup (#1921) 
* Address renamed to H160 at bigint library level

* moved uint specific test from util to bigint library

* naming

* unifing hashes in progress

* unifing hashes

* cleanup redundant unwraps in tests

* Removing util/crypto in progress.

* fixed compiling

* signature cleanup in progress

* new module - ethcrypto used by ethstore and ethcore-network

* fixed compiling

* fixed compiling

* fixed merge
 2016-08-24 18:35:21 +02:00
Nipunn Koorapati
3dd1bdda50 Improve eth_getWork timeout test rpc_get_work_should_timeout (#1992) 2016-08-24 13:20:15 +02:00
Nipunn Koorapati
2a550c2adf Add timeout for eth_getWork call (#1975) 2016-08-23 17:07:00 +02:00
Tomasz Drwięga
f4826d1b2a Bump clippy (#1982) 2016-08-23 10:10:19 +02:00
Tomasz Drwięga
6cb439fbc8 Fixing serde overflow error (#1977) 2016-08-23 10:10:12 +02:00
Tomasz Drwięga
d996754927 Getting rid of syntex 2016-08-19 14:26:03 +02:00
Gav Wood
ccdf80f4dc Fix several RPCs (#1926) 
* Fix up pending receipts details.

* Add support for additional params and registry over RPC.

* Fix tests.

* Add test, additional fix.

Fixes #1932.

* Fix up tests.

* Fix test.

* Fix test.
 2016-08-17 19:25:02 +02:00
Tomasz Drwięga
bcf6b0b7d8 Bump clippy, fix warnings (#1939) 
* Bumping clippy

* Fixing warnings
 2016-08-17 16:06:41 +02:00
Marek Kotewicz
c39761c042 ethkey and ethstore use hash structures from bigint (#1851) 
* Address renamed to H160 at bigint library level

* moved uint specific test from util to bigint library

* naming

* unifing hashes in progress

* unifing hashes

* cleanup redundant unwraps in tests

* fixed compiling
 2016-08-15 15:09:00 +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
Gav Wood
6ab78a0091 RPC for deriving address from phrase. 
Fixed #1911
 2016-08-10 21:23:17 +02:00
Gav Wood
286b67d54b Wallet rpcs (#1898) 
* Add wallet RPCs.

* Add wordlist file.

* Add standard brain wallet tests.

* Allow import of JSON wallets.

* Address grumble.
 2016-08-10 17:57:40 +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
7f5c178b1c Merge pull request #1886 from ethcore/ver-bump 
v1.4.0 in master
 2016-08-09 17:15:01 +03:00
arkpar
69d1c1f237 v1.4.0 2016-08-09 11:40:57 +02:00
debris
974d537849 Merge branch 'master' of github.com:ethcore/parity into move_hash 2016-08-09 09:58:18 +02:00
Tomasz Drwięga
59b0f8c7a3 RPC errors & logs (#1845) 
* Refactoring errors in RPC

* Updating jsonrpc-core

* Fixing code_at

* Avoid mentioning obvious segments in proof

[ci:skip]
 2016-08-08 17:25:15 +02:00
debris
88c5f555a9 Merge branch 'master' of github.com:ethcore/parity into move_hash 2016-08-06 00:03:07 +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
Robert Habermeier
76a7246369 Snapshot creation and restoration (#1679) 
* to_rlp takes self by-reference

* clean up some derefs

* out-of-order insertion for blockchain

* implement block rebuilder without verification

* group block chunk header into struct

* block rebuilder does verification

* integrate snapshot service with client service; flesh out implementation more

* initial implementation of snapshot service

* remove snapshottaker trait

* snapshot writer trait with packed and loose implementations

* write chunks using "snapshotwriter" in service

* have snapshot taking use snapshotwriter

* implement snapshot readers

* back up client dbs when replacing

* use snapshot reader in snapshot service

* describe offset format

* use new get_db_path in parity, allow some errors in service

* blockchain formatting

* implement parity snapshot

* implement snapshot restore

* force blocks to be submitted in order

* fix bug loading block hashes in packed reader

* fix seal field loading

* fix uncle hash computation

* fix a few bugs

* store genesis state in db. reverse block chunk order in packed writer

* allow out-of-order import for blocks

* bring restoration types together

* only snapshot the last 30000 blocks

* restore into overlaydb instead of journaldb

* commit version to database

* use memorydbs and commit directly

* fix trie test compilation

* fix failing tests

* sha3_null_rlp, not H256::zero

* move overlaydb to ref_overlaydb, add new overlaydb without on-disk rc

* port archivedb to new overlaydb

* add deletion mode tests for overlaydb

* use new overlaydb, check state root at end

* share chain info between state and block snapshotting

* create blocks snapshot using blockchain directly

* allow snapshot from arbitrary block, remove panickers from snapshot creation

* begin test framework

* blockchain chunking test

* implement stateproducer::tick

* state snapshot test

* create block and state chunks concurrently, better restoration informant

* fix tests

* add deletion mode tests for overlaydb

* address comments

* more tests

* Fix up tests.

* remove a few printlns

* add a little more documentation to `commit`

* fix tests

* fix ref_overlaydb test names

* snapshot command skeleton

* revert ref_overlaydb renaming

* reimplement snapshot commands

* fix many errors

* everything but inject

* get ethcore compiling

* get snapshot tests passing again

* instrument snapshot commands again

* fix fallout from other changes, mark snapshots as experimental

* optimize injection patterns

* do two injections

* fix up tests

* take snapshots from 1000 blocks efore

* address minor comments

* fix a few io crate related errors

* clarify names about total difficulty

[ci skip]
 2016-08-05 17:00:46 +02:00
debris
316c9093db Merge branch 'master' of github.com:ethcore/parity into move_hash 2016-08-05 10:53:34 +02:00
Arkadiy Paronyan
05bfdc508e Split IO and network crates (#1828) 
* Abort on panic

* Split IO and network crates

* Restore panic handler

* Fixed doc tests
 2016-08-05 10:32:04 +02:00
debris
1ed2de1d9b Merge branch 'master' of github.com:ethcore/parity into move_hash 2016-08-05 09:30:01 +02:00
Nikolay Volf
aa59aa439d Fix state not using "account_starting_nonce" (#1830) 
* failng test

* use account_starting_nonce instead of zero

* simplier test

* jsons are getting closer

* incorrect test client and incorrect tests fix

* null_morden is using 0x0 starting nonce

* replaced json with the correct one

* superwhatever line
 2016-08-04 18:17:39 +02:00
Tomasz Drwięga
25aabe6e52 Supporting blockid in eth_call and trace_call/trace_raw (#1837) 
* Supporting blockid in eth_call and trace_call/trace_raw

* Nicer state diff handling

* Purging deref.deref
 2016-08-04 18:17:21 +02:00
Tomasz Drwięga
979f4e0617 eth_checkTransaction renamed to eth_checkRequest (#1817) 
* Making ConfirmationsQueue a bit more generic [WiP]

* Generalizing cofirmations

* New confirmations types - tests

* Separating transaction type in queue. Closes #1310

* Handling sign requests

* Speeding up tests

* Renaming methods

* eth_postSign

* Bumping ui

* Renaming checkRequest methods, adding tests

* Removing duplicate method [ci skip]

* Remove `_posted`

[ci:skip]

* Remove `_posted`
 2016-08-04 16:42:29 +02:00
debris
4051524462 improved naming 2016-08-04 08:52:31 +02:00
debris
03c3d16744 Merge branch 'master' of github.com:ethcore/parity into move_hash 2016-08-04 08:41:30 +02:00
Tomasz Drwięga
deceb5fd56 Bumping clippy & fixing warnings (#1823) 
* Bumping clippy

* Fixing clippy warnings

* Cargo.lock (latest nightly?)
 2016-08-03 19:01:48 +02:00
debris
e8c451ac82 cleaning up hash reexports 2016-08-03 18:05:17 +02:00
Tomasz Drwięga
c5ffb5af79 No block number in get work while in geth-compat mode. (#1821) 2016-08-03 15:31:00 +02:00
Tomasz Drwięga
9fb5623569 Supporting eth_sign in Signer (#1787) 
* Making ConfirmationsQueue a bit more generic [WiP]

* Generalizing cofirmations

* New confirmations types - tests

* Separating transaction type in queue. Closes #1310

* Handling sign requests

* Speeding up tests

* Renaming methods

* eth_postSign

* Bumping ui
 2016-08-03 10:36:54 +02:00
Gav Wood
9de579366a Miner tweaks (#1797) 
* Mining fixes.

- Use queue to determine whether we're mining
- Kick stale hash rates

Fixes #1794
Fixes #1641

* Fix tests.

* Address grumbles.
 2016-08-02 17:53:32 +01:00
debris
489722b83f dynamic keys pickup 2016-07-31 10:46:28 +02:00
Gav Wood
b29329c3c5 Return storage as H256 from RPC. (#1774) 
* Return storage as H256 from RPC.

* Fix test.
 2016-07-30 14:42:52 -07:00
arkpar
8c47240248 Min and Max peers setting 2016-07-29 17:30:02 +02:00
Marek Kotewicz
9746b944f1 Stackoverflow fix (#1742) 
* executive tracer builds flat traces without intermediate struct

* temporarilt commented out tests for traces

* fixed new way of building trace address

* fixed new way of building trace address

* updating state tests with flat tracing in progress

* fixed flat tracing tests

* fixed compiling ethcore-rpc with new flat traces

* removed warnings from ethcore module

* remove unused data structures
 2016-07-28 20:31:29 +02:00
Gav Wood
eaa41ea568 Add RPC & client call to replay a transaction. (#1734) 
* Add RPC & client call to replay a transaction.

* Address grumbles
 2016-07-27 21:34:32 +02:00
Gav Wood
ccb62d3b55 Trace other types of calls (#1727) 
* Trace through DELEGATECALL and CALLCODE

Add them to the JSON output and RLP database store.

* Fix tests.

* Fix all tests.

* Fix one more test.
 2016-07-27 17:41:21 +02:00
Gav Wood
7cf807d1b4 Various improvements to tracing & diagnostics. (#1707) 
* Various improvements to tracing & diagnostics.

- Manage possibility of `Account` not having code for `PodAccount`
- New RPC: `trace_sendRawTransaction`
- See raw transaction dump when inspecting over RPC

* Fix test

* Remove one of the dupe error messages

* Remove unneeded `&`s

* Reformat and extremely minor optimisation

* Minor optimisation

* Remove unneeded let

* Fix tests.

* Additional fix.

* Minor rename.

[ci:skip]

* Bowing to the pressure.
 2016-07-26 16:48:50 +02:00
Gav Wood
3f841cc578 Name and meta in accounts (#1695) 
* Introduce persistent name() and meta() in SecretStore.

* Quick stash.

* Fix build.

* Add ethcore_set methods.

* Bug fixes for default values.

* Move to personal to ensure set API exposed.

* Add UUID to accounts info.

* Add tests.
 2016-07-24 17:38:21 +02:00
Tomasz Drwięga
aafb014d01 Returning error when transaction is rejected (for consistency) (#1667) 2016-07-22 14:48:05 +02:00
Marek Kotewicz
63dbb527cc Suicides tracing (#1688) 
* tracing suicide

* fixed #1635

* fixed typo
 2016-07-22 14:47:23 +02:00
Tomasz Drwięga
46b5801730 Fixing hash deserialisation (#1674) 2016-07-20 12:42:12 +02:00
Tomasz Drwięga
9c7395a6be Fixing errors returned by sendTransaction* method family (#1665) 2016-07-20 12:37:49 +02:00
Tomasz Drwięga
0cba70fba3 Host validation (again) (#1666) 
* Revert "Revert "Validating Host headers in RPC requests" (#1663)"

This reverts commit 3cc3dbef66.

* Fixing binding on MacOS
 2016-07-20 12:34:17 +02:00
gregg dourgarian
d67369a01c fix typos (#1644) 2016-07-19 20:42:23 +02:00
Gav Wood
861c8d0701 Size for blocks (#1668) 
* Add size field for blocks.

* Ignore invalid test.
 2016-07-19 20:40:18 +02:00
Gav Wood
3cc3dbef66 Revert "Validating Host headers in RPC requests" (#1663) 2016-07-19 13:15:25 +02:00
Tomasz Drwięga
6e79a36ef6 Validating Host headers in RPC requests (#1658) 
* Validating Host headers in RPC requests

* Fixing convention [ci skip]

* Remove extra indent.

[ci:skip]
 2016-07-19 12:53:58 +02:00
Nikolay Volf
459dcbcef1 Removing unused client code (#1645) 
* moving ipc deriving to trait

* refactoring of the client
 2016-07-19 09:21:41 +02:00
Gav Wood
3ba3dd3805 Asynchronous transactions (polling based for now). (#1652) 
* Asynchronous transactions (polling based for now).

- Alter eth_sendTransaction to be async, returning one of:
  - Transaction hash (signed and submitted).
  - Transaction promise ID (< 32 bytes).
  - Zero hash (will never be signed).
- Introduce new JSONRPC eth_checkTransaction.

The new API call takes a single argument - a promise ID. It returns
either:
- Transaction hash (signed and submitted).
- null (still pending, call again later),
- Zero hash (will never be signed).

* New RPC eth_postTransaction

- Restore previous semantics of sendTransaction.
- Introduce eth_postTransaction.
- Some refactoring.

* Fix minor lockup.

* Use TransientHashMap to prevent leak.
 2016-07-19 09:19:58 +02:00
NikVolf
028d6f6853 Merge branch 'master' into sync-svc 2016-07-18 15:20:57 +02:00
Gav Wood
0d2f516ad7 Multi-mode logging. (#1643) 
* Multi-mode logging.

Better for miners (they get immediate notification of new block).
Better for general use (less superfluous information shown).

* Remove comment.

[ci:skip]

* Minor string change

[ci:skip]

* Minor message tweak.

* Minor tweaks and indentation fix.
 2016-07-17 23:00:57 +02:00
Arkadiy Paronyan
5dba43178b Removed DAO soft fork traces (#1639) 2016-07-16 19:49:52 +02:00
NikVolf
be25e930e5 Merge branch 'master' into sync-svc 2016-07-16 15:57:30 +02:00
NikVolf
4cb1c906b0 rpc dependencies relayout 2016-07-16 15:51:06 +02:00
Gav Wood
799c69c8d5 DAO hard-fork (#1483) 
* Minor additions to allow resetting of code.

* Add test.

* Provisional DAO hard-fork proposal.

* Change to reflect latest HF spec.

* Include extradata restrictions and overrides.

* Introduce new tests.

* Update tests to new spec format.

* Allow JSON chain spec fields to be optional.

* Remove superfluous definitions. Fix overflow risk.

* Fix build.

* Add missing file.

* Remove old flag.

* Update to latest address set.

* Update tests and test spec to latest.

Change the mining default to release only on own transactions.
 2016-07-16 13:02:56 +02:00
Gav Wood
d14b6871a5 Cleanup of colour code. Use is_a_tty. (#1621) 
* Cleanup of colour code. Use is_a_tty.

* Fix test build.

* Another fix.
 2016-07-15 10:11:14 +02:00
Gav Wood
598833d1ea Fix "pending" parameter on RPC block requests (#1602) 
* Initial commit.

* Pending blocks work.

* Address grumbles.

* Fix up for new API.
 2016-07-14 15:24:12 +02:00
Gav Wood
2b193f00d4 Allow RPC to use solc to compile solidity (#1607) 
* Allow use to use solc to compile solidity.

* Remove unneeded commemt.

[si:skip]

* Address grumble and disable incorrect tests.
 2016-07-14 14:25:44 +02:00
Tomasz Drwięga
6c205067b1 Miner tests (#1597) 
* Un-ignoring RPC test

* Additional tests for importing transactions
 2016-07-14 12:16:53 +02:00
Nikolay Volf
44bc8a08fb Sync IPC interface (#1584) 
* chain notify trait

* replaced network service with io service

* fix ethcore crate warnings

* refactored network service without generic

* ethcore fix

* ethsync refactoring

* proper linking of notify

* manage network interface

* rpc crate rebinding

* full rewire

* sync internal io service

* fix deadlock

* fix warnings and removed async io

* sync imported message propagation

* fix rpc warnings

* binart warnings

* test fixes

* rpc mocks and tests

* fix util doctest

* fix message name and removed empty notifier

* pointers mess & dark mode fixed

* fixed sync doctest

* added few warnings

* fix review

* new convention match

* fix error unwraps

* doctest fix

* basic library re-layout

* missing files to relayout

* duplicating network config on sync level

* binary serializers for config

* ipc endpoint for manage

* ipc endpoint for sync

* handshake sorting out

* sorting out the multi-interface dispatch scenario

* fixing tests

* fix doctest
 2016-07-14 12:07:33 +02:00
Marek Kotewicz
1053f3610c fixed #1606 (#1615) 2016-07-13 21:10:20 +02:00
Robert Habermeier
36d3d0d7d7 replace synchronization primitives with those from parking_lot (#1593) 
* parking_lot in cargo.toml

* replace all lock invocations with parking_lot ones

* use parking_lot synchronization primitives
 2016-07-13 19:59:59 +02:00
Tomasz Drwięga
fbc0e0039a Bump clippy (#1587) 
* Bumping clippy

* Fixing warnings
 2016-07-12 10:34:08 +02:00
Robert Habermeier
7200cfcbc9 expunge &Vec<T> pattern (#1579) 
* expunge &Vec<T> pattern

* fix travis
 2016-07-12 10:28:35 +02:00
Nikolay Volf
d3695d0b72 Major sync <-> client interactions refactoring (#1572) 
* chain notify trait

* replaced network service with io service

* fix ethcore crate warnings

* refactored network service without generic

* ethcore fix

* ethsync refactoring

* proper linking of notify

* manage network interface

* rpc crate rebinding

* full rewire

* sync internal io service

* fix deadlock

* fix warnings and removed async io

* sync imported message propagation

* fix rpc warnings

* binart warnings

* test fixes

* rpc mocks and tests

* fix util doctest

* fix message name and removed empty notifier

* pointers mess & dark mode fixed

* fixed sync doctest

* added few warnings

* fix review

* new convention match

* fix error unwraps

* doctest fix
 2016-07-11 17:02:42 +02:00
Nikolay Volf
e15f631ec7 Some obvious evm & uint optimizations (#1576) 
* fix name and tests for endians

* using renamed func

* zero and sign opt
 2016-07-10 20:18:23 +02:00
Tomasz Drwięga
d7caae2241 Fixing clippy warnings (#1568) 
* Fixing clippy warnings

* Fixing more warnings
 2016-07-10 13:18:33 +02:00
Gav Wood
172553c81e Fix test. 2016-07-09 16:39:59 +02:00
Gav Wood
d4d63a5688 Merge branches 'kill_unwraps' and 'dynamic-gas-price' of github.com:ethcore/parity into dynamic-gas-price 2016-07-09 12:29:06 +02:00
Gav Wood
25e6b2b827 Initial implementation of dynamic gas pricer. 2016-07-08 17:26:06 +02:00
Gav Wood
9f43526c88 Merge branch 'master' into kill_unwraps 2016-07-07 09:40:12 +02:00
Nikolay Volf
8282c7dd50 Client IPC Interface (#1493) 
* btree map serializer

* serde tests

* state diff serialization

* basic layout

* more missing serializaers

* uncle returns rlp

* block queue info

* sorting with transaction result

* sorting out util imports

* transaction import result sorting also

* sorting filters & ranges

* error sorting out

* deriving ipc service compiling

* rpc & sync recompile

* sorting rpc using uncles

* fix compilation

* fix merging bugs

* fix unused imports

* fix all warnings

* tests stub

* some merge bugs

* ethcore compilation

* fix rpc compilation

* deriving attribute

* tests (and fixes)

* rpc test working

* fix warnings again

* rs.in -> rs

* missing attribute

* refactored tree changes

* paste reformat mess fix

* pub mod actually

* intendation fix
 2016-07-07 09:39:32 +02:00
Gav Wood
3b662c285f Switch out .X().unwrap() for .unwrapped_X 2016-07-07 09:37:31 +02:00
Gav Wood
456ad9e21b Remove .lock().unwrap() idiom into locked(). 2016-07-06 19:52:34 +02:00
Nipunn Koorapati
4a9b9dc305 Update sealing just once when externally importing many blocks (#1541) 
Fixes Issue #1372
 2016-07-06 17:15:59 +02:00
Robert Habermeier
f8b56317b4 Merge pull request #1548 from ethcore/remove-soft 
Remove soft-fork stuff.
 2016-07-06 13:05:43 +02:00
Marek Kotewicz
bcb63bce12 serde is no longer util dependency (#1534) 
* removed old json-tests

* simplify folds in triehash.rs

* removed unused json_aid

* removed unused squeeze.rs

* json branching tests for trie

* removing todos from util

* separated UsingQueue and Table

* further cleanup, removing unused code

* serde serialization of hash moved to rpc module

* uint wrapper for rpc in progress

* serialization of uint moved to rpc module

* updated eth-secp256k1

* updated igd, serde is no longer dependency of util

* loading trie consensus tests

* renamed aliases in rpc imports
 2016-07-06 11:23:29 +02:00
Gav Wood
488ff88562 Remove soft-fork stuff. 2016-07-05 18:18:35 +02:00
Gav Wood
c26cfc1c5a Silent running operating modes (#1477) 
* Command=line options.

* Keep alive for the eth protocol.

* Wire up final pieces.

* No network when dark.

* Passive and dark mode work.

* Ensure all RPCs keep alive.

* Fix tests.

* Fix minor bug.

* Minor whitespace.

* Split out some of the sleep-state.

* Fix help text.
 2016-07-05 17:50:46 +02:00
Tomasz Drwięga
5c438cc58a Bumping clippy (#1532) 2016-07-04 11:52:59 +02:00
Nikolay Volf
8102fb9306 Client api cleaning - uncles are returned as rlp (#1516) 
* uncle as rlp in the api

* uncle rlp in block view

* fix warning
 2016-07-01 19:37:17 +01:00
Gav Wood
9c58ebf2d2 Merge branch 'master' into clone-work 2016-06-30 13:16:48 +02:00
Gav Wood
9c07e5c355 Optionally clone block behind work-package. 2016-06-30 12:56:58 +02:00
Gav Wood
92edf7f511 Safe coloured logging. 2016-06-30 08:20:34 +02:00
Gav Wood
86ba6f1912 Fix test compilation. 2016-06-29 22:05:00 +02:00
Gav Wood
dc24448900 Include number in eth_getWork. 2016-06-29 20:09:13 +02:00
Gav Wood
5d1ff3d7ba Introduce options for fine-grained management of work queue. (#1484) 
* Introduce options for fine-grained management of work queue.

- Minimum reseal period between non-mandatory (transaction) reseals.
- Maximum historical cached block size.

Defaults changed to reflect real-world scenarios (2s, 20 blocks).

* Fix test bug.

* 50 -> 20.
 2016-06-29 16:26:19 +02:00
Gav Wood
c096c087df Ensure we don't reject our own transactions for gasprice. (#1485) 
* Ensure we don't reject our own transactions for gasprice.

* Add test.
 2016-06-29 15:23:41 +02:00
Gav Wood
a3758161ac Ensure we always get the latest work when mining on submitted. (#1469) 
* Ensure we always get the latest work when mining on submitted.

* Build fix.

* Smaller timeslices for the wait.
 2016-06-28 18:46:09 +02:00
Arkadiy Paronyan
39307b2bea Merge pull request #1460 from ethcore/miner-improvements 
Allow configuration of when to reseal blocks.
 2016-06-28 13:11:24 +02:00
Tomasz Drwięga
6895a56099 Adding default for value (#1465) 2016-06-28 11:10:39 +02:00
Gav Wood
599a6104b7 Minor renaming. 2016-06-28 10:40:35 +02:00
Gav Wood
31de739122 U256 instead of Option<U256>. Fix up tests. 2016-06-28 10:21:29 +02:00
Gav Wood
10aa32b0f5 Include RPC configurability for max tx gas limit. 
Also Move the gas limit into the transaction queue from the miner.
 2016-06-27 20:19:01 +02:00
Gav Wood
a102015ecf Fix doc test. 2016-06-27 19:16:26 +02:00
Gav Wood
6c1802e412 Allow configuration of when to reseal blocks. 2016-06-27 17:23:54 +02:00
Tomasz Drwięga
6bbaced3cd Merge branch 'master' into miner-no-default 
Conflicts:
	ethcore/src/miner/miner.rs
	parity/main.rs
 2016-06-26 22:44:34 +02:00
Gav Wood
516b015325 Don't mine without --author (#1436) 
Requires --author to be set before mining is allowed to happen.
 2016-06-26 22:02:17 +02:00
Arkadiy Paronyan
a72d8ee0e7 v1.3.0 (#1421) 2016-06-25 10:32:05 +02:00
Tomasz Drwięga
6edb981bfa Merge branch 'master' into miner-no-default 
Conflicts:
	sync/src/lib.rs
 2016-06-23 21:18:43 +02:00
Gav Wood
bca9e1f31a Merge branch 'master' into sfedgecase 2016-06-23 14:43:42 +02:00
Gav Wood
8fcec20398 Gas limit ceiling option. 2016-06-23 14:29:16 +02:00
Tomasz Drwięga
a76e3a134f Bumping clippy 2016-06-23 10:54:25 +02:00
Tomasz Drwięga
9a1e1b7c89 Signer with Unlocked Account (#1398) 2016-06-22 21:32:26 +02:00
Robert Habermeier
f947a9cb71 Optional gas price in transactions come from statistics (#1388) 
* use gas price statistics for default transaction gas price

* create new signing queue client properly

* replace one more usage of sensible_gas_price

* fill_optional_fields as a free function

* keep test client alive
 2016-06-22 15:55:07 +02:00
Arkadiy Paronyan
7c94b1495e Merge pull request #1329 from ethcore/softforktrigger 
Install trigger for DAO-rescue soft-fork.
 2016-06-21 22:25:24 +02:00
Arkadiy Paronyan
0ba9782bb2 Merge pull request #1371 from ethcore/txcount-rpc 
RPC method to return number of unconfirmed transactions...
 2016-06-21 20:07:30 +02:00
Arkadiy Paronyan
b2891fcdda Update sealing on new transactions (#1365) 2016-06-21 16:00:34 +02:00
Tomasz Drwięga
a8bc86151e Merge branch 'master' into txcount-rpc 
Conflicts:
	rpc/src/v1/tests/mocked/ethcore.rs
 2016-06-21 15:13:41 +02:00
Tomasz Drwięga
7cfb9a2b0b RPC for number of unconfirmed transactions 2016-06-21 14:57:35 +02:00
Robert Habermeier
951512f9c9 Reserved peers rpc API (#1360) 
* reserved peers: lock them, use a hashset, and provide to networkcontext

* adding and removing reserved peer service API

* add NonReservedPeerMode, and setters in host

* setting non reserved mode, restriction accepted connections

* implement RPC apis

* fix deadlock

* fix rpc tests
 2016-06-21 13:56:33 +02:00
Robert Habermeier
7a6fa97d98 Revert "Revert "Reserved peers, reserved-only flag"" 2016-06-20 14:13:33 +02:00
Robert Habermeier
3d3041d418 Revert "Reserved peers, reserved-only flag" 2016-06-20 14:09:41 +02:00
Marek Kotewicz
a6713467a7 Merge pull request #1347 from rphmeier/reserved-peers 
Reserved peers, reserved-only flag
 2016-06-20 14:03:47 +02:00
Robert Habermeier
06a3557e3e reserved_only CLI flag 2016-06-20 12:17:06 +02:00
Gav Wood
3ee3171b8c Merge branch 'master' into softforktrigger 2016-06-20 00:37:40 +02:00
Marek Kotewicz
6b074e8fb2 secret store separated from util (#1304) 
* bump rust-crypto

* initial version of account provider utilizing secret store

* update lazy_static to latest version

* AccountProvider accounts method

* new AccountProvider tests in progress

* basic tests for new AccountProvider

* ethcore compiles with new account provider and secret store

* ethcore-rpc build now compiling with new AccountProvider

* most rpc tests passing with new accounts_provider

* fixed basic_authority tests

* fixed eth_transaction_count rpc test

* fixed mocked/eth.rs tests

* fixed personal tests

* fixed personal signer rpc tests

* removed warnings

* parity compiling fine with new sstore

* fixed import direction

* do not unlock temporarily when we have the password

* removed TODO in account import

* display warning on auto account import failure

* fixed compiling of ethstore on windows

* ethstore as a part of parity repo

* added ethkey
 2016-06-20 00:10:34 +02:00
Robert Habermeier
d8fca91a2f add daoRescueSoftFork to failing rpc and json tests 2016-06-19 17:12:14 +02:00
Gav Wood
08522eec37 --geth prevent getTransactionReceipt from using pending. (#1325) 
This mimics the fucntionality of Geth and the current unratified
JSONRPC spec (but not the functionality of eth and the ratified
spec).
 2016-06-19 14:51:51 +02:00
Tomasz Drwięga
5e1e3ce857 Filling-in optional fields of TransactionRequest... (#1305) 
* More meaningful errors when sending transaction

* Fixing returned value

* Consolidating all RPC error codes

* Fixed loosing peers on incoming connections. (#1293)

* Deactivate peer if it has no new data

* Fixed node table timer registration

* Fixed handshake timeout expiration

* Extra trace

* Fixed session count calculation

* Only deactivate incapable peers in ChainHead state

* Timer registration is not needed

* x64 path

* firewall rules

* Fix read-ahead bug.

Re-ahead 8 bytes rather than 3 to ensure large blocks import fine.

* Refactor to use a const.

* Update README.md

* Gas price statistics. (#1291)

* Gas price statistics.

Affects eth_gasPrice.
Added ethcore_gasPriceStatistics.

Closes #1265

* Fix a bug in eth_gasPrice

* Fix tests.

* Revert minor alteration.

* Tests for gas_price_statistics.

- Tests;
- Additional infrastructure for generating test blocks with
transactions.

* Key load avoid warning (#1303)

* avoid warning with key

* fix intendations

* more intendation fix

* ok() instead of expect()

* Filling-in optional fields of TransactionRequest.

* Adding reference to miner
 2016-06-18 14:55:46 +02:00
Marek Kotewicz
75a7cf2860 fixed #1180 (#1282) 2016-06-18 12:09:29 +02:00
Arkadiy Paronyan
591fa9625d Merge pull request #1313 from ethcore/net 
Network start/stop
 2016-06-18 11:04:24 +02:00
Gav Wood
42478add64 DAO Rescue soft fork (#1309) 
* DAO Rescue soft fork

* Address minor issues.

* Fix tests.
 2016-06-18 10:54:15 +02:00
Tomasz Drwięga
1baa150086 Consolidating all RPC error codes 2016-06-18 10:54:15 +02:00
Tomasz Drwięga
defe688797 Fixing returned value 2016-06-18 10:54:15 +02:00
Tomasz Drwięga
2c9a5fc0a9 More meaningful errors when sending transaction 2016-06-18 10:54:12 +02:00
Gav Wood
335bce85e8 Gas price statistics. (#1291) 
* Gas price statistics.

Affects eth_gasPrice.
Added ethcore_gasPriceStatistics.

Closes #1265

* Fix a bug in eth_gasPrice

* Fix tests.

* Revert minor alteration.

* Tests for gas_price_statistics.

- Tests;
- Additional infrastructure for generating test blocks with
transactions.
 2016-06-18 10:52:50 +02:00
arkpar
3f77f7ce1f Removed RPC methods 2016-06-18 09:50:05 +02:00
arkpar
b38488dd07 Network shutdown 2016-06-17 12:58:28 +02:00
Gav Wood
be6c572449 Update eth.rs 2016-06-15 01:26:58 +02:00
debris
dac387fac1 changed rpc error message to Still Syncing, when mining is not ready 2016-06-15 01:12:46 +02:00
debris
7610d308e8 fixed #1255 2016-06-14 15:17:17 +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
e5e238746b Bumping sysui & topbar. personal_signerEnabled returns port 2016-06-10 15:39:34 +02:00
Arkadiy Paronyan
e633cd2f75 Merge pull request #1247 from ethcore/rpc-cors-fix 
Fixing CORS settings for special values: * & null.
 2016-06-10 14:09:10 +02:00
Tomasz Drwięga
d54d3a2c60 Fixing match 2016-06-09 15:19:48 +02:00
Tomasz Drwięga
2e52c99042 Fixing CORS settings 2016-06-09 10:02:52 +02:00
Gav Wood
2e56fbad2c Use nicer strings for tests. 2016-06-08 12:41:29 -07:00
Gav Wood
293d9f15d5 Tests for JSON serialisation of statediff/vmtrace (#1241) 
* Splitting RPC Apis into more fine-grained sets

* Remove old code/comment.

* Add test for VMTrace ser.

* Add StateDiff ser test.
 2016-06-08 12:40:55 -07:00
Tomasz Drwięga
be435cde99 Splitting RPC Apis into more fine-grained sets (#1234) 2016-06-07 13:52:48 -07:00
Gav Wood
c5d8f5e136 Add StateDiff ser test. 2016-06-07 12:44:57 -07:00
Gav Wood
446c9096f4 Add test for VMTrace ser. 2016-06-07 12:30:44 -07:00
Gav Wood
2abe8cc5dd Merge branch 'master' into apis-split 2016-06-07 10:42:09 -07:00
Tomasz Drwięga
fdc22db3f4 Signer RPC method to check if signer is enabled (#1238) 
* API to check if signer is enabled

* Fixing compilation warnings
 2016-06-07 10:33:32 -07:00
Tomasz Drwięga
bf9173e673 Fixing signer behaviour when confirming transaction with wrong password. (#1237) 
* Avoid removing transactions when trying to confirm and the password is invalid

* Fix order
 2016-06-07 08:25:01 -07: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
62e37aef8f Splitting RPC Apis into more fine-grained sets 2016-06-07 13:01:37 +02:00
Gav Wood
3db2328f52 Merge branch 'txtracingforcall' into serdestatediff 2016-06-06 19:24:07 -07:00
Gav Wood
4efd658577 Merge branch 'master' into txtracingforcall 2016-06-06 19:19:32 -07:00
Gav Wood
0cb1affd48 Use serialize framework for VMTrace JSON. 2016-06-06 15:18:38 -07:00
Tomasz Drwięga
18ffd94674 Fixing warnings 2016-06-06 12:18:17 +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
Gav Wood
1fa8f108d9 StateDiff uses serde preprocessor. 2016-06-06 00:24:21 +02:00
Gav Wood
bbd024d646 Merge branch 'master' into switchrpcns 2016-06-05 21:37:56 +02:00
Marek Kotewicz
c8c47ebe32 Merge pull request #1206 from ethcore/diffing 
Integrate state diffing into the ethcore JSONRPC
 2016-06-05 21:35:36 +02:00
Gav Wood
4dc9aedfb5 Merge branch 'master' into txtracingforcall 2016-06-03 12:06:39 +02:00
Tomasz Drwięga
ae2deaaf72 Bumping clippy version 2016-06-03 11:15:38 +02:00
Tomasz Drwięga
18dac64abb Simple WebSockets notification about new request (#1202) 
* 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

* Supporting sending notification to WS connected SystemUIs

* Sending a notification on every new messages

* Adding logs to signing queue

* Shutting down broadcaster

* Refactoring the signing queue

* Fixing wait loop in case of spurious wake-ups.
 2016-06-02 17:05:13 +02:00
Gav Wood
f357274ced Merge branch 'master' into txtracingforcall 2016-06-02 16:44:11 +02:00
Gav Wood
7dc05f1bcc Unify tracing interface into a single call. 2016-06-02 16:30:28 +02:00
Nikolay Volf
c3404c9b59 Merge pull request #1205 from ethcore/fixed_1204 
fixed #1204
 2016-06-02 14:06:08 +02:00
Gav Wood
a132fefcc7 Transaction tracing for eth_call. 2016-06-02 13:50:50 +02:00
Gav Wood
c202abe09d Switch RPC namespace form ethcore_ to trace_ 2016-06-02 13:14:49 +02:00
debris
9a626c84bc fixed #1204 2016-06-02 12:44:05 +02:00
Gav Wood
b17581d7de VM tracing and JSON RPC endpoint for it. (#1169) 
* Groundwork for basic VM tracing.

* RPC endpoint for VM tracing and ser/de types ready.

* Create VMTracer trait.

* Rearchitected VM tracing to reflect existing tracing.

Should more or less work now.

* Integrated VM tracing into JSONRPC.

* Fix ethcore module tests.

* Add tests for VM tracing.

* Fix consensus test code.

* Fix mock tests.

* Added VM trace information for post-execution stuff.

* Fix max-value calls and add "creates" field to getTransaction.

* Tests for VM tracing.

* Don't implement the trait with unimplemented.

* Remove invlaid comment.

* Fix tests.
 2016-06-02 12:40:31 +02:00
Gav Wood
b9ec87548d Minor renaming diff -> state_diff 2016-06-02 12:39:25 +02:00
Gav Wood
bc5c3da2af Merge branch 'vmtracing' into diffing 2016-06-02 12:28:09 +02:00
Gav Wood
d40a038f37 Fix tests. 2016-06-02 11:49:27 +02:00
Gav Wood
26da38a439 Merge remote-tracking branch 'origin/master' into vmtracing 2016-06-02 11:40:39 +02:00
Tomasz Drwięga
5f68b81f68 Updating jsonrpc-core 2016-06-01 20:32:16 +02:00
Nikolay Volf
c370bcaded merge fixes 2016-06-01 19:57:34 +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
985d412c48 fix merges again 2016-06-01 13:03:26 +02:00
Nikolay Volf
c00b84e10b merge fixes 2016-06-01 12:54:47 +02:00