-
Notifications
You must be signed in to change notification settings - Fork 228
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- 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
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
…ions Support multiple evm versions
…idators Flattening of contracts related to the bridge on Ethereum Classic
…alidators rewards for bridge validators and Ethereum Classic support
patitonar
approved these changes
May 22, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merge contains the following set of improvements and fixes:
xDai-POA
bridge #129, Overridetransfer
andtransferFrom
inERC677BridgeTokenRewardable
#153, Rename ValidatorSet contract to Staking contract #157)erc-to-native
bridge in POSDAO chain #164, Add fee manager for erc-to-erc bridge in POSDAO chain #166, Add validatorList on BaseBridgeValidators #167, Update RewardableValidators to be compatible with BridgeValidators #169, Emit event on fee distribution from transfer #171, Fee distribution events in the RewardableBridge contract #176, flattening sources of the new set of contracts #179).env.example
(Replace poa.infura.io with core.poa.network #152)