@@ -14,7 +14,6 @@ import {ReentrancyGuardUpgradeable} from
1414import {IAllo} from "contracts/core/interfaces/IAllo.sol " ;
1515import {IRegistry} from "contracts/core/interfaces/IRegistry.sol " ;
1616import {Errors} from "contracts/core/libraries/Errors.sol " ;
17- import {Native} from "contracts/core/libraries/Native.sol " ;
1817import {Transfer} from "contracts/core/libraries/Transfer.sol " ;
1918import {Metadata} from "contracts/core/libraries/Metadata.sol " ;
2019import {IBaseStrategy} from "strategies/IBaseStrategy.sol " ;
@@ -38,7 +37,7 @@ import {IBaseStrategy} from "strategies/IBaseStrategy.sol";
3837/// @author @thelostone-mc <aditya@gitcoin.co>, @0xKurt <kurt@gitcoin.co>, @codenamejason <jason@gitcoin.co>, @0xZakk <zakk@gitcoin.co>, @nfrgosselin <nate@gitcoin.co>
3938/// @notice This contract is used to create & manage _pools as well as manage the protocol.
4039/// @dev The contract must be initialized with the 'initialize()' function.
41- contract Allo is IAllo , Native , Initializable , Ownable , AccessControlUpgradeable , ReentrancyGuardUpgradeable , Errors {
40+ contract Allo is IAllo , Initializable , Ownable , AccessControlUpgradeable , ReentrancyGuardUpgradeable , Errors {
4241 using Transfer for address ;
4342
4443 // ==========================
@@ -318,7 +317,8 @@ contract Allo is IAllo, Native, Initializable, Ownable, AccessControlUpgradeable
318317 /// @param _recipient The recipient
319318 function recoverFunds (address _token , address _recipient ) external onlyOwner {
320319 // Get the amount of the token to transfer, which is always the entire balance of the contract address
321- uint256 _amount = _token == NATIVE ? address (this ).balance : IERC20Upgradeable (_token).balanceOf (address (this ));
320+ uint256 _amount =
321+ _token == Transfer.NATIVE ? address (this ).balance : IERC20Upgradeable (_token).balanceOf (address (this ));
322322
323323 // Transfer the amount to the recipient (pool owner)
324324 _token.transferAmount (_recipient, _amount);
@@ -379,7 +379,7 @@ contract Allo is IAllo, Native, Initializable, Ownable, AccessControlUpgradeable
379379 if (_amount == 0 ) revert INVALID ();
380380
381381 Pool memory _pool = _pools[_poolId];
382- if (_pool.token == NATIVE && _amount != msg .value ) revert ETH_MISMATCH ();
382+ if (_pool.token == Transfer. NATIVE && _amount != msg .value ) revert ETH_MISMATCH ();
383383
384384 // Call the internal fundPool() function
385385 _fundPool (_amount, _msgSender (), _poolId, _pool.strategy);
@@ -544,8 +544,8 @@ contract Allo is IAllo, Native, Initializable, Ownable, AccessControlUpgradeable
544544 // To prevent paying the _baseFee from the Allo contract's balance
545545 // If _token is NATIVE, then _baseFee + _amount should be equal to _msgValue.
546546 // If _token is not NATIVE, then _baseFee should be equal to _msgValue.
547- if (_token == NATIVE && (_baseFee + _amount != _msgValue)) revert ETH_MISMATCH ();
548- if (_token != NATIVE && _baseFee != _msgValue) revert ETH_MISMATCH ();
547+ if (_token == Transfer. NATIVE && (_baseFee + _amount != _msgValue)) revert ETH_MISMATCH ();
548+ if (_token != Transfer. NATIVE && _baseFee != _msgValue) revert ETH_MISMATCH ();
549549
550550 address (_treasury).transferAmountNative (_baseFee);
551551
@@ -592,7 +592,7 @@ contract Allo is IAllo, Native, Initializable, Ownable, AccessControlUpgradeable
592592
593593 address _token = _pools[_poolId].token;
594594
595- if (_token == NATIVE && msg .value < _amount) revert ETH_MISMATCH ();
595+ if (_token == Transfer. NATIVE && msg .value < _amount) revert ETH_MISMATCH ();
596596
597597 if (_feeAmount > 0 ) {
598598 uint256 _balanceBeforeFee = _token.getBalance (_treasury);
0 commit comments