Add Fee Manager for erc-to-native bridge in POSDAO chain
#164
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
ghost
assigned 
akolotov
requested changes
Apr 17, 2019
deploy/README.md
Outdated
| @@ -351,6 +351,8 @@ VALIDATORS=0x 0x 0x | |||
| HOME_REWARDABLE=false | |||
| # The flag defining whether to use RewardableValidators contract and set a fee manager contract on Foreign network | |||
| FOREIGN_REWARDABLE=false | |||
| # Flag to define if Home network is a POSDAO and rewards are distributed by blockReward contract | |||
| HOME_POSDAO=false | |||
There was a problem hiding this comment.
Consider to have the parameter like HOME_FEE_MANAGER_TYPE and the value of this parameter will specify which fee manager should be deployed
There was a problem hiding this comment.
Thanks for suggestion. Added here a448e3d Please check if possible values makes sense to you
| setTotalBurntCoins(totalBurntCoins().add(valueToTransfer)); | ||
| address(0).transfer(valueToTransfer); | ||
| uint256 valueToBurn = valueToTransfer; | ||
| if(isPOSDAOFeeManager()) { |
There was a problem hiding this comment.
It looks like this method should be called only in case if the fee manager is configured. So, could you consider the following changes:
- introduce the new method in the POSDAO fee manager:
getAmountToBurn. This will allow to locate all logic related to fee handling in the fee manager. - change the fall back method in the bridge contract as following:
// . . .
// . . .
uint256 valueToTransfer = msg.value;
uint256 valueToBurn = valueToTransfer;
address feeManager = feeManagerContract();
if (feeManager != address(0)) {
valueToBurn = getAmountToBurn(valueToTransfer)
uint256 fee = calculateFee(valueToTransfer, false, feeManager, HOME_FEE);
valueToTransfer = valueToTransfer.sub(fee);
}
setTotalBurntCoins(totalBurntCoins().add(valueToBurn));
address(0).transfer(valueToBurn);
emit UserRequestForSignature(msg.sender, valueToTransfer);There was a problem hiding this comment.
Thanks for the suggestions. Please check e605559
akolotov
reviewed
Apr 19, 2019
contracts/upgradeable_contracts/erc20_to_native/FeeManagerErcToNative.sol
Outdated
Show resolved
Hide resolved
…rc-native-posdao-chain # Conflicts: # contracts/IBlockReward.sol # contracts/test/BlockReward.sol # deploy/.env.example
patitonar
commented
Apr 22, 2019
contracts/upgradeable_contracts/erc20_to_native/FeeManagerErcToNativePOSDAO.sol
Show resolved
Hide resolved
akolotov
requested changes
Apr 23, 2019
akolotov
approved these changes
Apr 23, 2019
|
We need to address the merge conflicts |
…rc-native-posdao-chain # Conflicts: # deploy/.env.example # deploy/src/erc_to_native/home.js # deploy/src/loadEnv.js
|
Merge conflicts fixed |
akolotov
approved these changes
Apr 23, 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.
Closes #159