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.

Sign up for GitHub

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

Add Fee Manager for erc-to-native bridge in POSDAO chain #164

Merged
merged 10 commits into from
Apr 23, 2019
Merged

Add Fee Manager for erc-to-native bridge in POSDAO chain #164

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d2bdf62
Add fee manager for erc-to-native in posdao chain
patitonar Mar 15, 2019
9a1ce93
Add FeeManagerErcToNativePOSDAO on deploy script
patitonar Mar 21, 2019
e605559
Add getAmountToBurn on erc-to-native fee manager
patitonar Apr 18, 2019
f7cb8d2
Update getAmountToBurn method signature
patitonar Apr 22, 2019
1f57b24
Merge branch '119-Epic-rewards-for-bridge-validators' into #159-fee-e…
patitonar Apr 22, 2019
04069bb
Update FeeManagerErcToNativePOSDAO to extend BlockRewardFeeManager
patitonar Apr 22, 2019
39c7d39
Fix FeeManagerErcToNativePOSDAO unit tests
patitonar Apr 22, 2019
a448e3d
Add HOME_FEE_MANAGER_TYPE env var
patitonar Apr 22, 2019
cad1cc5
Update .env.example
patitonar Apr 23, 2019
91eeb64
Merge branch '119-Epic-rewards-for-bridge-validators' into #159-fee-e…
patitonar Apr 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions contracts/upgradeable_contracts/BlockRewardFeeManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@ contract BlockRewardFeeManager is BaseFeeManager {
distributeFeeFromBlockReward(_fee);
}

function distributeFeeFromBlockReward(uint256 _fee) internal {
IBlockReward blockReward = _blockRewardContract();
blockReward.addBridgeTokenFeeReceivers(_fee);
}

function _blockRewardContract() internal view returns(IBlockReward) {
return IBlockReward(addressStorage[keccak256(abi.encodePacked("blockRewardContract"))]);
}

function distributeFeeFromBlockReward(uint256 _fee) internal;
}
5 changes: 5 additions & 0 deletions contracts/upgradeable_contracts/erc20_to_erc20/FeeManagerErcToErcPOSDAO.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ contract FeeManagerErcToErcPOSDAO is BlockRewardFeeManager {
addressStorage[keccak256(abi.encodePacked("blockRewardContract"))] = _blockReward;
}

function distributeFeeFromBlockReward(uint256 _fee) internal {
IBlockReward blockReward = _blockRewardContract();
blockReward.addBridgeTokenFeeReceivers(_fee);
}

function isContract(address _addr) internal view returns (bool)
{
uint length;
Expand Down
22 changes: 3 additions & 19 deletions contracts/upgradeable_contracts/erc20_to_native/FeeManagerErcToNativePOSDAO.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,20 @@
pragma solidity 0.4.24;

import "../BaseFeeManager.sol";
import "../../IBlockReward.sol";
import "../BlockRewardFeeManager.sol";

contract FeeManagerErcToNativePOSDAO is BaseFeeManager {
contract FeeManagerErcToNativePOSDAO is BlockRewardFeeManager {

function getFeeManagerMode() public pure returns(bytes4) {
return bytes4(keccak256(abi.encodePacked("manages-both-directions")));
}

function blockRewardContract() internal view returns(IBlockReward) {
return IBlockReward(addressStorage[keccak256(abi.encodePacked("blockRewardContract"))]);
}

function distributeFeeFromAffirmation(uint256 _fee) external {
distributeFeeFromBlockReward(_fee);
}

function distributeFeeFromSignatures(uint256 _fee) external {
distributeFeeFromBlockReward(_fee);
}

function distributeFeeFromBlockReward(uint256 _fee) internal {
IBlockReward blockReward = blockRewardContract();
IBlockReward blockReward = _blockRewardContract();
blockReward.addBridgeNativeFeeReceivers(_fee);
}

function getAmountToBurn(uint256 _value) public view returns(uint256) {
return _value;
}

function onAffirmationFeeDistribution(address _rewardAddress, uint256 _fee) internal {}

function onSignatureFeeDistribution(address _rewardAddress, uint256 _fee) internal {}
}