poanetwork
/
tokenbridge-contracts
mirror of https://github.com/poanetwork/tokenbridge-contracts.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix fee related methods

This commit is contained in:
Gerardo Nardelli 2019-01-10 15:59:24 -03:00
parent 9ee9ce4a61
commit e752e94ec1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/upgradeable_contracts/BaseFeeManager.sol
View File

@ -10,7 +10,7 @@ contract BaseFeeManager is EternalStorage {
event FeeUpdated(uint256 fee);
function calculateFee(uint256 _value, bool _recover) external view returns(uint256) {
function calculateFee(uint256 _value, bool _recover) external payable returns(uint256) {
uint256 fee = getFee();
uint256 eth = 1 ether;
if (!_recover) {

2
contracts/upgradeable_contracts/BasicHomeBridge.sol
View File

@ -92,7 +92,7 @@ contract BasicHomeBridge is EternalStorage, Validatable, Ownable, OwnedUpgradeab
address contractAddress;
(recipient, amount, txHash, contractAddress) = Message.parseMessage(message);
uint256 fee = calculateFee(amount, true, feeManager);
feeManager.delegatecall(abi.encodeWithSignature("distributeFeeFromSignatures(uint256)", fee));
require(feeManager.delegatecall(abi.encodeWithSignature("distributeFeeFromSignatures(uint256)", fee)));
}
function setMessagesSigned(bytes32 _hash, bool _status) internal {

2
contracts/upgradeable_contracts/erc20_to_native/HomeBridgeErcToNative.sol
View File

@ -95,7 +95,7 @@ contract HomeBridgeErcToNative is EternalStorage, BasicBridge, BasicHomeBridge,
address feeManager = feeManagerContract();
if (feeManager != address(0)) {
uint256 fee = calculateFee(valueToMint, false, feeManager);
feeManager.delegatecall(abi.encodeWithSignature("distributeFeeFromAffirmation(uint256)", fee));
require(feeManager.delegatecall(abi.encodeWithSignature("distributeFeeFromAffirmation(uint256)", fee)));
valueToMint = valueToMint.sub(fee);
}
blockReward.addExtraReceiver(valueToMint, _recipient);