diff --git a/contracts/src/v0.8/llo-feeds/FeeManager.sol b/contracts/src/v0.8/llo-feeds/FeeManager.sol index 3035245b5e1..1c5f38c0883 100644 --- a/contracts/src/v0.8/llo-feeds/FeeManager.sol +++ b/contracts/src/v0.8/llo-feeds/FeeManager.sol @@ -173,7 +173,7 @@ contract FeeManager is IFeeManager, ConfirmedOwner, TypeAndVersionInterface { bytes calldata payload, bytes calldata parameterPayload, address subscriber - ) external virtual payable override onlyProxy { + ) external payable virtual override onlyProxy { (Common.Asset memory fee, Common.Asset memory reward, uint256 appliedDiscount) = _processFee( payload, parameterPayload, @@ -200,7 +200,7 @@ contract FeeManager is IFeeManager, ConfirmedOwner, TypeAndVersionInterface { bytes[] calldata payloads, bytes calldata parameterPayload, address subscriber - ) external virtual payable override onlyProxy { + ) external payable virtual override onlyProxy { FeeAndReward[] memory feesAndRewards = new IFeeManager.FeeAndReward[](payloads.length); //keep track of the number of fees to prevent over initialising the FeePayment array within _convertToLinkAndNativeFees diff --git a/contracts/src/v0.8/llo-feeds/FeeManagerNoNative.sol b/contracts/src/v0.8/llo-feeds/FeeManagerNoNative.sol index 53e53ab18d1..11d4bb3f635 100644 --- a/contracts/src/v0.8/llo-feeds/FeeManagerNoNative.sol +++ b/contracts/src/v0.8/llo-feeds/FeeManagerNoNative.sol @@ -7,16 +7,15 @@ import {IERC20} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/interface import {SafeERC20} from "../vendor/openzeppelin-solidity/v4.8.3/contracts/token/ERC20/utils/SafeERC20.sol"; import {FeeManager} from "./FeeManager.sol"; - /** * @title FeeManagerNoNative * @author Michael Fletcher * @author Austin Born * @author TJ Cunha - * @notice This contract is a variation of the FeeManager contract, and adds a modifier blocks native billing to fee handling functions + * @notice This contract is a variation of the FeeManager contract, and adds a modifier blocks native billing to fee handling functions */ contract FeeManagerNoNative is FeeManager { - using SafeERC20 for IERC20; + using SafeERC20 for IERC20; /// @notice thrown when trying to pay nativeFee with native, which is disallowed when we force wETH billing for nativeFee error NativeBillingDisallowed(); @@ -59,7 +58,7 @@ contract FeeManagerNoNative is FeeManager { bytes[] calldata payloads, bytes calldata parameterPayload, address subscriber - ) external payable override onlyProxy blockNativeBilling{ + ) external payable override onlyProxy blockNativeBilling { FeeAndReward[] memory feesAndRewards = new IFeeManager.FeeAndReward[](payloads.length); //keep track of the number of fees to prevent over initialising the FeePayment array within _convertToLinkAndNativeFees @@ -97,5 +96,4 @@ contract FeeManagerNoNative is FeeManager { _handleFeesAndRewards(subscriber, feesAndRewards, numberOfLinkFees, numberOfNativeFees); } } - }