From 1338e6f5c92674c926e63ea3b71e15db52e8f250 Mon Sep 17 00:00:00 2001 From: Samyak Jain <34437877+KaymasJain@users.noreply.github.com> Date: Sat, 7 May 2022 01:54:51 +0400 Subject: [PATCH 1/2] update transfer fee --- contracts/aggregator/mainnet/flashloan/main.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/aggregator/mainnet/flashloan/main.sol b/contracts/aggregator/mainnet/flashloan/main.sol index 4c66f5d3..d0a713e3 100644 --- a/contracts/aggregator/mainnet/flashloan/main.sol +++ b/contracts/aggregator/mainnet/flashloan/main.sol @@ -673,7 +673,7 @@ contract FlashAggregator is Setups { * @notice Function to transfer fee to the treasury. Will be called manually. * @param _tokens token addresses for transferring fee to treasury. */ - function transferFeeToTreasury(address[] memory _tokens) public { + function transferFee(address[] memory _tokens, address _to) public onlyOwner { for (uint256 i = 0; i < _tokens.length; i++) { IERC20 token_ = IERC20(_tokens[i]); uint256 decimals_ = TokenInterface(_tokens[i]).decimals(); @@ -686,7 +686,7 @@ contract FlashAggregator is Setups { ? (token_.balanceOf(address(this)) - amtToSub_) : 0; if (amtToTransfer_ > 0) - token_.safeTransfer(treasuryAddr, amtToTransfer_); + token_.safeTransfer(_to, amtToTransfer_); } } } From 0f4be4088c2f8d597ab3b1ab2de940c4e569c838 Mon Sep 17 00:00:00 2001 From: Samyak Jain <34437877+KaymasJain@users.noreply.github.com> Date: Sat, 7 May 2022 03:02:23 +0400 Subject: [PATCH 2/2] added event --- contracts/aggregator/mainnet/flashloan/main.sol | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/contracts/aggregator/mainnet/flashloan/main.sol b/contracts/aggregator/mainnet/flashloan/main.sol index d0a713e3..7b751da1 100644 --- a/contracts/aggregator/mainnet/flashloan/main.sol +++ b/contracts/aggregator/mainnet/flashloan/main.sol @@ -82,6 +82,12 @@ contract FlashAggregator is Setups { uint256[] amounts ); + event LogCollectRevenue( + address to, + address[] tokens, + uint256[] amounts + ); + /** * @dev Callback function for aave flashloan. * @notice Callback function for aave flashloan. @@ -674,6 +680,7 @@ contract FlashAggregator is Setups { * @param _tokens token addresses for transferring fee to treasury. */ function transferFee(address[] memory _tokens, address _to) public onlyOwner { + uint256[] memory _amts = new uint256[](_tokens.length); for (uint256 i = 0; i < _tokens.length; i++) { IERC20 token_ = IERC20(_tokens[i]); uint256 decimals_ = TokenInterface(_tokens[i]).decimals(); @@ -682,12 +689,13 @@ contract FlashAggregator is Setups { : decimals_ > 7 ? 100 : 10; - uint256 amtToTransfer_ = token_.balanceOf(address(this)) > amtToSub_ + _amts[i] = token_.balanceOf(address(this)) > amtToSub_ ? (token_.balanceOf(address(this)) - amtToSub_) : 0; - if (amtToTransfer_ > 0) - token_.safeTransfer(_to, amtToTransfer_); + if (_amts[i] > 0) + token_.safeTransfer(_to, _amts[i]); } + emit LogCollectRevenue(_to, _tokens, _amts); } }