fei-protocol · Joeysantoro · Sep 20, 2021 · Aug 16, 2021 · Aug 16, 2021 · Aug 20, 2021
diff --git a/.solcover.js b/.solcover.js
@@ -0,0 +1,3 @@
+module.exports = {
+  "configureYulOptimizer": true
+};
diff --git a/contract-addresses/mainnetAddresses.json b/contract-addresses/mainnetAddresses.json
@@ -7,7 +7,7 @@
     "aaveGovernanceV2Address" : {"artifact" : "IAaveGovernanceV2", "address" : "0xEC568fffba86c094cf06b22134B23074DFE2252c"},
     "aaveIncentivesControllerAddress" : {"address": "0xd784927ff2f95ba542bfc824c8a8a98f3495f6b5"},
     "aaveLendingPoolAddress" : {"artifact" : "ILendingPool", "address": "0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9"},
-    "aaveRaiPCVDeposit": {"artifact" : "AavePCVDeposit", "address": "0xd2174d78637a40448112aa6B30F9B19e6CF9d1F9"},
+    "aaveRaiPCVDepositAddress": {"artifact" : "AavePCVDeposit", "address": "0xd2174d78637a40448112aa6B30F9B19e6CF9d1F9"},
     "aaveTribeIncentivesControllerAddress" : {"artifact": "IAaveIncentivesController", "address": "0xDee5c1662bBfF8f80f7c572D8091BF251b3B0dAB"},
     "aaveTribeIncentivesControllerProxyAddress" : {"artifact": "TransparentUpgradeableProxy", "address": "0xDee5c1662bBfF8f80f7c572D8091BF251b3B0dAB"},
     "aaveTribeIncentivesControllerImplAddress" : {"address": "0xFF865335401F12B88fa3FF5A3a51685A7f224191"},
@@ -16,6 +16,10 @@
     "aFeiVariableDebtAddress" : {"artifact" : "IERC20", "address": "0xC2e10006AccAb7B45D9184FcF5b7EC7763f5BaAe"},
     "aRaiAddress" : {"address": "0xc9BC48c72154ef3e5425641a3c747242112a46AF"},
     "aWETHAddress" : {"address": "0x030bA81f1c18d280636F32af80b9AAd02Cf0854e"},
+    "balancerAdminAddress" : {"address" : "0x10A19e7eE7d7F8a52822f6817de8ea18204F2e4f"},
+    "balancerAuthorizerAddress" : {"artifact": "Permissions", "address" : "0xA331D84eC860Bf466b4CdCcFb4aC09a1B43F3aE6"},
+    "balancerLBPoolFactoryAddress" : {"artifact" : "ILiquidityBootstrappingPoolFactory", "address": "0x751A0bC0e3f75b38e01Cf25bFCE7fF36DE1C87DE"},
+    "balancerVaultAddress" : {"artifact": "IVault", "address" : "0xBA12222222228d8Ba445958a75a0704d566BF2C8"},
     "bentoBoxAddress" : { "artifact" : "IMasterContractManager", "address" : "0xF5BCE5077908a1b7370B9ae04AdC565EBd643966" },
     "bondingCurveAddress": { "artifact": "BondingCurve", "address":  "0xe1578B4a32Eaefcd563a9E6d0dc02a4213f673B7"},
     "chainlinkDaiUsdOracleAddress": { "address":  "0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9"},
@@ -29,6 +33,7 @@
     "chainlinkRaiEthOracleAddress": {"address": "0x4ad7B025127e89263242aB68F0f9c4E5C033B489"},
     "chainlinkRaiEthOracleWrapperAddress": { "artifact": "ChainlinkOracleWrapper", "address":  "0x3d49573ee6aFCBDe606F8a1c2AA1C498048E7190"},
     "chainlinkRaiUsdCompositOracleAddress": { "artifact": "CompositeOracle", "address":  "0x392b1d29eDab680c5CA778D3A32b8284859BFBB0"}, 
+    "chainlinkTribeEthOracleAddress": {"address": "0x84a24deCA415Acc0c395872a9e6a63E27D6225c8"},
     "communalFarmAddress" : { "address":  "0x0639076265e9f88542C91DCdEda65127974A5CA5"},
     "compositeOracleAddress": { "artifact": "CompositeOracle", "address":  "0x8721f9EAba0B9081069970bCBce38763D3D4f28E"},
     "compoundDaiAddress" : { "address" : "0x5d3a536e4d6dbd6114cc1ead35777bab948e3643"},
@@ -39,6 +44,9 @@
     "coreAddress": { "artifact": "Core", "address": "0x8d5ED43dCa8C2F7dFB20CF7b53CC7E593635d7b9" },
     "creamFeiAddress" : { "artifact" : "CErc20Delegator", "address": "0x8C3B7a4320ba70f8239F83770c4015B5bc4e6F91" },
     "creamFeiPCVDepositAddress" : { "artifact" : "ERC20CompoundPCVDeposit", "address": "0x243C601CC5DaA3Ac250B14509804188347bd2aFB" },
+    "curve3crvAddress": { "artifact": "IStableSwap3", "address":  "0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490"},
+    "curve3poolAddress": { "artifact": "IStableSwap3", "address":  "0xbebc44782c7db0a1a60cb6fe97d0b483032ff1c7"},
+    "curveMetapoolAddress": { "artifact": "IStableSwap2", "address":  "0x06cb22615ba53e60d67bf6c341a0fd5e718e1655"},  
     "curve3MetapoolAddress": {"artifact" : "IERC20", "address": "0x06cb22615BA53E60D67Bf6C341a0fD5E718E1655" },
     "daiAddress" : {"artifact" : "IERC20", "address" : "0x6B175474E89094C44Da98b954EedeAC495271d0F"},
     "daiBondingCurveAddress": { "artifact": "BondingCurve", "address":  "0xC0afe0E649e32528666F993ce63822c3840e941a"},
@@ -76,6 +84,12 @@
     "proxyAdminAddress" : { "artifact" : "ProxyAdmin", "address": "0xf8c2b645988b7658E7748BA637fE25bdD46A704A"},
     "raiAddress": {"artifact" : "IERC20", "address" : "0x03ab458634910AaD20eF5f1C8ee96F1D6ac54919"},
     "raiBondingCurveAddress": { "artifact": "BondingCurve", "address":  "0x25d60212D47Dd8F6Ff0469367E4c6C98Cd3411A5"},
+    "rariPool19DpiAddress": { "artifact" : "CErc20Delegator", "address": "0xf06f65a6b7d2c401fcb8b3273d036d21fe2a5963"},
+    "rariPool19DpiPCVDepositAddress": { "artifact" : "ERC20CompoundPCVDeposit", "address": "0x3dD3d945C4253bAc5B4Cc326a001B7d3f9C4DD66"},
+    "rariPool18FeiAddress": { "artifact" : "CErc20Delegator", "address": "0x17b1A2E012cC4C31f83B90FF11d3942857664efc"},
+    "rariPool18FeiPCVDepositAddress": { "artifact" : "ERC20CompoundPCVDeposit", "address": "0x5A8CB4556e5D5935Af06beab8292905f48131479"},
+    "rariPool19FeiAddress": { "artifact" : "CErc20Delegator", "address": "0x04281F6715Dea6A8EbBCE143D86ea506FF326531"},
+    "rariPool19FeiPCVDepositAddress": { "artifact" : "ERC20CompoundPCVDeposit", "address": "0xD6960adba53212bBE96E54a7AFeDA2066437D000"},
     "rariPool24FeiAddress": { "artifact" : "CErc20Delegator", "address": "0xb5A817E5354736eafe3A0C85620433eE75daA649"},
     "rariPool24FeiPCVDepositAddress": { "artifact" : "ERC20CompoundPCVDeposit", "address": "0x1434F99EDB2bD03DECCCFe21288767b8324B7403"},
     "rariPool25FeiAddress": { "artifact" : "CErc20Delegator", "address": "0xE468D0244D75b9b18B27cb682AeC3ab35d33663B"},
@@ -100,6 +114,8 @@
     "rariPool8TribeIrmAddress": {"address": "0x075538650a9c69ac8019507a7dd1bd879b12c1d7" },
     "rariPool9FeiAddress": { "artifact" : "CErc20Delegator", "address": "0x11A9F6ae6B36B4b820777D05B90Cd6CCCB1CDa31"},
     "rariPool9FeiPCVDepositAddress": { "artifact" : "ERC20CompoundPCVDeposit", "address": "0xF2D8beE45f29A779cFB9F04ac233E703974a2C53"},
+    "rariPool9RaiAddress": { "artifact" : "CErc20Delegator", "address": "0x752F119bD4Ee2342CE35E2351648d21962c7CAfE"},
+    "rariPool9RaiPCVDepositAddress": { "artifact" : "ERC20CompoundPCVDeposit", "address": "0x9aAdFfe00eAe6d8e59bB4F7787C6b99388A6960D"},
     "ratioPCVControllerAddress": { "artifact": "RatioPCVController", "address":  "0xfC1aD6eb84351597cD3b9B65179633697d65B920"},
     "reflexerStableAssetFusePoolRaiAddress" : {"artifact" : "CErc20Delegator", "address" : "0x752F119bD4Ee2342CE35E2351648d21962c7CAfE"},
     "reflexerStableAssetFusePoolRaiPCVDepositAddress" : { "artifact" : "ERC20CompoundPCVDeposit", "address" : "0x9aAdFfe00eAe6d8e59bB4F7787C6b99388A6960D" },

diff --git a/contract-addresses/permissions.json b/contract-addresses/permissions.json
@@ -2,16 +2,16 @@
   "minter": [
     "bondingCurveAddress",
     "uniswapPCVDepositAddress",
-    "uniswapPCVControllerAddress",
     "timelockAddress",
     "dpiBondingCurveAddress",
     "daiBondingCurveAddress",
     "dpiUniswapPCVDepositAddress",
-    "raiBondingCurveAddress"
+    "raiBondingCurveAddress",
+    "pcvEquityMinterAddress",
+    "collateralizationOracleKeeperAddress"
   ],
   "burner": [
     "ethReserveStabilizerAddress",
-    "uniswapPCVControllerAddress",
     "tribeReserveStabilizerAddress"
   ],
   "governor": [

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.0;
+
+import "@uniswap/v2-periphery/contracts/interfaces/IWETH.sol";
+
+library Constants {
+    /// @notice the denominator for basis points granularity (10,000)
+    uint256 public constant BASIS_POINTS_GRANULARITY = 10_000;
+
+    /// @notice WETH9 address
+    IWETH public constant WETH = IWETH(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2);
+
+    /// @notice USD stand-in address
+    address public constant USD = 0x1111111111111111111111111111111111111111;
+}
@@ -8,13 +8,14 @@ import "../pcv/utils/PCVSplitter.sol";
 import "../utils/Incentivized.sol";
 import "../pcv/IPCVDeposit.sol";
 import "../utils/Timed.sol";
+import "../Constants.sol";
 
 /**
  * @title a bonding curve for purchasing FEI with ERC-20 tokens
  * @author Fei Protocol
  * 
  */ 
-contract BondingCurve is IBondingCurve, OracleRef, PCVSplitter, Timed, Incentivized {
+contract BondingCurve is IPCVDepositBalances, IBondingCurve, OracleRef, PCVSplitter, Timed, Incentivized {
     using Decimal for Decimal.D256;
 
     /// @notice the Scale target at which bonding curve price fixes
@@ -35,8 +36,6 @@ contract BondingCurve is IBondingCurve, OracleRef, PCVSplitter, Timed, Incentivi
     /// @notice the cap on how much FEI can be minted by the bonding curve
     uint256 public override mintCap;
 
-    uint256 public constant BASIS_POINTS_GRANULARITY = 10_000;
-
     /// @notice constructor
     /// @param _core Fei Core to reference
     /// @param _oracle the price oracle to reference
@@ -107,6 +106,16 @@ contract BondingCurve is IBondingCurve, OracleRef, PCVSplitter, Timed, Incentivi
         return token.balanceOf(address(this));
     }
 
+    /// @notice display the related token of the balance reported
+    function balanceReportedIn() public view override returns (address) {
+        return address(token);
+    }
+
+    /// @notice returns a manipulation resistant account of both the balance of underlying and protocol owned FEI
+    function resistantBalanceAndFei() public view override returns(uint256, uint256) {
+      return (balance(), 0);
+    }
+
     /// @notice sets the bonding curve Scale target
     function setScale(uint256 newScale) external override onlyGovernorOrAdmin {
         _setScale(newScale);
@@ -122,7 +131,7 @@ contract BondingCurve is IBondingCurve, OracleRef, PCVSplitter, Timed, Incentivi
     /// @notice sets the bonding curve price buffer
     function setBuffer(uint256 newBuffer) external override onlyGovernorOrAdmin {
         require(
-            newBuffer < BASIS_POINTS_GRANULARITY,
+            newBuffer < Constants.BASIS_POINTS_GRANULARITY,
             "BondingCurve: Buffer exceeds or matches granularity"
         );
         uint256 oldBuffer = buffer;
@@ -133,7 +142,7 @@ contract BondingCurve is IBondingCurve, OracleRef, PCVSplitter, Timed, Incentivi
     /// @notice sets the bonding curve price discount
     function setDiscount(uint256 newDiscount) external override onlyGovernorOrAdmin {
         require(
-            newDiscount < BASIS_POINTS_GRANULARITY,
+            newDiscount < Constants.BASIS_POINTS_GRANULARITY,
             "BondingCurve: Buffer exceeds or matches granularity"
         );
         uint256 oldDiscount = discount;
@@ -151,20 +160,12 @@ contract BondingCurve is IBondingCurve, OracleRef, PCVSplitter, Timed, Incentivi
         _setMintCap(_mintCap);
     }
 
-    /// @notice sets the allocation of incoming PCV
-    function setAllocation(
-        address[] calldata allocations,
-        uint256[] calldata ratios
-    ) external override onlyGovernor {
-        _setAllocation(allocations, ratios);
-    }
-
     /// @notice batch allocate held PCV
     function allocate() external override whenNotPaused {
         uint256 amount = balance();
         uint256 usdValueHeld = readOracle().mul(amount).asUint256();
         // the premium is the USD value held multiplied by the buffer that a user would pay to get FEI assuming FEI is $1
-        uint256 premium = usdValueHeld * buffer / BASIS_POINTS_GRANULARITY;
+        uint256 premium = usdValueHeld * buffer / Constants.BASIS_POINTS_GRANULARITY;
 
         // this requirement mitigates gaming the allocate function and ensures it is only called when sufficient demand has been met
         require(premium >= incentiveAmount, "BondingCurve: Not enough PCV held");
@@ -176,8 +177,6 @@ contract BondingCurve is IBondingCurve, OracleRef, PCVSplitter, Timed, Incentivi
             _initTimed(); // reset window
             _incentivize();
         }
-
-        emit Allocate(msg.sender, amount);
     }
 
     /// @notice a boolean signalling whether Scale has been reached
@@ -246,7 +245,7 @@ contract BondingCurve is IBondingCurve, OracleRef, PCVSplitter, Timed, Incentivi
         require(availableToMint() >= amountOut, "BondingCurve: exceeds mint cap");
 
         _incrementTotalPurchased(amountOut);
-        fei().mint(to, amountOut);
+        _mintFei(to, amountOut);
 
         emit Purchase(to, amountIn, amountOut);
 
@@ -281,14 +280,14 @@ contract BondingCurve is IBondingCurve, OracleRef, PCVSplitter, Timed, Incentivi
         virtual
         returns (Decimal.D256 memory)
     {
-        uint256 granularity = BASIS_POINTS_GRANULARITY;
+        uint256 granularity = Constants.BASIS_POINTS_GRANULARITY;
         // uses 1/1-b because the oracle price is inverted
         return Decimal.ratio(granularity, granularity - discount);
     }
 
     /// @notice returns the buffer on the post-scale bonding curve price
     function _getBufferMultiplier() internal view returns (Decimal.D256 memory) {
-        uint256 granularity = BASIS_POINTS_GRANULARITY;
+        uint256 granularity = Constants.BASIS_POINTS_GRANULARITY;
         // uses 1/1+b because the oracle price is inverted
         return Decimal.ratio(granularity, granularity + buffer);
     }

@@ -2,6 +2,7 @@
 pragma solidity ^0.8.4;
 
 import "./BondingCurve.sol";
+import "../Constants.sol";
 
 /// @title a bonding curve for purchasing FEI with ETH
 /// @author Fei Protocol
@@ -32,7 +33,7 @@ contract EthBondingCurve is BondingCurve {
             params.ratios,
             params.duration,
             params.incentive,
-            IERC20(address(0)),
+            IERC20(address(Constants.WETH)),
             params.discount,
             params.buffer
         )

@@ -17,8 +17,6 @@ interface IBondingCurve {
 
     event Purchase(address indexed to, uint256 amountIn, uint256 amountOut);
 
-    event Allocate(address indexed caller, uint256 amount);
-
     event Reset(uint256 oldTotalPurchased);
 
     // ----------- State changing Api -----------
@@ -40,11 +38,6 @@ interface IBondingCurve {
 
     function setScale(uint256 newScale) external;
 
-    function setAllocation(
-        address[] calldata pcvDeposits,
-        uint256[] calldata ratios
-    ) external;
-
     function setIncentiveFrequency(uint256 newFrequency) external;
 
     function setMintCap(uint256 newMintCap) external;
@@ -68,8 +61,6 @@ interface IBondingCurve {
 
     function totalPurchased() external view returns (uint256);
 
-    function balance() external view returns (uint256);
-
     function token() external view returns (IERC20);
 
     function mintCap() external view returns (uint256);

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.4;
+
+interface ILiquidityBootstrappingPoolFactory {
+    function create(
+        string memory name,
+        string memory symbol,
+        address[] memory tokens,
+        uint256[] memory weights,
+        uint256 swapFeePercentage,
+        address owner,
+        bool swapEnabledOnStart
+    ) external returns (address);
+}
@@ -0,0 +1,32 @@
+pragma solidity ^0.8.0;
+
+import "../token/FeiTimedMinter.sol";
+import "../oracle/ICollateralizationOracleWrapper.sol";
+
+/// @title CollateralizationOracleKeeper
+/// @notice a FEI timed minter which only rewards when updating the collateralization oracle 
+contract CollateralizationOracleKeeper is FeiTimedMinter {
+
+    ICollateralizationOracleWrapper public collateralizationOracleWrapper;
+
+    /**
+        @notice constructor for CollateralizationOracleKeeper
+        @param _core the Core address to reference
+        @param _incentive the incentive amount for calling mint paid in FEI
+        @param _collateralizationOracleWrapper the collateralizationOracleWrapper to incentivize updates only
+        sets the target to this address and mint amount to 0, relying exclusively on the incentive payment to caller
+    */
+    constructor(
+        address _core,
+        uint256 _incentive,
+        ICollateralizationOracleWrapper _collateralizationOracleWrapper
+    ) 
+        FeiTimedMinter(_core, address(this), _incentive, MIN_MINT_FREQUENCY, 0) 
+    {
+        collateralizationOracleWrapper = _collateralizationOracleWrapper;
+    }
+
+    function _afterMint() internal override {
+        collateralizationOracleWrapper.updateIfOutdated();
+    }
+}
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+pragma solidity ^0.8.4;
+
+import "./MockOracleCoreRef.sol";
+
+contract MockCollateralizationOracle is MockOracleCoreRef {
+
+    uint256 public userCirculatingFei = 1e20;
+
+    uint256 public pcvValue = 5e20;
+
+    constructor(address core, uint256 exchangeRate)
+        MockOracleCoreRef(core, exchangeRate)
+    {
+    }
+
+    function set(uint _userCirculatingFei, uint _pcvValue) public {
+        userCirculatingFei = _userCirculatingFei;
+        pcvValue = _pcvValue;
+    }
+
+    function isOvercollateralized() public view returns (bool) {
+        return pcvEquityValue() > 0;
+    }
+
+    function pcvEquityValue() public view returns (int256) {
+        return int256(pcvValue) - int256(userCirculatingFei);
+    }
+
+    function pcvStats() public view returns(uint256, uint256, int256, bool) {
+        return (pcvValue, userCirculatingFei, pcvEquityValue(), valid);
+    }
+}