Clean up repo

beefyfinance · Sep 20, 2023 · d50571f · d50571f
1 parent 0301eb4
commit d50571f
Show file tree

Hide file tree

Showing 274 changed files with 295 additions and 858 deletions.
diff --git a/contracts/BIFI/infra/BeefyRewardPool.sol → contracts/BIFI/infra/BeefyRewardPool.txt b/contracts/BIFI/infra/BeefyRewardPool.sol → contracts/BIFI/infra/BeefyRewardPool.txt
diff --git a/contracts/BIFI/infra/BeefyStrategyMulticall.sol b/contracts/BIFI/infra/BeefyStrategyMulticall.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.12;
+pragma solidity ^0.8.0;
 
 import "../interfaces/beefy/IVault.sol";
 

diff --git a/contracts/BIFI/infra/BeefyTreasury.sol b/contracts/BIFI/infra/BeefyTreasury.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.12;
+pragma solidity ^0.8.0;
 
-import "@openzeppelin/contracts/access/Ownable.sol";
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
-import "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
+import "@openzeppelin-4/contracts/access/Ownable.sol";
+import "@openzeppelin-4/contracts/token/ERC20/ERC20.sol";
+import "@openzeppelin-4/contracts/token/ERC20/utils/SafeERC20.sol";
 
 contract BeefyTreasury is Ownable {
     using SafeERC20 for IERC20;

diff --git a/contracts/BIFI/interfaces/beamswap/IBeamChef.sol b/contracts/BIFI/interfaces/beamswap/IBeamChef.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.8.0;
 
 interface IBeamChef {
     function deposit(uint256 _pid, uint256 _amount) external;

diff --git a/contracts/BIFI/interfaces/beefy/IStrategy.sol b/contracts/BIFI/interfaces/beefy/IStrategy.sol
@@ -2,7 +2,7 @@
 
 pragma solidity >=0.6.0 <0.9.0;
 
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import "@openzeppelin-4/contracts/token/ERC20/IERC20.sol";
 
 interface IStrategy {
     function vault() external view returns (address);

diff --git a/contracts/BIFI/interfaces/beefy/IStrategyComplete.sol b/contracts/BIFI/interfaces/beefy/IStrategyComplete.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.8.0;
 
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import "@openzeppelin-4/contracts/token/ERC20/IERC20.sol";
 
 interface IStrategyComplete {
     function vault() external view returns (address);

diff --git a/contracts/BIFI/interfaces/beefy/IVault.sol b/contracts/BIFI/interfaces/beefy/IVault.sol
@@ -2,7 +2,7 @@
 
 pragma solidity >=0.6.0 <0.9.0;
 
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import "@openzeppelin-4/contracts/token/ERC20/IERC20.sol";
 import "./IStrategy.sol";
 
 interface IVault is IERC20 {

diff --git a/contracts/BIFI/interfaces/common/IComptroller.sol b/contracts/BIFI/interfaces/common/IComptroller.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.8.0;
 
 interface IComptroller {
     function claimComp(address holder, address[] calldata _iTokens) external;

diff --git a/contracts/BIFI/interfaces/common/IERC20Extended.sol b/contracts/BIFI/interfaces/common/IERC20Extended.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity >=0.6.0 <0.9.0;
+pragma solidity ^0.8.0;
 
 interface IERC20Extended {
     function symbol() external view returns (string memory);

diff --git a/contracts/BIFI/interfaces/common/IUniswapRouterV3WithDeadline.sol b/contracts/BIFI/interfaces/common/IUniswapRouterV3WithDeadline.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity >=0.6.0;
-pragma experimental ABIEncoderV2;
+pragma solidity ^0.8.0;
+
 
 interface IUniswapRouterV3WithDeadline {
     struct ExactInputSingleParams {

diff --git a/contracts/BIFI/interfaces/common/IVToken.sol b/contracts/BIFI/interfaces/common/IVToken.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.8.0;
 
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import "@openzeppelin-4/contracts/token/ERC20/ERC20.sol";
 
 interface IVToken is IERC20 {
     function underlying() external returns (address);

diff --git a/contracts/BIFI/interfaces/common/IxWant.sol b/contracts/BIFI/interfaces/common/IxWant.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.6.12;
+pragma solidity ^0.8.0;
 
 interface IxWant {
   function enter(uint256 _amount) external;

diff --git a/contracts/BIFI/interfaces/kyber/IDMMRouter.sol b/contracts/BIFI/interfaces/kyber/IDMMRouter.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity >0.6.0;
+pragma solidity >0.8.0;
 
 import "@openzeppelin-4/contracts/token/ERC20/ERC20.sol";
 

diff --git a/contracts/BIFI/interfaces/mai/IFarm.sol b/contracts/BIFI/interfaces/mai/IFarm.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.8.0;
 
 interface IFarm {
     function deposit(uint256 _pid, uint256 _amount) external;

diff --git a/contracts/BIFI/interfaces/pancake/IMasterChef.sol b/contracts/BIFI/interfaces/pancake/IMasterChef.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.8.0;
 
 interface IMasterChef {
     function deposit(uint256 _pid, uint256 _amount) external;

diff --git a/contracts/BIFI/interfaces/pancake/ISmartChef.sol b/contracts/BIFI/interfaces/pancake/ISmartChef.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.8.0;
 
 interface ISmartChef {
     function deposit(uint256 _amount) external;

diff --git a/contracts/BIFI/interfaces/pancake/IVeCakeStaker.sol b/contracts/BIFI/interfaces/pancake/IVeCakeStaker.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.8.0;
 
 interface IVeCakeStaker {
     function deposit(address _chef, uint256 _pid, uint256 _amount) external;

diff --git a/contracts/BIFI/interfaces/spooky/ISpookyChefV2.sol b/contracts/BIFI/interfaces/spooky/ISpookyChefV2.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.8.0;
 
 interface ISpookyChefV2 {
     function deposit(uint256 _pid, uint256 _amount) external;

diff --git a/contracts/BIFI/interfaces/spooky/ISpookyRewarder.sol b/contracts/BIFI/interfaces/spooky/ISpookyRewarder.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.8.0;
 
 interface ISpookyRewarder {
     function pendingToken(uint _pid, address _user) external view returns (uint pending);

diff --git a/contracts/BIFI/interfaces/spooky/IXChef.sol b/contracts/BIFI/interfaces/spooky/IXChef.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity >=0.6.0;
+pragma solidity >=0.8.0;
 
 interface IXChef {
     function deposit(uint256 pid, uint256 amount) external;

diff --git a/contracts/BIFI/interfaces/spooky/IXPool.sol b/contracts/BIFI/interfaces/spooky/IXPool.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity >=0.6.0;
+pragma solidity >=0.8.0;
 
 interface IXPool {
     function enter(uint256 amount) external;

diff --git a/contracts/BIFI/interfaces/traderjoe/IStableJoeStaking.sol b/contracts/BIFI/interfaces/traderjoe/IStableJoeStaking.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.8.0;
 
 interface IStableJoeStaking {
     function deposit(uint256 _amount) external;

diff --git a/contracts/BIFI/interfaces/traderjoe/IVeJoeStaker.sol b/contracts/BIFI/interfaces/traderjoe/IVeJoeStaker.sol
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.6.0;
+pragma solidity ^0.8.0;
 
 interface IVeJoeStaker {
     function deposit(address _chef, uint256 _pid, uint256 _amount) external;

diff --git a/contracts/BIFI/mocks/TestToken.sol b/contracts/BIFI/mocks/TestToken.sol
@@ -1,14 +1,14 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.6.0;
+pragma solidity ^0.8.0;
 
-import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+import "@openzeppelin-4/contracts/token/ERC20/ERC20.sol";
 
 contract TestToken is ERC20 {
     constructor(
         uint256 _initialSupply, 
         string memory _name, 
         string memory _symbol
-    ) public ERC20(_name, _symbol) {
+    ) ERC20(_name, _symbol) {
         _mint(msg.sender, _initialSupply);
     }  
 }