Merge branch 'delta' into vg/fix/c4-audit-istranscoder

contracts/bonding/BondingManager.sol

@@ -41,7 +41,7 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
         uint256 feeShare; // % of fees paid to delegators by transcoder
         mapping(uint256 => EarningsPool.Data) earningsPoolPerRound; // Mapping of round => earnings pool for the round
         uint256 lastActiveStakeUpdateRound; // Round for which the stake was last updated while the transcoder is active
-        uint256 activationRound; // Round in which the transcoder became active - 0 if inactive
+        uint256 activationRound; // Round in which the transcoder became active - if inactive will be 0 or <=deactivationRound
         uint256 deactivationRound; // Round in which the transcoder will become inactive
         uint256 activeCumulativeRewards; // The transcoder's cumulative rewards that are active in the current round
         uint256 cumulativeRewards; // The transcoder's cumulative rewards (earned via the its active staked rewards and its reward cut).
@@ -143,7 +143,6 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
      * should be used to initialize state variables post-deployment:
      * - setUnbondingPeriod()
      * - setNumActiveTranscoders()
-     * - setMaxEarningsClaimsRounds()
      * @param _controller Address of Controller that this contract will be registered with
      */
     constructor(address _controller) Manager(_controller) {}
@@ -386,7 +385,9 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
     }
 
     /**
-     * @notice Slash a transcoder. Only callable by the Verifier
+     * @notice Slash a transcoder. Only callable by the Verifier.
+     * @dev DEPRECATED: This function is not currently used in the protocol and the Verifier role is not configured. Its
+     * implementation is not compatible with the rest of the BondingManager code anymore.
      * @param _transcoder Transcoder address
      * @param _finder Finder that proved a transcoder violated a slashing condition. Null address if there is no finder
      * @param _slashAmount Percentage of transcoder bond to be slashed
@@ -443,7 +444,8 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
 
     /**
      * @notice Claim token pools shares for a delegator from its lastClaimRound through the end round
-     * @param _endRound The last round for which to claim token pools shares for a delegator
+     * @param _endRound Unused, but used to represented the last round for which to claim token pools shares for a
+     * delegator. Currently, the earnings are always claimed until the current round instead.
      */
     function claimEarnings(uint256 _endRound)
         external
@@ -558,11 +560,14 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
 
         // Requirements for a third party caller that is not the L2Migrator
         if (msg.sender != _owner && msg.sender != l2Migrator()) {
-            // Does not trigger self-delegation
-            // Does not change the delegate if it is already non-null
+            // Does not bond for the zero address
+            require(_owner != address(0), "INVALID_DELEGATOR");
+
             if (delegatorStatus(_owner) == DelegatorStatus.Unbonded) {
+                // Does not trigger self-delegation
                 require(_to != _owner, "INVALID_DELEGATE");
             } else {
+                // Does not change the delegate if it is already non-null
                 require(currentDelegate == _to, "INVALID_DELEGATE_CHANGE");
             }
         }
@@ -588,6 +593,8 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
             delegationAmount = delegationAmount.add(currentBondedAmount);
 
             decreaseTotalStake(currentDelegate, currentBondedAmount, _oldDelegateNewPosPrev, _oldDelegateNewPosNext);
+            // no need to prevent double checkpointing since _owner is not a transcoder (i.e. currentDelegate != _owner)
+            _checkpointBondingState(currentDelegate, delegators[currentDelegate], transcoders[currentDelegate]);
         }
 
         {
@@ -611,6 +618,10 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
         del.bondedAmount = currentBondedAmount.add(_amount);
 
         increaseTotalStake(_to, delegationAmount, _currDelegateNewPosPrev, _currDelegateNewPosNext);
+        if (_to != _owner) {
+            // Avoid double checkpointing of the transcoder if it's a self-bond
+            _checkpointBondingState(_to, delegators[_to], transcoders[_to]);
+        }
 
         if (_amount > 0) {
             // Transfer the LPT to the Minter
@@ -721,6 +732,8 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
             // Requirements for caller
             // Does not trigger self-delegation
             require(oldDelDelegate != _delegator, "INVALID_DELEGATOR");
+            // Does not transfer bond to the zero address
+            require(address(0) != _delegator, "INVALID_DELEGATOR");
 
             newDel.delegateAddress = oldDelDelegate;
         }
@@ -780,6 +793,10 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
 
         // If msg.sender was resigned this statement will only decrease delegators[currentDelegate].delegatedAmount
         decreaseTotalStake(currentDelegate, _amount, _newPosPrev, _newPosNext);
+        if (currentDelegate != msg.sender) {
+            // Avoid double checkpointing of the transcoder if it's a self-unbond
+            _checkpointBondingState(currentDelegate, delegators[currentDelegate], transcoders[currentDelegate]);
+        }
 
         emit Unbond(currentDelegate, msg.sender, unbondingLockId, _amount, withdrawRound);
     }
@@ -903,7 +920,8 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
     /**
      * @notice Returns pending bonded stake for a delegator from its lastClaimRound through an end round
      * @param _delegator Address of delegator
-     * @param _endRound The last round to compute pending stake from
+     * @param _endRound Unused, but used to represent the last round to compute pending stake from. Currently, the
+     * pending stake is always calculated for the current round instead.
      * @return Pending bonded stake for '_delegator' since last claiming rewards
      */
     function pendingStake(address _delegator, uint256 _endRound) public view returns (uint256) {
@@ -918,7 +936,8 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
     /**
      * @notice Returns pending fees for a delegator from its lastClaimRound through an end round
      * @param _delegator Address of delegator
-     * @param _endRound The last round to compute pending fees from
+     * @param _endRound Unused, but used to represent the last round to compute pending fees from. Currently, the
+     * pending fees are always calculated for the current round instead.
      * @return Pending fees for '_delegator' since last claiming fees
      */
     function pendingFees(address _delegator, uint256 _endRound) public view returns (uint256) {
@@ -1288,7 +1307,8 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
     }
 
     /**
-     * @dev Increase the total stake for a delegate and updates its 'lastActiveStakeUpdateRound'
+     * @dev Increase the total stake for a delegate and updates its 'lastActiveStakeUpdateRound'. Notice that this
+     * function does not checkpoint the delegate and callers should take care of it themselves.
      * @param _delegate The delegate to increase the stake for
      * @param _amount The amount to increase the stake for '_delegate' by
      */
@@ -1297,19 +1317,6 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
         uint256 _amount,
         address _newPosPrev,
         address _newPosNext
-    ) internal autoCheckpoint(_delegate) {
-        return increaseTotalStakeUncheckpointed(_delegate, _amount, _newPosPrev, _newPosNext);
-    }
-
-    /**
-     * @dev Implementation of increaseTotalStake that does not checkpoint the caller, to be used by functions that
-     * guarantee the checkpointing themselves.
-     */
-    function increaseTotalStakeUncheckpointed(
-        address _delegate,
-        uint256 _amount,
-        address _newPosPrev,
-        address _newPosNext
     ) internal {
         Transcoder storage t = transcoders[_delegate];
 
@@ -1355,7 +1362,7 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
         uint256 _amount,
         address _newPosPrev,
         address _newPosNext
-    ) internal autoCheckpoint(_delegate) {
+    ) internal {
         Transcoder storage t = transcoders[_delegate];
 
         uint256 currStake = transcoderTotalStake(_delegate);
@@ -1486,7 +1493,7 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
         // the earnings claiming algorithm and instead that amount is accounted for in the transcoder's cumulativeRewards field
         earningsPool.updateCumulativeRewardFactor(prevEarningsPool, delegatorsRewards);
         // Update transcoder's total stake with rewards
-        increaseTotalStakeUncheckpointed(_transcoder, _rewards, _newPosPrev, _newPosNext);
+        increaseTotalStake(_transcoder, _rewards, _newPosPrev, _newPosNext);
     }
 
     /**
@@ -1580,9 +1587,15 @@ contract BondingManager is ManagerProxyTarget, IBondingManager {
         // Delete lock
         delete del.unbondingLocks[_unbondingLockId];
 
-        increaseTotalStake(del.delegateAddress, amount, _newPosPrev, _newPosNext);
+        address delegate = del.delegateAddress;
+
+        increaseTotalStake(delegate, amount, _newPosPrev, _newPosNext);
+        if (delegate != _delegator) {
+            // Avoid double checkpointing of the transcoder if it's a self-rebond
+            _checkpointBondingState(delegate, delegators[delegate], transcoders[delegate]);
+        }
 
-        emit Rebond(del.delegateAddress, _delegator, _unbondingLockId, amount);
+        emit Rebond(delegate, _delegator, _unbondingLockId, amount);
     }
 
     /**

contracts/bonding/BondingVotes.sol

@@ -62,7 +62,7 @@ contract BondingVotes is ManagerProxyTarget, IBondingVotes {
     }
 
     /**
-     * @dev Stores a list of checkpoints for the total active stake, queryable and mapped by round. Notce that
+     * @dev Stores a list of checkpoints for the total active stake, queryable and mapped by round. Notice that
      * differently from bonding checkpoints, it's only accessible on the specific round. To access the checkpoint for a
      * given round, look for the checkpoint in the {data}} and if it's zero ensure the round was actually checkpointed on
      * the {rounds} array ({SortedArrays-findLowerBound}).
@@ -402,8 +402,14 @@ contract BondingVotes is ManagerProxyTarget, IBondingVotes {
 
         // Always send delegator events since transcoders are delegators themselves. The way our rewards work, the
         // delegator voting power calculated from events will only reflect their claimed stake without pending rewards.
-        if (previous.bondedAmount != current.bondedAmount) {
-            emit DelegatorBondedAmountChanged(_account, previous.bondedAmount, current.bondedAmount);
+        if (previous.bondedAmount != current.bondedAmount || previous.lastClaimRound != current.lastClaimRound) {
+            emit DelegatorBondedAmountChanged(
+                _account,
+                previous.bondedAmount,
+                previous.lastClaimRound,
+                current.bondedAmount,
+                current.lastClaimRound
+            );
         }
     }
 
@@ -474,8 +480,8 @@ contract BondingVotes is ManagerProxyTarget, IBondingVotes {
         }
 
         if (transcoderBond.lastRewardRound < bond.lastClaimRound) {
-            // If the transcoder hasn't called reward() since the last time the delegator claimed earnings, there wil be
-            // no rewards to add to the delegator's stake so we just return the originally bonded amount.
+            // If the transcoder hasn't called reward() since the last time the delegator claimed earnings, there will
+            // be no rewards to add to the delegator's stake so we just return the originally bonded amount.
             return bond.bondedAmount;
         }
 

contracts/bonding/IBondingVotes.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.9;
+pragma solidity 0.8.9;
 
 import "../treasury/IVotes.sol";
 
@@ -24,7 +24,13 @@ interface IBondingVotes is IVotes {
      * from IERC5805 by also supporting voting power for the delegators themselves, though requiring knowledge about our
      * specific reward-claiming protocol to calculate voting power based on this value.
      */
