refactor: remove all use of unchecked increment

Author: ryanio

src/dynamic-traits/DynamicTraits.sol

@@ -68,12 +68,9 @@ contract DynamicTraits is IERC7496 {
         traitValues = new bytes32[](length);
 
         // Assign each trait value to the corresopnding key.
-        for (uint256 i = 0; i < length;) {
+        for (uint256 i = 0; i < length; ++i) {
             bytes32 traitKey = traitKeys[i];
             traitValues[i] = getTraitValue(tokenId, traitKey);
-            unchecked {
-                ++i;
-            }
         }
     }
 
@@ -147,11 +144,8 @@ contract DynamicTraits is IERC7496 {
 
         // Register all trait keys.
         uint256 length = traitKeys.length;
-        for (uint256 i = 0; i < length;) {
+        for (uint256 i = 0; i < length; ++i) {
             layout._validTraitKeys[traitKeys[i]] = true;
-            unchecked {
-                ++i;
-            }
         }
 
         // Set the new trait metadata URI.

src/dynamic-traits/OnchainTraits.sol

@@ -224,19 +224,14 @@ abstract contract OnchainTraits is Ownable, DynamicTraits {
         string[] memory attributes = new string[](keysLength);
         // keep track of how many traits are actually set
         uint256 num;
-        for (uint256 i = 0; i < keysLength;) {
+        for (uint256 i = 0; i < keysLength; ++i) {
             bytes32 key = keys[i];
             bytes32 trait = getTraitValue(tokenId, key);
             // check that the trait is set, otherwise, skip it
             if (trait != bytes32(0)) {
                 attributes[num] =
                     TraitLabelStorageLib.toAttributeJson(OnchainTraitsStorage.layout()._traitLabelStorage, key, trait);
-                unchecked {
-                    ++num;
-                }
-            }
-            unchecked {
-                ++i;
+                ++num;
             }
         }
         ///@solidity memory-safe-assembly

src/dynamic-traits/lib/TraitLabelLib.sol

@@ -88,15 +88,12 @@ library TraitLabelStorageLib {
         if (traitLabel.fullTraitValues.length != 0) {
             // try to find matching FullTraitValue
             uint256 length = traitLabel.fullTraitValues.length;
-            for (uint256 i = 0; i < length;) {
+            for (uint256 i = 0; i < length; ++i) {
                 FullTraitValue memory fullTraitValue = traitLabel.fullTraitValues[i];
                 if (fullTraitValue.traitValue == traitValue) {
                     actualTraitValue = fullTraitValue.fullTraitValue;
                     break;
                 }
-                unchecked {
-                    ++i;
-                }
             }
         }
         // if no match, use traitValue as-is
@@ -121,13 +118,10 @@ library TraitLabelStorageLib {
     {
         string[] memory result = new string[](keys.length);
         uint256 i;
-        for (i; i < keys.length;) {
+        for (i; i < keys.length; ++i) {
             bytes32 key = keys[i];
             TraitLabel memory traitLabel = TraitLabelStorageLib.toTraitLabel(traitLabelStorage[key]); //.toTraitLabel();
             result[i] = TraitLabelLib.toLabelJson(traitLabel, key);
-            unchecked {
-                ++i;
-            }
         }
         return json.arrayOf(result);
     }
@@ -152,11 +146,8 @@ library FullTraitValueLib {
      */
     function toJson(FullTraitValue[] memory fullTraitValues) internal pure returns (string memory) {
         string[] memory result = new string[](fullTraitValues.length);
-        for (uint256 i = 0; i < fullTraitValues.length;) {
+        for (uint256 i = 0; i < fullTraitValues.length; ++i) {
             result[i] = toJson(fullTraitValues[i]);
-            unchecked {
-                ++i;
-            }
         }
         return json.arrayOf(result);
     }
@@ -185,13 +176,10 @@ library TraitLabelLib {
         if (length != 0) {
             string memory stringValue = TraitLib.toString(traitValue, displayType);
             bytes32 hashedValue = keccak256(abi.encodePacked(stringValue));
-            for (uint256 i = 0; i < length;) {
+            for (uint256 i = 0; i < length; ++i) {
                 if (hashedValue == keccak256(abi.encodePacked(acceptableValues[i]))) {
                     return;
                 }
-                unchecked {
-                    ++i;
-                }
             }
             revert InvalidTraitValue(traitKey, traitValue);
         }
@@ -263,13 +251,10 @@ library TraitLib {
      */
     function _bytes32StringLength(bytes32 str) internal pure returns (uint256) {
         // only meant to be called in a view context, so this optimizes for bytecode size over performance
-        for (uint256 i; i < 32;) {
+        for (uint256 i; i < 32; ++i) {
             if (str[i] == 0) {
                 return i;
             }
-            unchecked {
-                ++i;
-            }
         }
         return 32;
     }
@@ -289,11 +274,8 @@ library EditorsLib {
     function aggregate(AllowedEditor[] memory editors) internal pure returns (Editors) {
         uint256 editorsLength = editors.length;
         uint256 result;
-        for (uint256 i = 0; i < editorsLength;) {
+        for (uint256 i = 0; i < editorsLength; ++i) {
             result |= 1 << uint8(editors[i]);
-            unchecked {
-                ++i;
-            }
         }
         return Editors.wrap(uint8(result));
     }
@@ -311,16 +293,11 @@ library EditorsLib {
         // optimistically allocate 4 slots
         AllowedEditor[] memory result = new AllowedEditor[](4);
         uint256 num;
-        for (uint256 i = 1; i < 5;) {
+        for (uint256 i = 1; i < 5; ++i) {
             bool set = _editors & (1 << i) != 0;
             if (set) {
                 result[num] = AllowedEditor(i);
-                unchecked {
-                    ++num;
-                }
-            }
-            unchecked {
-                ++i;
+                ++num;
             }
         }
         ///@solidity memory-safe-assembly
@@ -356,11 +333,8 @@ library EditorsLib {
      */
     function toJson(AllowedEditor[] memory editors) internal pure returns (string memory) {
         string[] memory result = new string[](editors.length);
-        for (uint256 i = 0; i < editors.length;) {
+        for (uint256 i = 0; i < editors.length; ++i) {
             result[i] = LibString.toString(uint8(editors[i]));
-            unchecked {
-                ++i;
-            }
         }
         return json.arrayOf(result);
     }

src/dynamic-traits/test/ERC721DynamicTraitsMultiUpdate.sol

@@ -11,16 +11,12 @@ contract ERC721DynamicTraitsMultiUpdate is ERC721DynamicTraits {
         virtual
         onlyOwner
     {
-        for (uint256 tokenId = fromTokenId; tokenId <= toTokenId;) {
+        for (uint256 tokenId = fromTokenId; tokenId <= toTokenId; ++tokenId) {
             // Revert if the token doesn't exist.
             _requireOwned(tokenId);
 
             // Call the internal function to set the trait.
             _setTrait(tokenId, traitKey, value);
-
-            unchecked {
-                ++tokenId;
-            }
         }
 
         // Emit the event noting the update.
@@ -33,33 +29,25 @@ contract ERC721DynamicTraitsMultiUpdate is ERC721DynamicTraits {
         bytes32 traitKey,
         bytes32[] calldata values
     ) public virtual onlyOwner {
-        for (uint256 tokenId = fromTokenId; tokenId <= toTokenId;) {
+        for (uint256 tokenId = fromTokenId; tokenId <= toTokenId; ++tokenId) {
             // Revert if the token doesn't exist.
             _requireOwned(tokenId);
 
             // Call the internal function to set the trait.
             _setTrait(tokenId, traitKey, values[tokenId - 1]);
-
-            unchecked {
-                ++tokenId;
-            }
         }
 
         // Emit the event noting the update.
         emit TraitUpdatedRange(traitKey, fromTokenId, toTokenId);
     }
 
     function setTraitsList(uint256[] calldata tokenIds, bytes32 traitKey, bytes32 value) public virtual onlyOwner {
-        for (uint256 i = 0; i < tokenIds.length;) {
+        for (uint256 i = 0; i < tokenIds.length; ++i) {
             // Revert if the token doesn't exist.
             _requireOwned(tokenIds[i]);
 
             // Call the internal function to set the trait.
             _setTrait(tokenIds[i], traitKey, value);
-
-            unchecked {
-                ++i;
-            }
         }
 
         // Emit the event noting the update.
@@ -71,16 +59,12 @@ contract ERC721DynamicTraitsMultiUpdate is ERC721DynamicTraits {
         virtual
         onlyOwner
     {
-        for (uint256 i = 0; i < tokenIds.length;) {
+        for (uint256 i = 0; i < tokenIds.length; ++i) {
             // Revert if the token doesn't exist.
             _requireOwned(tokenIds[i]);
 
             // Call the internal function to set the trait.
             _setTrait(tokenIds[i], traitKey, values[i]);
-
-            unchecked {
-                ++i;
-            }
         }
 
         // Emit the event noting the update.

src/onchain/json.sol

@@ -106,11 +106,8 @@ library json {
      */
     function quote(string[] memory strs) internal pure returns (string[] memory) {
         string[] memory result = new string[](strs.length);
-        for (uint256 i = 0; i < strs.length;) {
+        for (uint256 i = 0; i < strs.length; ++i) {
             result[i] = quote(strs[i]);
-            unchecked {
-                ++i;
-            }
         }
         return result;
     }

src/reference/ExampleNFT.sol

@@ -79,9 +79,7 @@ contract ExampleNFT is AbstractNFT {
     }
 
     function mint(address to) public {
-        unchecked {
-            _mint(to, ++currentId);
-        }
+        _mint(to, ++currentId);
     }
 
     function _isOwnerOrApproved(uint256 tokenId, address addr) internal view virtual override returns (bool) {

src/sips/lib/SIP6Decoder.sol

@@ -297,12 +297,9 @@ library SIP6Decoder {
     function _validateFixedArrays(bytes[] memory fixedArrays, bytes32 expectedFixedDataHash) internal pure {
         bytes32[] memory hashes = new bytes32[](fixedArrays.length);
         uint256 fixedArraysLength = fixedArrays.length;
-        for (uint256 i = 0; i < fixedArraysLength;) {
+        for (uint256 i = 0; i < fixedArraysLength; ++i) {
             bytes memory fixedArray = fixedArrays[i];
             hashes[i] = keccak256(fixedArray);
-            unchecked {
-                ++i;
-            }
         }
         bytes32 compositeHash;
         ///@solidity memory-safe-assembly
@@ -338,7 +335,7 @@ library SIP6Decoder {
             arrayLengthInBytes: decoded.length << 5,
             substandard: substandard
         });
-        for (uint256 i = 0; i < decoded.length;) {
+        for (uint256 i = 0; i < decoded.length; ++i) {
             uint256 subArrayOffset;
             uint256 subArrayLength;
             assembly {
@@ -378,9 +375,6 @@ library SIP6Decoder {
                 arrayLengthInBytes: subArrayLength,
                 substandard: substandard
             });
-            unchecked {
-                ++i;
-            }
         }
     }