Add capital ratio snapshot without distribute to assignFunds

Author: kanewallmann

contracts/contract/megapool/RocketMegapoolDelegate.sol

@@ -320,6 +320,10 @@ contract RocketMegapoolDelegate is RocketMegapoolDelegateBase, RocketMegapoolDel
         nodeBond += assignedNodeBond;
         userQueuedCapital -= assignedUserCapital;
         nodeQueuedBond -= assignedNodeBond;
+        // Store capital ratio on first assignment
+        if (lastDistributionTime == 0) {
+            _calculateAndSaveCapitalRatio();
+        }
         // Delete prestake signature for a small gas refund (no longer needed)
         delete prestakeSignatures[_validatorId];
         // Emit event
@@ -335,7 +339,7 @@ contract RocketMegapoolDelegate is RocketMegapoolDelegateBase, RocketMegapoolDel
         require(validator.inPrestake, "Validator must be pre-staked");
         // Store last requested value for later
         uint32 lastRequestedValue = validator.lastRequestedValue;
-        // Snapshot capital ratio (sets lastDistributionTime on first validator)
+        // Snapshot capital ratio
         _snapshotCapitalRatio();
         // Account for assigned value
         uint256 assignedUsed = lastRequestedValue * milliToWei - prestakeValue;
@@ -772,13 +776,18 @@ contract RocketMegapoolDelegate is RocketMegapoolDelegateBase, RocketMegapoolDel
         return RocketNodeDepositInterface(rocketStorage.getAddress(rocketNodeDepositKey));
     }
 
-    /// @dev Calculates the current capital ratio of this Megapool and notifies RocketNetworkRevenues to snapshot it
-    ///      Attempts to distribute rewards at current ratio before snapshotting
+    /// @dev Attempts to distribute rewards at current ratio before snapshotting capital ratio
     function _snapshotCapitalRatio() internal {
         // Try to distribute rewards before updating capital ratio
         if (numExitingValidators == 0 && numLockedValidators == 0) {
             _distributeAmount(getPendingRewards());
         }
+        // Snapshot capital ratio
+        _calculateAndSaveCapitalRatio();
+    }
+
+    /// @dev Calculates the current capital ratio of this Megapool and notifies RocketNetworkRevenues to snapshot it
+    function _calculateAndSaveCapitalRatio() internal {
         // Calculate and send capital ratio to RocketNetworkRevenues for snapshotting
         RocketNetworkRevenuesInterface rocketNetworkRevenues = RocketNetworkRevenuesInterface(getContractAddress("rocketNetworkRevenues"));
         if (nodeBond + userCapital > 0) {

test/megapool/megapool-tests.js

@@ -1276,15 +1276,6 @@ export default function() {
                 await setDAOProtocolBootstrapSetting(RocketDAOProtocolSettingsMegapool, 'megapool.time.before.dissolve', dissolvePeriod, { from: owner });
             });
 
-            it(printTitle('node', 'receives any ETH that was already in the megapool prior to first validator stake'), async () => {
-                const preStakeRewards = '0.123'.ether;
-                await nodeDeposit(node);
-                await mockRewards(megapool, preStakeRewards);
-                await stakeMegapoolValidator(megapool, 0);
-                assertBN.equal(await megapool.getRefundValue(), preStakeRewards);
-                assertBN.equal(await megapool.getPendingRewards(), 0n);
-            });
-
             it(printTitle('node', 'can deposit while assignments are disabled and be assigned once enabled again'), async () => {
                 const rocketDepositPool = await RocketDepositPool.deployed();
                 // Disable deposit assignments
@@ -1830,8 +1821,8 @@ export default function() {
                 // Exit remaining 2 validators
                 await exitValidator(megapool, 1, '32'.ether);
                 await exitValidator(megapool, 2, '32'.ether);
-                // Capital ratio should be 0
-                assertBN.equal(await rocketNetworkRevenues.getNodeAverageCapitalRatioSince(node.address, await megapool.getLastDistributionTime()), 0n);
+                // Capital ratio should remain 12.5%
+                assertBN.equal(await rocketNetworkRevenues.getNodeAverageCapitalRatioSince(node.address, await megapool.getLastDistributionTime()), '0.125'.ether);
                 // Create a new validator
                 await nodeDeposit(node);
                 await stakeMegapoolValidator(megapool, 3);