Rename VotesAdditionalCheckpoints to VotesExtended

Author: arr00

.changeset/great-lions-hear.md

@@ -2,4 +2,4 @@
 'openzeppelin-solidity': patch
 ---
 
-`VotesAdditionalCheckpoints`: Create an extension of `Votes` which checkpoints balances and delegates.
+`VotesExtended`: Create an extension of `Votes` which checkpoints balances and delegates.

contracts/governance/README.adoc

@@ -92,7 +92,7 @@ NOTE: Functions of the `Governor` contract do not include access control. If you
 
 {{Votes}}
 
-{{VotesAdditionalCheckpoints}}
+{{VotesExtended}}
 
 == Timelock
 

contracts/governance/extensions/GovernorCountingOverridable.sol

@@ -4,12 +4,12 @@ pragma solidity ^0.8.20;
 
 import {SignatureChecker} from "../../utils/cryptography/SignatureChecker.sol";
 import {SafeCast} from "../../utils/math/SafeCast.sol";
-import {VotesAdditionalCheckpoints} from "../utils/VotesAdditionalCheckpoints.sol";
+import {VotesExtended} from "../utils/VotesExtended.sol";
 import {GovernorVotes} from "./GovernorVotes.sol";
 
 /**
  * @dev Extension of {Governor} which enables delegatees to override the vote of their delegates. This module requires a
- * token token that inherits `VotesAdditionalCheckpoints`.
+ * token token that inherits `VotesExtended`.
  */
 abstract contract GovernorCountingOverridable is GovernorVotes {
     bytes32 public constant OVERRIDE_BALLOT_TYPEHASH =
@@ -133,11 +133,8 @@ abstract contract GovernorCountingOverridable is GovernorVotes {
         }
 
         uint256 proposalSnapshot = proposalSnapshot(proposalId);
-        uint256 overridenWeight = VotesAdditionalCheckpoints(address(token())).getPastBalanceOf(
-            account,
-            proposalSnapshot
-        );
-        address delegate = VotesAdditionalCheckpoints(address(token())).getPastDelegate(account, proposalSnapshot);
+        uint256 overridenWeight = VotesExtended(address(token())).getPastBalanceOf(account, proposalSnapshot);
+        address delegate = VotesExtended(address(token())).getPastDelegate(account, proposalSnapshot);
         uint8 delegateCasted = proposalVote.voteReceipt[delegate].casted;
 
         proposalVote.voteReceipt[account].hasOverriden = true;

contracts/governance/utils/VotesAdditionalCheckpoints.sol renamed to contracts/governance/utils/VotesExtended.sol

@@ -8,7 +8,7 @@ import {SafeCast} from "../../utils/math/SafeCast.sol";
 /**
  * @dev Extension of {Votes} that adds exposes checkpoints for delegations and balances.
  */
-abstract contract VotesAdditionalCheckpoints is Votes {
+abstract contract VotesExtended is Votes {
     using SafeCast for uint256;
     using Checkpoints for Checkpoints.Trace160;
     using Checkpoints for Checkpoints.Trace208;

contracts/mocks/VotesAdditionalCheckpointsMock.sol

@@ -2,9 +2,9 @@
 
 pragma solidity ^0.8.20;
 
-import {VotesAdditionalCheckpoints} from "../governance/utils/VotesAdditionalCheckpoints.sol";
+import {VotesExtended} from "../governance/utils/VotesExtended.sol";
 
-abstract contract VotesAdditionalCheckpointsMock is VotesAdditionalCheckpoints {
+abstract contract VotesExtendedMock is VotesExtended {
     mapping(address voter => uint256) private _votingUnits;
 
     function getTotalSupply() public view returns (uint256) {
@@ -30,7 +30,7 @@ abstract contract VotesAdditionalCheckpointsMock is VotesAdditionalCheckpoints {
     }
 }
 
-abstract contract VotesAdditionalCheckpointsTimestampMock is VotesAdditionalCheckpointsMock {
+abstract contract VotesExtendedTimestampMock is VotesExtendedMock {
     function clock() public view override returns (uint48) {
         return uint48(block.timestamp);
     }

contracts/mocks/governance/GovernorCountingOverridableMock.sol

@@ -5,7 +5,7 @@ pragma solidity ^0.8.20;
 import {Governor} from "../../governance/Governor.sol";
 import {GovernorSettings} from "../../governance/extensions/GovernorSettings.sol";
 import {GovernorVotesQuorumFraction} from "../../governance/extensions/GovernorVotesQuorumFraction.sol";
-import {GovernorCountingOverridable, VotesAdditionalCheckpoints} from "../../governance/extensions/GovernorCountingOverridable.sol";
+import {GovernorCountingOverridable, VotesExtended} from "../../governance/extensions/GovernorCountingOverridable.sol";
 
 abstract contract GovernorCountingOverridableMock is
     GovernorSettings,

contracts/mocks/token/ERC20VotesAdditionalCheckpointsMock.sol

@@ -2,27 +2,24 @@
 pragma solidity ^0.8.20;
 
 import {ERC20Votes} from "../../token/ERC20/extensions/ERC20Votes.sol";
-import {VotesAdditionalCheckpoints, Votes} from "../../governance/utils/VotesAdditionalCheckpoints.sol";
+import {VotesExtended, Votes} from "../../governance/utils/VotesExtended.sol";
 import {SafeCast} from "../../utils/math/SafeCast.sol";
 
-abstract contract ERC20VotesAdditionalCheckpointsMock is ERC20Votes, VotesAdditionalCheckpoints {
-    function _delegate(
-        address account,
-        address delegatee
-    ) internal virtual override(Votes, VotesAdditionalCheckpoints) {
+abstract contract ERC20VotesExtendedMock is ERC20Votes, VotesExtended {
+    function _delegate(address account, address delegatee) internal virtual override(Votes, VotesExtended) {
         return super._delegate(account, delegatee);
     }
 
     function _transferVotingUnits(
         address from,
         address to,
         uint256 amount
-    ) internal virtual override(Votes, VotesAdditionalCheckpoints) {
+    ) internal virtual override(Votes, VotesExtended) {
         return super._transferVotingUnits(from, to, amount);
     }
 }
 
-abstract contract ERC20VotesAdditionalCheckpointsTimestampMock is ERC20VotesAdditionalCheckpointsMock {
+abstract contract ERC20VotesExtendedTimestampMock is ERC20VotesExtendedMock {
     function clock() public view virtual override returns (uint48) {
         return SafeCast.toUint48(block.timestamp);
     }

test/governance/extensions/GovernorCountingOverridable.test.js

@@ -7,8 +7,8 @@ const { getDomain, OverrideBallot } = require('../../helpers/eip712');
 const { VoteType } = require('../../helpers/enums');
 
 const TOKENS = [
-  { Token: '$ERC20VotesAdditionalCheckpointsMock', mode: 'blocknumber' },
-  // { Token: '$ERC20VotesOverridableTimestampMock', mode: 'timestamp' },
+  { Token: '$ERC20VotesExtendedMock', mode: 'blocknumber' },
+  // { Token: '$ERC20VotesExtendedTimestampMock', mode: 'timestamp' },
 ];
 
 const name = 'Override Governor';

test/governance/utils/VotesAdditionalCheckpoints.test.js

@@ -9,13 +9,13 @@ const time = require('../../helpers/time');
 const { shouldBehaveLikeVotes } = require('./Votes.behavior');
 
 const MODES = {
-  blocknumber: '$VotesAdditionalCheckpointsMock',
-  timestamp: '$VotesAdditionalCheckpointsTimestampMock',
+  blocknumber: '$VotesExtendedMock',
+  timestamp: '$VotesExtendedTimestampMock',
 };
 
 const AMOUNTS = [ethers.parseEther('10000000'), 10n, 20n];
 
-describe('VotesAdditionalCheckpoints', function () {
+describe('VotesExtended', function () {
   for (const [mode, artifact] of Object.entries(MODES)) {
     const fixture = async () => {
       const accounts = await ethers.getSigners();