Merge branch 'delta' into feat/add-reward-caller/transcoder-to-reward-caller

Author: SidestreamSweatyPumpkin

contracts/bonding/BondingManager.sol

@@ -329,7 +329,7 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
         // Silence unused param compiler warning
         _round;
 
-        require(isRegisteredTranscoder(_transcoder), "transcoder must be registered");
+        require(isActiveTranscoder(_transcoder), "transcoder must be active");
 
         uint256 currentRound = roundsManager().currentRound();
 
@@ -363,12 +363,12 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
 
         uint256 totalStake = earningsPool.totalStake;
         if (prevEarningsPool.cumulativeRewardFactor == 0 && lastRewardRound == currentRound) {
-            // if transcoder called reward for 'currentRound' but not for 'currentRound - 1' (missed reward call)
-            // retroactively calculate what its cumulativeRewardFactor would have been for 'currentRound - 1' (cfr. previous lastRewardRound for transcoder)
-            // based on rewards for currentRound
+            // if transcoder called reward for 'currentRound' but skipped 'currentRound - 1' (missed reward call)
+            // retroactively estimate what the cumulativeRewardFactor would have been for 'currentRound - 1'
+            // based on the current round's mintable rewards and stake proportions.
             IMinter mtr = minter();
             uint256 rewards = PreciseMathUtils.percOf(
-                mtr.currentMintableTokens().add(mtr.currentMintedTokens()),
+                mtr.currentMintableTokens(),
                 totalStake,
                 currentRoundTotalActiveStake
             );
@@ -586,6 +586,8 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
         // Current bonded amount
         uint256 currentBondedAmount = del.bondedAmount;
 
+        _ensurePendingDeactivationTranscoderCalledReward(_to);
+
         // Requirements for a third party caller that is not the L2Migrator
         if (msg.sender != _owner && msg.sender != l2Migrator()) {
             // Does not bond for the zero address
@@ -1645,6 +1647,8 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
 
         address delegate = del.delegateAddress;
 
+        _ensurePendingDeactivationTranscoderCalledReward(delegate);
+
         increaseTotalStake(delegate, amount, _newPosPrev, _newPosNext);
         if (delegate != _delegator) {
             // Avoid double checkpointing of the transcoder if it's a self-rebond
@@ -1751,6 +1755,17 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
         require(roundsManager().currentRoundInitialized(), "current round is not initialized");
     }
 
+    /**
+     * Ensure the transcoder called reward, if it was deactivated in the current round
+     */
+    function _ensurePendingDeactivationTranscoderCalledReward(address _transcoder) internal view {
+        Transcoder storage t = transcoders[_transcoder];
+        uint256 currentRound = roundsManager().currentRound();
+        if (isActiveTranscoder(_transcoder) && t.deactivationRound != MAX_FUTURE_ROUND) {
+            require(t.lastRewardRound == currentRound, "transcoder has not yet called reward for the current round");
+        }
+    }
+
     function _autoClaimEarnings(address _delegator) internal {
         uint256 currentRound = roundsManager().currentRound();
         uint256 lastClaimRound = delegators[_delegator].lastClaimRound;

contracts/token/Minter.sol

@@ -28,9 +28,9 @@ contract Minter is Manager, IMinter {
     // Target bonding rate
     uint256 public targetBondingRate;
 
-    // Current number of mintable tokens. Reset every round
+    // Number of mintable tokens. Recalculated on each round change
     uint256 public currentMintableTokens;
-    // Current number of minted tokens. Reset every round
+    // Number of minted tokens. Increased with every reward. Reset to 0 on each round change
     uint256 public currentMintedTokens;
 
     // Checks if caller is BondingManager