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

rewards for bridge validators and Ethereum Classic support #143

Merged
merged 170 commits into from
May 22, 2019

Conversation

akolotov
Copy link
Collaborator

@akolotov akolotov commented Jan 28, 2019

This merge contains all functionality related to introduction of the Fee Manager intended to take care of the reward appearing after gathering of the bridging fee from the user's transaction: #130, #132, #134, #135, #141, #142, #144, #150, #151, #167, #171, #169, #176, #166, #155, #164, #179.
Examples of Fee Managers were implemented for the following bridge modes:

  • native-to-erc20:
    • fees collected on both sides of the bridge (native_to_erc20/FeeManagerNativeToErc.sol). This Fee Manager is used for the ETC-WETC bridge.
    • fees from transfers in both directions are collected on the Home chain only (native_to_erc20/FeeManagerNativeToErcBothDirections.sol). Planned to be used for the POA-POA20 bridge.
  • erc20-to-erc20: fees from transfers in both directions are collected on the Home chain only and distributed by the BlockReward contract (erc20_to_erc20/FeeManagerErcToErcPOSDAO.sol). Planned to be used for a staking token on a new POSDAO chain.
  • erc20-to-native:
    • fees collected on both sides of the bridge (erc20_to_native/FeeManagerErcToNative.sol). Planned to be used on the MakerDAO-xDAI bridge.
    • fees from transfers in both directions are collected on the Home chain only and distributed by the BlockReward contract (/erc20_to_native/FeeManagerErcToNativePOSDAO.sol). Planned to be used for the chain coin on a new POSDAO chain.

It also contains special contracts versions intended to work on the spuriousDragon version of EVM (Ethereum Classic): #156, #181, #184

fernandomg and others added 30 commits December 26, 2018 17:19
 - Store validators as a linked-list
 - Store reward address as a map [validator] -> rewardAddr
…rly-traverse-validators-reward-accounts-tests

Update contracts to properly traverse validators reward accounts tests
@ghost ghost added the in progress label May 2, 2019
patitonar and others added 4 commits May 3, 2019 13:13
# 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
@ghost ghost removed the in progress label May 3, 2019
@ghost ghost added the in progress label May 3, 2019
@akolotov akolotov changed the title Rewards for bridge validators for 'erc20-to-native' bridge mode rewards for bridge validators and Ethereum Classic support May 21, 2019
@akolotov akolotov requested a review from patitonar May 21, 2019 22:48
@akolotov
Copy link
Collaborator Author

This PR should be reviewed as soon as #184 is merged

…idators

Flattening of contracts related to the bridge on Ethereum Classic
@akolotov akolotov merged commit dcef430 into develop May 22, 2019
@akolotov akolotov deleted the 119-Epic-rewards-for-bridge-validators branch May 22, 2019 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants