# Conflicts:
#	js/src/api/contract/contract.js
#	js/src/redux/providers/requestsActions.js

* 1 confirmation when tx is mined

* Spelling mistake

* Fix #6540
- just skip the checkRequest call if result of postTransaction is a tx ID

* Fix requestId naming

* Prepare changelog for 1.7.1

* Update changelog for 1.7.1

* Prepare changelog for 1.7.2

* Update CHANGELOG

* Update changelog for 1.7.2

* Snapshot sync kicks in after 10k blocks

* Add ropsten fork to changelog

* Add Gnosis multi-sig support to Changelog

* Update final changelog for 1.7.2

# Conflicts:
#	js/package-lock.json
#	js/src/Application/application.js
#	js/src/api/rpc/parity/parity.js
#	js/src/api/subscriptions/manager.spec.js
#	js/src/api/subscriptions/personal.spec.js
#	js/src/jsonrpc/interfaces/parity.js
#	js/src/mobx/hardwareStore.js
#	js/src/mobx/hardwareStore.spec.js
#	js/src/modals/index.js
#	js/src/redux/providers/signerMiddleware.spec.js
#	js/src/ui/SelectionList/selectionList.css
#	js/src/views/Account/account.spec.js
#	js/src/views/Accounts/accounts.spec.js
#	js/src/views/Application/Extension/store.js
#	js/src/views/Signer/components/SignRequest/signRequest.spec.js

* EIP-211 updates

* benchmarks

* blockhash instruction gas cost updated

* More benches

* EIP-684

* EIP-649

* EIP-658

* Updated some tests

* Modexp fixes

* STATICCALL fixes

* Pairing fixes

* More STATICALL fixes

* Use paritytech/bn

* Fixed REVERTing of contract creation

* Fixed more tests

* Fixed more tests

* Blockchain tests

* Enable previously broken tests

* Transition test

* Updated tests

* Fixed modexp reading huge numbers

* Enabled max_code_size test

* Review fixes

* Updated pairing pricing

* missing commas (style)

* Update test.rs

* Small improvements

* eip161abc

* Fix extension detection.

* Fix mobx quirks.

* Update submodule.

separate trie from util and make its dependencies into libs

* bytes
* hashdb
* memorydb
* nibbleslice
* nibblevec

* sha3 test for empty input implemented

* rename sha3-> keccak

* update keccak test. Now it expects input to hash

* fix gas_left in tests