Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge the develop branch to the master branch, preparation to v2.3.0 #186

Merged
merged 235 commits into from
May 22, 2019

Conversation

akolotov
Copy link
Collaborator

This merge contains the following set of improvements and fixes:

varasev and others added 30 commits December 26, 2018 14:34
 - Store validators as a linked-list
 - Store reward address as a map [validator] -> rewardAddr
Extend ERC677BridgeToken contract for `xDai-POA` bridge
…rly-traverse-validators-reward-accounts-tests

Update contracts to properly traverse validators reward accounts tests
akolotov and others added 26 commits May 3, 2019 03:25
Now the `mintReward` function ignores zero amount.
Dynamic gas limit for the deployment/configuration transactions
# Conflicts:
#	contracts/upgradeable_contracts/BasicHomeBridge.sol
#	contracts/upgradeable_contracts/erc20_to_erc20/ForeignBridgeErcToErc.sol
#	contracts/upgradeable_contracts/erc20_to_erc20/HomeBridgeErcToErc.sol
#	contracts/upgradeable_contracts/native_to_erc20/ForeignBridgeNativeToErc.sol
#	deploy/.env.example
#	deploy/src/erc_to_erc/foreign.js
#	deploy/src/loadEnv.js
…lidators' into 119-Epic-rewards-for-bridge-validators
…idators

flattening sources of the new set of contracts
…idators

Flattening of contracts related to the bridge on Ethereum Classic
…alidators

rewards for bridge validators and Ethereum Classic support
@akolotov akolotov requested a review from patitonar May 22, 2019 20:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants