VIP-14 Morpho PCV Deposit

contracts/mock/MockPCVOracle.sol

@@ -0,0 +1,11 @@
+pragma solidity 0.8.13;
+
+contract MockPCVOracle {
+    int256 public pcvAmount;
+
+    /// @notice hook on PCV deposit, callable when pcv oracle is set
+    /// updates the oracle with the new liquid balance delta
+    function updateLiquidBalance(int256 pcvDelta) external {
+        pcvAmount += pcvDelta;
+    }
+}

contracts/pcv/morpho/IPCVOracle.sol

@@ -0,0 +1,7 @@
+pragma solidity 0.8.13;
+
+interface IPCVOracle {
+    /// @notice hook on PCV deposit, callable when pcv oracle is set
+    /// updates the oracle with the new liquid balance delta
+    function updateLiquidBalance(int256 pcvDelta) external;
+}

contracts/pcv/morpho/MorphoCompoundPCVDeposit.sol

@@ -10,6 +10,7 @@ import {ILens} from "./ILens.sol";
 import {IMorpho} from "./IMorpho.sol";
 import {CoreRef} from "../../refs/CoreRef.sol";
 import {Constants} from "../../Constants.sol";
+import {IPCVOracle} from "./IPCVOracle.sol";
 import {PCVDeposit} from "../PCVDeposit.sol";
 import {ICompoundOracle, ICToken} from "./ICompound.sol";
 
@@ -40,6 +41,13 @@ contract MorphoCompoundPCVDeposit is PCVDeposit, ReentrancyGuard {
     using SafeERC20 for IERC20;
     using SafeCast for *;
 
+    /// ------------------------------------------
+    /// ----------------- Event ------------------
+    /// ------------------------------------------
+
+    /// @notice emitted when the PCV Oracle address is updated
+    event PCVOracleUpdated(address oldOracle, address newOracle);
+
     /// ------------------------------------------
     /// ---------- Immutables/Constant -----------
     /// ------------------------------------------
@@ -62,7 +70,7 @@ contract MorphoCompoundPCVDeposit is PCVDeposit, ReentrancyGuard {
     address public immutable cToken;
 
     /// ------------------------------------------
-    /// ------------- State Variable -------------
+    /// ------------- State Variables -------------
     /// ------------------------------------------
 
     /// @notice track the last amount of PCV recorded in the contract
@@ -71,6 +79,12 @@ contract MorphoCompoundPCVDeposit is PCVDeposit, ReentrancyGuard {
     /// most of the time.
     uint256 public lastRecordedBalance;
 
+    /// @notice reference to the PCV Oracle. Settable by governance
+    /// if set, anytime PCV is updated, delta is sent in to update liquid
+    /// amount of PCV held
+    /// not set in the constructor
+    address public pcvOracle;
+
     /// @param _core reference to the core contract
     /// @param _cToken cToken this deposit references
     /// @param _underlying Token denomination of this deposit
@@ -131,6 +145,8 @@ contract MorphoCompoundPCVDeposit is PCVDeposit, ReentrancyGuard {
             return;
         }
 
+        int256 startingRecordedBalance = lastRecordedBalance.toInt256();
+
         /// ------ Effects ------
 
         /// compute profit from interest accrued and emit an event
@@ -151,6 +167,14 @@ contract MorphoCompoundPCVDeposit is PCVDeposit, ReentrancyGuard {
             amount
         );
 
+        int256 endingRecordedBalance = balance().toInt256();
+
+        if (pcvOracle != address(0)) {
+            IPCVOracle(pcvOracle).updateLiquidBalance(
+                endingRecordedBalance - startingRecordedBalance
+            );
+        }
+
         emit Deposit(msg.sender, amount);
     }
 
@@ -173,8 +197,19 @@ contract MorphoCompoundPCVDeposit is PCVDeposit, ReentrancyGuard {
     /// to lastRecordedBalance
     /// @return the amount deposited after adding accrued interest or realizing losses
     function accrue() external nonReentrant whenNotPaused returns (uint256) {
+        int256 startingRecordedBalance = lastRecordedBalance.toInt256();
+
         _recordPNL(); /// update deposit amount and fire harvest event
 
+        int256 endingRecordedBalance = lastRecordedBalance.toInt256();
+
+        if (pcvOracle != address(0)) {
+            /// if any amount of PCV is withdrawn and no gains, delta is negative
+            IPCVOracle(pcvOracle).updateLiquidBalance(
+                endingRecordedBalance - startingRecordedBalance
+            );
+        }
+
         return lastRecordedBalance; /// return updated pcv amount
     }
 
@@ -191,18 +226,54 @@ contract MorphoCompoundPCVDeposit is PCVDeposit, ReentrancyGuard {
         onlyPCVController
         nonReentrant
     {
+        int256 startingRecordedBalance = lastRecordedBalance.toInt256();
+
         _withdraw(to, amount, true);
+
+        int256 endingRecordedBalance = lastRecordedBalance.toInt256();
+        if (pcvOracle != address(0)) {
+            /// if any amount of PCV is withdrawn and no gains, delta is negative
+            IPCVOracle(pcvOracle).updateLiquidBalance(
+                endingRecordedBalance - startingRecordedBalance
+            );
+        }
     }
 
     /// @notice withdraw all tokens from Morpho
     /// non-reentrant as state changes and external calls are made
     /// @param to the address PCV will be sent to
     function withdrawAll(address to) external onlyPCVController nonReentrant {
+        int256 startingRecordedBalance = lastRecordedBalance.toInt256();
+
         /// compute profit from interest accrued and emit an event
         _recordPNL();
 
         /// withdraw last recorded amount as this was updated in record pnl
         _withdraw(to, lastRecordedBalance, false);
+
+        int256 endingRecordedBalance = lastRecordedBalance.toInt256();
+
+        if (pcvOracle != address(0)) {
+            /// all PCV withdrawn, send call in with amount withdrawn negative if any amount is withdrawn
+            IPCVOracle(pcvOracle).updateLiquidBalance(
+                endingRecordedBalance - startingRecordedBalance
+            );
+        }
+    }
+
+    /// @notice set the pcv oracle address
+    /// @param _pcvOracle new pcv oracle to reference
+    function setPCVOracle(address _pcvOracle) external onlyGovernor {
+        address oldOracle = pcvOracle;
+        pcvOracle = _pcvOracle;
+
+        _recordPNL();
+
+        IPCVOracle(pcvOracle).updateLiquidBalance(
+            lastRecordedBalance.toInt256()
+        );
+
+        emit PCVOracleUpdated(oldOracle, _pcvOracle);
     }
 
     /// ------------------------------------------
@@ -225,13 +296,6 @@ contract MorphoCompoundPCVDeposit is PCVDeposit, ReentrancyGuard {
         uint256 amount,
         bool recordPnl
     ) private {
-        /// ------ Check ------
-
-        /// no op if amount to withdraw is 0
-        if (amount == 0) {
-            return;
-        }
-
         /// ------ Effects ------
 
         if (recordPnl) {

contracts/test/integration/vip/vip14.sol

@@ -238,6 +238,8 @@ contract vip14 is DSTest, IVIP {
         assertEq(address(daiDeposit.core()), core);
         assertEq(address(router.core()), core);
 
+        assertEq(daiDeposit.pcvOracle(), address(0));
+        assertEq(usdcDeposit.pcvOracle(), address(0));
         assertEq(daiDeposit.morpho(), MainnetAddresses.MORPHO);
         assertEq(usdcDeposit.morpho(), MainnetAddresses.MORPHO);
         assertEq(daiDeposit.lens(), MainnetAddresses.MORPHO_LENS);

contracts/test/invariant/InvariantTestMorphoPCVDeposit.t.sol

@@ -1,13 +1,15 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity =0.8.13;
 
+import {SafeCast} from "@openzeppelin/contracts/utils/math/SafeCast.sol";
 import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 
 import {Vm} from "../unit/utils/Vm.sol";
 import {ICore} from "../../core/ICore.sol";
 import {DSTest} from "../unit/utils/DSTest.sol";
 import {MockERC20} from "../../mock/MockERC20.sol";
 import {MockMorpho} from "../../mock/MockMorpho.sol";
+import {MockPCVOracle} from "../../mock/MockPCVOracle.sol";
 import {DSInvariantTest} from "../unit/utils/DSInvariantTest.sol";
 import {MorphoCompoundPCVDeposit} from "../../pcv/morpho/MorphoCompoundPCVDeposit.sol";
 import {getCore, getAddresses, VoltTestAddresses} from "../unit/utils/Fixtures.sol";
@@ -17,13 +19,19 @@ import {getCore, getAddresses, VoltTestAddresses} from "../unit/utils/Fixtures.s
 
 /// @dev Modified from Solmate ERC20 Invariant Test (https://github.com/transmissions11/solmate/blob/main/src/test/ERC20.t.sol)
 contract InvariantTestMorphoCompoundPCVDeposit is DSTest, DSInvariantTest {
+    using SafeCast for *;
+
     MorphoPCVDepositTest public morphoTest;
+    MockPCVOracle public pcvOracle;
     ICore public core;
     MorphoCompoundPCVDeposit public morphoDeposit;
     MockMorpho public morpho;
     MockERC20 public token;
+    Vm private vm = Vm(HEVM_ADDRESS);
+    VoltTestAddresses public addresses = getAddresses();
 
     function setUp() public {
+        pcvOracle = new MockPCVOracle();
         core = getCore();
         token = new MockERC20();
         morpho = new MockMorpho(IERC20(address(token)));
@@ -36,6 +44,9 @@ contract InvariantTestMorphoCompoundPCVDeposit is DSTest, DSInvariantTest {
         );
         morphoTest = new MorphoPCVDepositTest(morphoDeposit, token, morpho);
 
+        vm.prank(addresses.governorAddress);
+        morphoDeposit.setPCVOracle(address(pcvOracle));
+
         addTargetContract(address(morphoTest));
     }
 
@@ -47,6 +58,15 @@ contract InvariantTestMorphoCompoundPCVDeposit is DSTest, DSInvariantTest {
         assertEq(morphoDeposit.balance(), morphoTest.totalDeposited());
     }
 
+    function invariantPcvOracle() public {
+        assertEq(
+            morphoDeposit.lastRecordedBalance(),
+            pcvOracle.pcvAmount().toUint256()
+        );
+        assertEq(morphoDeposit.lastRecordedBalance(), morphoDeposit.balance());
+        assertEq(morphoDeposit.balance(), morphoTest.totalDeposited());
+    }
+
     function invariantBalanceOf() public {
         assertEq(
             morphoDeposit.balance(),