-    event DelegatorBondedAmountChanged(address indexed delegate, uint256 previousBondedAmount, uint256 newBondedAmount);
+    event DelegatorBondedAmountChanged(
+        address indexed delegate,
+        uint256 previousBondedAmount,
+        uint256 previousLastClaimRound,
+        uint256 newBondedAmount,
+        uint256 newLastClaimRound
+    );
 
     // BondingManager hooks
 

contracts/treasury/GovernorCountingOverridable.sol

@@ -57,7 +57,7 @@ abstract contract GovernorCountingOverridable is Initializable, GovernorUpgradea
     mapping(uint256 => ProposalTally) private _proposalTallies;
 
     /**
-     * @notice The required percentage of "for" votes in relation to the total opinionated votes (for and abstain) for
+     * @notice The required percentage of "for" votes in relation to the total opinionated votes (for and against) for
      * a proposal to succeed. Represented as a MathUtils percentage value (e.g. 6 decimal places).
      */
     uint256 public quota;

remappings.txt

@@ -0,0 +1,8 @@
+@ensdomains/=node_modules/@ensdomains/
+@openzeppelin/=node_modules/@openzeppelin/
+contracts/=contracts/
+ds-test/=lib/ds-test/src/
+eth-gas-reporter/=node_modules/eth-gas-reporter/
+hardhat-deploy/=node_modules/hardhat-deploy/
+hardhat/=node_modules/hardhat/
+sol-explore/=node_modules/sol-explore/