✨ ERC20Votes

README.md

@@ -43,6 +43,7 @@ auth
 tokens
 ├─ WETH — "Simple Wrapped Ether implementation"
 ├─ ERC20 — "Simple ERC20 + EIP-2612 implementation"
+├─ ERC20Votes — "ERC20 with votes based on ERC5805 and ERC6372"
 ├─ ERC4626 — "Simple ERC4626 tokenized Vault implementation"
 ├─ ERC721 — "Simple ERC721 implementation with storage hitchhiking"
 ├─ ERC2981 — "Simple ERC2981 NFT Royalty Standard implementation"

src/Milady.sol

@@ -14,6 +14,7 @@ import "./auth/OwnableRoles.sol";
 import "./auth/EnumerableRoles.sol";
 import "./tokens/ERC1155.sol";
 import "./tokens/ERC20.sol";
+import "./tokens/ERC20Votes.sol";
 import "./tokens/ERC2981.sol";
 import "./tokens/ERC4626.sol";
 import "./tokens/ERC6909.sol";

src/tokens/ERC20.sol

@@ -359,6 +359,17 @@ abstract contract ERC20 {
         result = _DEFAULT_VERSION_HASH;
     }
 
+    /// @dev For inheriting contracts to increment the nonce.
+    function _incrementNonce(address owner) internal virtual {
+        /// @solidity memory-safe-assembly
+        assembly {
+            mstore(0x0c, _NONCES_SLOT_SEED)
+            mstore(0x00, owner)
+            let nonceSlot := keccak256(0x0c, 0x20)
+            sstore(nonceSlot, add(1, sload(nonceSlot)))
+        }
+    }
+
     /// @dev Returns the current nonce for `owner`.
     /// This value is used to compute the signature for EIP-2612 permit.
     function nonces(address owner) public view virtual returns (uint256 result) {
@@ -434,7 +445,7 @@ abstract contract ERC20 {
             mstore(0x20, and(0xff, v))
             mstore(0x40, r)
             mstore(0x60, s)
-            let t := staticcall(gas(), 1, 0, 0x80, 0x20, 0x20)
+            let t := staticcall(gas(), 1, 0x00, 0x80, 0x20, 0x20)
             // If the ecrecover fails, the returndatasize will be 0x00,
             // `owner` will be checked if it equals the hash at 0x00,
             // which evaluates to false (i.e. 0), and we will revert.