cleanup

Author: mattstam

contracts/foundry.lock

@@ -10,10 +10,10 @@ import {UUPSUpgradeable} from
     "../../lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/UUPSUpgradeable.sol";
 import {ReentrancyGuardUpgradeable} from
     "../../lib/openzeppelin-contracts-upgradeable/contracts/utils/ReentrancyGuardUpgradeable.sol";
-import {ERC721AUpgradeable} from "../../lib/ERC721A-Upgradeable/contracts/ERC721AUpgradeable.sol";
-import {IERC721AUpgradeable} from "../../lib/ERC721A-Upgradeable/contracts/IERC721AUpgradeable.sol";
 import {ERC721A__Initializable} from
     "../../lib/ERC721A-Upgradeable/contracts/ERC721A__Initializable.sol";
+import {ERC721AUpgradeable} from "../../lib/ERC721A-Upgradeable/contracts/ERC721AUpgradeable.sol";
+import {IERC721AUpgradeable} from "../../lib/ERC721A-Upgradeable/contracts/IERC721AUpgradeable.sol";
 import {ERC721AStorage} from "../../lib/ERC721A-Upgradeable/contracts/ERC721AStorage.sol";
 import {IERC20} from "../../lib/openzeppelin-contracts/contracts/interfaces/IERC20.sol";
 import {IERC20Permit} from
@@ -29,8 +29,8 @@ string constant SYMBOL = "Titan1GPU";
 contract SuccinctTitan1GPU is
     ISuccinctTitan1GPU,
     Initializable,
-    ERC721A__Initializable,
     OwnableUpgradeable,
+    ERC721A__Initializable,
     ERC721AUpgradeable,
     ReentrancyGuardUpgradeable,
     UUPSUpgradeable
@@ -55,9 +55,6 @@ contract SuccinctTitan1GPU is
     /// @dev Track actual minted supply since ERC721A's totalSupply includes skipped tokens
     uint256 private _actualSupply;
 
-    /// @inheritdoc ISuccinctTitan1GPU
-    uint256 public override nextId;
-
     /// @inheritdoc ISuccinctTitan1GPU
     uint256 public override saleId;
 
@@ -71,7 +68,7 @@ contract SuccinctTitan1GPU is
     mapping(address => uint256) public override whitelistMinted;
 
     /// @dev Reserved storage gap for future upgrades.
-    uint256[49] internal __gap;
+    uint256[50] internal __gap;
 
     /*//////////////////////////////////////////////////////////////
                                 MODIFIERS
@@ -146,6 +143,11 @@ contract SuccinctTitan1GPU is
         return _currentPrice();
     }
 
+    /// @inheritdoc ISuccinctTitan1GPU
+    function nextId() external view override returns (uint256) {
+        return _nextTokenId();
+    }
+
     /*//////////////////////////////////////////////////////////////
                                   CORE
     //////////////////////////////////////////////////////////////*/
@@ -211,9 +213,8 @@ contract SuccinctTitan1GPU is
         // If a sale is active (some tokens are unsold), finalize it and skip the unsold tokens.
         if (_isSaleActive()) {
             uint256 skipped = currentSale.batchSize - currentSale.sold;
-            nextId += skipped;
-            // Update ERC721A's internal counter to match our nextId
-            ERC721AStorage.layout()._currentIndex = nextId;
+            // Skip tokens by updating ERC721A's internal counter
+            ERC721AStorage.layout()._currentIndex += skipped;
             emit SaleFinalized(currentSale.saleId, skipped);
         }
 
@@ -223,7 +224,7 @@ contract SuccinctTitan1GPU is
         }
 
         // Reserve token IDs for this batch.
-        uint256 reservedStartId = nextId;
+        uint256 reservedStartId = _nextTokenId();
 
         // Activate sale.
         currentSale = Sale({
@@ -388,9 +389,8 @@ contract SuccinctTitan1GPU is
         SaleType _saleType,
         uint256 _unitPrice
     ) internal {
-        uint256 startId = nextId;
+        uint256 startId = _nextTokenId();
         unchecked {
-            nextId += _amount;
             _actualSupply += _amount;
         }
 
@@ -428,19 +428,12 @@ contract SuccinctTitan1GPU is
         return baseURI;
     }
 
-    /// @dev Returns the starting token ID for sequential mints.
-    function _startTokenId() internal view virtual override returns (uint256) {
-        return 0;
-    }
-
     /// @dev Prevents transfers after minting (soulbound).
     function _beforeTokenTransfers(address from, address to, uint256 startTokenId, uint256 quantity)
         internal
         virtual
         override
     {
-        // Allow minting (from == address(0))
-        // Prevent transfers (from != address(0))
         if (from != address(0)) {
             revert TokenIsSoulbound();
         }