fix: revert formatting

OriginProtocol · Apr 15, 2024 · dcdb9e3 · dcdb9e3
1 parent 9da5a55
commit dcdb9e3
Show file tree

Hide file tree

Showing 30 changed files with 182 additions and 244 deletions.
diff --git a/contracts/contracts/harvest/BaseHarvester.sol b/contracts/contracts/harvest/BaseHarvester.sol
@@ -100,15 +100,13 @@ abstract contract BaseHarvester is Governable {
     /**
      * Address receiving rewards proceeds. Initially the Vault contract later will possibly
      * be replaced by another contract that eases out rewards distribution.
-     *
-     */
+     **/
     address public rewardProceedsAddress;
 
     /**
      * All tokens are swapped to this token before it gets transferred
      * to the `rewardProceedsAddress`. USDT for OUSD and WETH for OETH.
-     *
-     */
+     **/
     address public immutable baseTokenAddress;
     // Cached decimals for `baseTokenAddress`
     uint256 public immutable baseTokenDecimals;
@@ -126,7 +124,6 @@ abstract contract BaseHarvester is Governable {
         uint128 baseTokenIndex;
     }
     // Packed indices of assets on the Curve pool
-
     mapping(address => CurvePoolIndices) public curvePoolIndices;
 
     constructor(address _vaultAddress, address _baseTokenAddress) {
@@ -140,11 +137,9 @@ abstract contract BaseHarvester is Governable {
         baseTokenDecimals = Helpers.getDecimals(_baseTokenAddress);
     }
 
-    /**
-     *
-     *              Configuration
-     *
-     */
+    /***************************************
+                 Configuration
+    ****************************************/
 
     /**
      * Set the Address receiving rewards proceeds.
@@ -392,11 +387,9 @@ abstract contract BaseHarvester is Governable {
         emit SupportedStrategyUpdate(_strategyAddress, _isSupported);
     }
 
-    /**
-     *
-     *                 Rewards
-     *
-     */
+    /***************************************
+                    Rewards
+    ****************************************/
 
     /**
      * @dev Transfer token to governor. Intended for recovering tokens stuck in
@@ -509,11 +502,11 @@ abstract contract BaseHarvester is Governable {
 
         // Oracle price is 1e18
         uint256 minExpected = (balance *
-            (1e4 - tokenConfig.allowedSlippageBps) *
-            oraclePrice).scaleBy( // max allowed slippage
-            baseTokenDecimals,
-            Helpers.getDecimals(_swapToken)
-        ) /
+            (1e4 - tokenConfig.allowedSlippageBps) * // max allowed slippage
+            oraclePrice).scaleBy(
+                baseTokenDecimals,
+                Helpers.getDecimals(_swapToken)
+            ) /
             1e4 / // fix the max slippage decimal position
             1e18; // and oracle price decimals position
 

diff --git a/contracts/contracts/harvest/Dripper.sol b/contracts/contracts/harvest/Dripper.sol
@@ -43,6 +43,7 @@ import { IVault } from "../interfaces/IVault.sol";
  * longer curve the more collect() is called without incoming yield.
  *
  */
+
 contract Dripper is Governable {
     using SafeERC20 for IERC20;
 

diff --git a/contracts/contracts/interfaces/morpho/IMorpho.sol b/contracts/contracts/interfaces/morpho/IMorpho.sol
@@ -9,10 +9,10 @@ import "./compound/ICompoundOracle.sol";
 interface IMorpho {
     function comptroller() external view returns (IComptroller);
     function supply(address _poolTokenAddress, address _onBehalf, uint256 _amount) external;
-    function supply(address _poolTokenAddress, address _onBehalf, uint256 _amount, uint256 _maxGasForMatching)
-        external;
+    function supply(address _poolTokenAddress, address _onBehalf, uint256 _amount, uint256 _maxGasForMatching) external;
     function withdraw(address _poolTokenAddress, uint256 _amount) external;
-    function claimRewards(address[] calldata _cTokenAddresses, bool _tradeForMorphoToken)
-        external
-        returns (uint256 claimedAmount);
+    function claimRewards(
+        address[] calldata _cTokenAddresses,
+        bool _tradeForMorphoToken
+    ) external returns (uint256 claimedAmount);
 }
diff --git a/contracts/contracts/mocks/MockAave.sol b/contracts/contracts/mocks/MockAave.sol
@@ -19,7 +19,6 @@ import { StableMath } from "../utils/StableMath.sol";
 contract MockAToken is MintableERC20 {
     address public lendingPool;
     IERC20 public underlyingToken;
-
     using SafeERC20 for IERC20;
 
     constructor(

diff --git a/contracts/contracts/mocks/MockAaveIncentivesController.sol b/contracts/contracts/mocks/MockAaveIncentivesController.sol
@@ -19,8 +19,7 @@ contract MockAaveIncentivesController {
      * @dev Returns the total of rewards of an user, already accrued + not yet accrued
      * @param user The address of the user
      * @return The rewards
-     *
-     */
+     **/
     // solhint-disable-next-line no-unused-vars
     function getRewardsBalance(address[] calldata assets, address user)
         external
@@ -35,8 +34,7 @@ contract MockAaveIncentivesController {
      * @param amount Amount of rewards to claim
      * @param to Address that will be receiving the rewards
      * @return Rewards claimed
-     *
-     */
+     **/
     function claimRewards(
         // solhint-disable-next-line no-unused-vars
         address[] calldata assets,

diff --git a/contracts/contracts/mocks/MockBalancerVault.sol b/contracts/contracts/mocks/MockBalancerVault.sol
@@ -10,7 +10,6 @@ import { StableMath } from "../utils/StableMath.sol";
 
 contract MockBalancerVault {
     using StableMath for uint256;
-
     uint256 public slippage = 1 ether;
     bool public transferDisabled = false;
     bool public slippageErrorDisabled = false;

diff --git a/contracts/contracts/mocks/MockOGN.sol b/contracts/contracts/mocks/MockOGN.sol
@@ -95,11 +95,11 @@ contract MockOGN is MintableERC20, BurnableERC20 {
     //
     // Functions for maintaining whitelist
     //
+
     modifier onlyOwner() {
         require(msg.sender == owner);
         _;
     }
-
     modifier allowedTransfer(address _from, address _to) {
         require(
             // solium-disable-next-line operator-whitespace
@@ -149,6 +149,7 @@ contract MockOGN is MintableERC20, BurnableERC20 {
     // ERC20 transfer functions that have been overridden to enforce the
     // whitelist.
     //
+
     function transfer(address _to, uint256 _value)
         public
         override

diff --git a/contracts/contracts/mocks/MockStkAave.sol b/contracts/contracts/mocks/MockStkAave.sol
@@ -31,8 +31,7 @@ contract MockStkAave is MintableERC20 {
      * @dev Redeems staked tokens, and stop earning rewards
      * @param to Address to redeem to
      * @param amount Amount to redeem
-     *
-     */
+     **/
     function redeem(address to, uint256 amount) external {
         uint256 cooldownStartTimestamp = stakersCooldowns[msg.sender];
         uint256 windowStart = cooldownStartTimestamp + COOLDOWN_SECONDS;
@@ -55,17 +54,15 @@ contract MockStkAave is MintableERC20 {
     /**
      * @dev Activates the cooldown period to unstake
      * - It can't be called if the user is not staking
-     *
-     */
+     **/
     function cooldown() external {
         require(balanceOf(msg.sender) != 0, "INVALID_BALANCE_ON_COOLDOWN");
         stakersCooldowns[msg.sender] = block.timestamp;
     }
 
     /**
      * @dev Test helper function to allow changing the cooldown
-     *
-     */
+     **/
     function setCooldown(address account, uint256 _cooldown) external {
         stakersCooldowns[account] = _cooldown;
     }

diff --git a/contracts/contracts/oracle/AuraWETHPriceFeed.sol b/contracts/contracts/oracle/AuraWETHPriceFeed.sol
@@ -41,8 +41,7 @@ contract AuraWETHPriceFeed is AggregatorV3Interface, Strategizable {
      * TWAP price.
      *
      * @return price The price scaled to 18 decimals
-     *
-     */
+     **/
     function price() external view returns (int256) {
         return _price();
     }
@@ -86,8 +85,7 @@ contract AuraWETHPriceFeed is AggregatorV3Interface, Strategizable {
 
     /**
      * Pauses the price feed. Callable by Strategist as well.
-     *
-     */
+     **/
     function pause() external onlyGovernorOrStrategist {
         if (paused) {
             revert PriceFeedPausedError();
@@ -98,8 +96,7 @@ contract AuraWETHPriceFeed is AggregatorV3Interface, Strategizable {
 
     /**
      * Unpauses the price feed. Only Governor can call it
-     *
-     */
+     **/
     function unpause() external onlyGovernor {
         if (!paused) {
             revert PriceFeedUnpausedError();
@@ -113,8 +110,7 @@ contract AuraWETHPriceFeed is AggregatorV3Interface, Strategizable {
      * two different price points.
      *
      * @param _tolerance New tolerance value
-     *
-     */
+     **/
     function setTolerance(uint256 _tolerance) external onlyGovernor {
         if (_tolerance > 0.1 ether) {
             revert InvalidToleranceBps();
@@ -131,8 +127,7 @@ contract AuraWETHPriceFeed is AggregatorV3Interface, Strategizable {
      * The `answer` returned by this is same as what `price()` would return.
      *
      * It doesn't return any data about rounds (since those doesn't exist).
-     *
-     */
+     **/
     function latestRoundData()
         external
         view
@@ -154,8 +149,7 @@ contract AuraWETHPriceFeed is AggregatorV3Interface, Strategizable {
      * with AggregatorV3Interface.
      *
      * Always reverts since there're no round data in this contract.
-     *
-     */
+     **/
     function getRoundData(uint80)
         external
         pure

diff --git a/contracts/contracts/strategies/AaveStrategy.sol b/contracts/contracts/strategies/AaveStrategy.sol
@@ -190,8 +190,8 @@ contract AaveStrategy is InitializableAbstractStrategy {
 
     /**
      * @dev Internal method to respond to the addition of new asset / aTokens
-     *         We need to give the AAVE lending pool approval to transfer the
-     *         asset.
+            We need to give the AAVE lending pool approval to transfer the
+            asset.
      * @param _asset Address of the asset to approve
      * @param _aToken Address of the aToken
      */

diff --git a/contracts/contracts/strategies/BaseCompoundStrategy.sol b/contracts/contracts/strategies/BaseCompoundStrategy.sol
@@ -5,6 +5,7 @@ pragma solidity ^0.8.0;
  * @title Base Compound Abstract Strategy
  * @author Origin Protocol Inc
  */
+
 import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
 import { ICERC20 } from "./ICompound.sol";
 import { IComptroller } from "../interfaces/IComptroller.sol";

diff --git a/contracts/contracts/strategies/CompoundStrategy.sol b/contracts/contracts/strategies/CompoundStrategy.sol
@@ -15,7 +15,6 @@ import { IERC20 } from "../utils/InitializableAbstractStrategy.sol";
 
 contract CompoundStrategy is BaseCompoundStrategy {
     using SafeERC20 for IERC20;
-
     event SkippedWithdrawal(address asset, uint256 amount);
 
     constructor(BaseStrategyConfig memory _stratConfig)

diff --git a/contracts/contracts/strategies/ConvexEthMetaStrategy.sol b/contracts/contracts/strategies/ConvexEthMetaStrategy.sol
@@ -157,11 +157,9 @@ contract ConvexEthMetaStrategy is InitializableAbstractStrategy {
         _approveBase();
     }
 
-    /**
-     *
-     *                 Deposit
-     *
-     */
+    /***************************************
+                    Deposit
+    ****************************************/
 
     /**
      * @notice Deposit WETH into the Curve pool
@@ -252,11 +250,9 @@ contract ConvexEthMetaStrategy is InitializableAbstractStrategy {
         }
     }
 
-    /**
-     *
-     *                 Withdraw
-     *
-     */
+    /***************************************
+                    Withdraw
+    ****************************************/
 
     /**
      * @notice Withdraw ETH and OETH from the Curve pool, burn the OETH,
@@ -369,11 +365,9 @@ contract ConvexEthMetaStrategy is InitializableAbstractStrategy {
         emit Withdrawal(address(oeth), address(lpToken), oethToBurn);
     }
 
-    /**
-     *
-     *         Curve pool Rebalancing
-     *
-     */
+    /***************************************
+            Curve pool Rebalancing
+    ****************************************/
 
     /**
      * @notice Mint OTokens and one-sided add to the Curve pool.
@@ -514,11 +508,9 @@ contract ConvexEthMetaStrategy is InitializableAbstractStrategy {
         );
     }
 
-    /**
-     *
-     *             Assets and Rewards
-     *
-     */
+    /***************************************
+                Assets and Rewards
+    ****************************************/
 
     /**
      * @notice Collect accumulated CRV and CVX rewards and send to the Harvester.
@@ -569,11 +561,9 @@ contract ConvexEthMetaStrategy is InitializableAbstractStrategy {
         return _asset == address(weth);
     }
 
-    /**
-     *
-     *                 Approvals
-     *
-     */
+    /***************************************
+                    Approvals
+    ****************************************/
 
     /**
      * @notice Approve the spending of all assets by their corresponding pool tokens,

diff --git a/contracts/contracts/strategies/ConvexOUSDMetaStrategy.sol b/contracts/contracts/strategies/ConvexOUSDMetaStrategy.sol
@@ -126,7 +126,8 @@ contract ConvexOUSDMetaStrategy is BaseConvexMetaStrategy {
         // simplifying below to: `uint256 diff = (num3CrvTokens - 1) * k` causes loss of precision
         // prettier-ignore
         // slither-disable-next-line divide-before-multiply
-        uint256 diff = crvPoolBalance * k - (crvPoolBalance - num3CrvTokens - 1) * k;
+        uint256 diff = crvPoolBalance * k -
+            (crvPoolBalance - num3CrvTokens - 1) * k;
         uint256 lpToBurn = diff / 1e36;
 
         uint256 gaugeTokens = IRewardStaking(cvxRewardStakerAddress).balanceOf(

diff --git a/contracts/contracts/strategies/FluxStrategy.sol b/contracts/contracts/strategies/FluxStrategy.sol
@@ -6,6 +6,7 @@ pragma solidity ^0.8.0;
  * @notice Investment strategy for investing stablecoins via Flux
  * @author Origin Protocol Inc
  */
+
 import { CompoundStrategy } from "./CompoundStrategy.sol";
 
 contract FluxStrategy is CompoundStrategy {

diff --git a/contracts/contracts/strategies/IAave.sol b/contracts/contracts/strategies/IAave.sol
@@ -16,8 +16,7 @@ interface IAaveLendingPool {
      *   is a different wallet
      * @param referralCode Code used to register the integrator originating the operation, for potential rewards.
      *   0 if the action is executed directly by the user, without any middle-man
-     *
-     */
+     **/
     function deposit(
         address asset,
         uint256 amount,
@@ -35,8 +34,7 @@ interface IAaveLendingPool {
      *   wants to receive it on his own wallet, or a different address if the beneficiary is a
      *   different wallet
      * @return The final amount withdrawn
-     *
-     */
+     **/
     function withdraw(
         address asset,
         uint256 amount,