Merge branch 'governor-dvp-poc' into dvp-actions-poc

Author: godzillaba

src/L2ArbitrumGovernor.sol

@@ -130,12 +130,8 @@ contract L2ArbitrumGovernor is
 
     /// @notice Get total delegated votes minus excluded votes
     function getPastTotalDelegatedVotes(uint256 blockNumber) public view returns (uint256) {
-        uint256 excluded = token.getPastVotes(EXCLUDE_ADDRESS, blockNumber);
-        uint256 totalDvp = L2ArbitrumToken(address(token)).getTotalDelegationAt(blockNumber);
-
-        // it is possible (but unlikely) that excluded > totalDvp
-        // this is because getTotalDelegationAt is initially an _estimate_ of the total delegation
-        return totalDvp > excluded ? totalDvp - excluded : 0;
+        return L2ArbitrumToken(address(token)).getTotalDelegationAt(blockNumber)
+            - token.getPastVotes(EXCLUDE_ADDRESS, blockNumber);
     }
 
     /// @notice Calculates the quorum size, excludes token delegated to the exclude address