Conflicts:
	Cargo.lock

Conflicts:
	rpc/src/v1/types/bytes.rs

sandakersmann authored Sep 27, 2016 and Arkadiy Paronyan committed Sep 27, 2016

Changed http:// to https:// on some links in README.md

* 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

Tx Queue improvements 

* Lenient bytes deserialization

* Printing warning

fix

copy from beta

Conflicts:
	ethcore/src/miner/transaction_queue.rs

* Handle RLP to string UTF-8 decoding errors (#2217)

* pending transactions

Conflicts:
	rpc/src/v1/impls/ethcore.rs
	rpc/src/v1/traits/ethcore.rs

Conflicts:
	ethcore/src/miner/transaction_queue.rs

* 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

* Add hash as CLI function

* Use streaming SHA3.

* Separate path for code size

* Actually use it for EVM

* add extcodesize to TestExt

Closes #2213
Omit transaction and receipt roots from abridged block.
No longer use RLP compression.

Make ordered_trie_root generic over an iterator to save an allocation.

Breaks snapshot format backwards compatibility (with other 1.4 snapshots -- it's already been broken with 1.3).

Documentation will need updating

* Fixing eth_call to builtins

* Fixing bytes deserialization

* Removing comment

* 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 &

fix x86_64-pc-windows-msvc

update deploy

add deploy to S3

* port trie iterators to use error handling

* use new trie iterators in snapshot

allows proper recovery from a premature periodic snapshot

* Limit for logs filter.

* Moving limit inside the filter object

* Fixing tests

* Avoid cloning clean stuff

* Don't clone state when closing/locking blocks

* handle errors in commit

* revert `close_and_lock` changes

* defer state root update until post state commit

* Allowing signer to use initial token

* Generating new tokens via RPC

* Fixing RPC tests

* Fixing signer doctest

* whitespace

[ci:skip]

* whitespace

[ci:skip]