cleanup

Author: mattstam

contracts/.gas-snapshot

@@ -199,9 +199,9 @@ SuccinctStakingUnstakeTests:test_Unstake_WhenTwoClaimsMixedReady() (gas: 661139)
 SuccinctStakingUnstakeTests:test_Unstake_WhenTwoStakersOneProverReward() (gas: 1142765)
 SuccinctStakingUnstakeTests:test_Unstake_WhenTwoStakersTwoProversDispenseOnly() (gas: 1052844)
 SuccinctStakingUnstakeTests:test_Unstake_WhenValid() (gas: 654142)
-SuccinctTitan1GPUTest:test_RevertBeginStage1_StageAlreadyStarted() (gas: 51719)
+SuccinctTitan1GPUTest:test_RevertBeginStage1_StageAlreadyStarted() (gas: 51741)
 SuccinctTitan1GPUTest:test_RevertBeginStage2_StageNotStarted() (gas: 20333)
-SuccinctTitan1GPUTest:test_RevertMint_WhenPaused() (gas: 85836)
+SuccinctTitan1GPUTest:test_RevertMint_WhenPaused() (gas: 85858)
 SuccinctTitan1GPUTest:test_RevertNonOwner_beginStage1() (gas: 18735)
 SuccinctTitan1GPUTest:test_RevertNonOwner_beginStage2() (gas: 18648)
 SuccinctTitan1GPUTest:test_RevertNonOwner_setBaseURI() (gas: 18942)
@@ -210,33 +210,33 @@ SuccinctTitan1GPUTest:test_RevertNonOwner_withdraw() (gas: 19101)
 SuccinctTitan1GPUTest:test_RevertPermitAndStage1Mint_WhenDeadlineExpired() (gas: 117777)
 SuccinctTitan1GPUTest:test_RevertSetStage1Allocation_StageAlreadyStarted() (gas: 48211)
 SuccinctTitan1GPUTest:test_RevertSetStage1Allocation_ZeroAddress() (gas: 20585)
-SuccinctTitan1GPUTest:test_RevertStage1Mint_ExceedsAllocation() (gas: 147693)
-SuccinctTitan1GPUTest:test_RevertStage1Mint_NoAllocation() (gas: 121254)
-SuccinctTitan1GPUTest:test_RevertStage1Mint_SoldOut() (gas: 2798160)
-SuccinctTitan1GPUTest:test_RevertStage1Mint_Stage1Only() (gas: 122792)
-SuccinctTitan1GPUTest:test_RevertStage1Mint_ZeroAmount() (gas: 70645)
-SuccinctTitan1GPUTest:test_RevertStage2Mint_Stage2Only() (gas: 119019)
-SuccinctTitan1GPUTest:test_RevertTransferFrom_TokenIsSoulbound() (gas: 224086)
+SuccinctTitan1GPUTest:test_RevertStage1Mint_ExceedsAllocation() (gas: 147715)
+SuccinctTitan1GPUTest:test_RevertStage1Mint_NoAllocation() (gas: 121276)
+SuccinctTitan1GPUTest:test_RevertStage1Mint_SoldOut() (gas: 2795979)
+SuccinctTitan1GPUTest:test_RevertStage1Mint_Stage1Only() (gas: 122814)
+SuccinctTitan1GPUTest:test_RevertStage1Mint_ZeroAmount() (gas: 70667)
+SuccinctTitan1GPUTest:test_RevertStage2Mint_Stage2Only() (gas: 118930)
+SuccinctTitan1GPUTest:test_RevertTransferFrom_TokenIsSoulbound() (gas: 224108)
 SuccinctTitan1GPUTest:test_RevertWithdraw_InvalidPayment() (gas: 28245)
 SuccinctTitan1GPUTest:test_RevertWithdraw_ZeroAddress() (gas: 18494)
 SuccinctTitan1GPUTest:test_RevertWithdraw_ZeroAmount() (gas: 20604)
-SuccinctTitan1GPUTest:test_autoPauseWhenSoldOut() (gas: 2919235)
+SuccinctTitan1GPUTest:test_autoPauseWhenSoldOut() (gas: 2917054)
 SuccinctTitan1GPUTest:test_beginStage1() (gas: 48993)
 SuccinctTitan1GPUTest:test_beginStage2() (gas: 51160)
-SuccinctTitan1GPUTest:test_fullWorkflow() (gas: 56209000)
-SuccinctTitan1GPUTest:test_pause() (gas: 52497)
+SuccinctTitan1GPUTest:test_fullWorkflow() (gas: 56208866)
+SuccinctTitan1GPUTest:test_pause() (gas: 52519)
 SuccinctTitan1GPUTest:test_permitAndStage1Mint() (gas: 329440)
 SuccinctTitan1GPUTest:test_permitAndStage2Mint() (gas: 217082)
-SuccinctTitan1GPUTest:test_setBaseURI() (gas: 239981)
+SuccinctTitan1GPUTest:test_setBaseURI() (gas: 240025)
 SuccinctTitan1GPUTest:test_setStage1Allocation() (gas: 50136)
-SuccinctTitan1GPUTest:test_setUp() (gas: 57832)
-SuccinctTitan1GPUTest:test_stage1Mint_batch() (gas: 353668)
-SuccinctTitan1GPUTest:test_stage1Mint_single() (gas: 233417)
-SuccinctTitan1GPUTest:test_stage2Mint() (gas: 186278)
-SuccinctTitan1GPUTest:test_stage2Mint_multipleUsers() (gas: 250614)
-SuccinctTitan1GPUTest:test_tokenURI() (gas: 228081)
+SuccinctTitan1GPUTest:test_setUp() (gas: 57811)
+SuccinctTitan1GPUTest:test_stage1Mint_batch() (gas: 353712)
+SuccinctTitan1GPUTest:test_stage1Mint_single() (gas: 233439)
+SuccinctTitan1GPUTest:test_stage2Mint() (gas: 186189)
+SuccinctTitan1GPUTest:test_stage2Mint_multipleUsers() (gas: 250436)
+SuccinctTitan1GPUTest:test_tokenURI() (gas: 228125)
 SuccinctTitan1GPUTest:test_unpause() (gas: 22858)
-SuccinctTitan1GPUTest:test_withdraw() (gas: 424199)
+SuccinctTitan1GPUTest:test_withdraw() (gas: 424132)
 SuccinctTokenTest:test_InitialOwner() (gas: 12808)
 SuccinctTokenTest:test_Mint_WhenOwner() (gas: 61178)
 SuccinctTokenTest:test_RevertMint_WhenNotOwner() (gas: 11221)

contracts/src/interfaces/ISuccinctTitanGPU.sol

@@ -88,9 +88,9 @@ interface ISuccinctTitanGPU {
     /// @return The USDC token address.
     function usdc() external view returns (address);
 
-    /// @notice Returns the price per token in USDC base units.
-    /// @return The price per token.
-    function price() external view returns (uint256);
+    /// @notice Returns the mint price per token in USDC base units.
+    /// @return The mint price per token.
+    function mintPrice() external view returns (uint256);
 
     /// @notice Returns the maximum number of tokens that can be minted in the initial sale.
     /// @return The initial supply limit.

contracts/src/tokens/SuccinctTitan1GPU.sol

@@ -48,7 +48,7 @@ contract SuccinctTitan1GPU is
     address public override usdc;
 
     /// @inheritdoc ISuccinctTitanGPU
-    uint256 public override price;
+    uint256 public override mintPrice;
 
     /// @inheritdoc ISuccinctTitanGPU
     uint256 public override initialSupply;
@@ -85,18 +85,18 @@ contract SuccinctTitan1GPU is
     /// @param _usdc USDC token address.
     /// @param _baseTokenURI Initial base URI.
     /// @param _initialSupply Sale cap (e.g. 5000).
-    /// @param _price Price per token in USDC base units (e.g. 5000e6).
+    /// @param _mintPrice Price per token in USDC base units (e.g. 5000e6).
     function initialize(
         address _owner,
         address _usdc,
         string memory _baseTokenURI,
         uint256 _initialSupply,
-        uint256 _price
+        uint256 _mintPrice
     ) external initializer {
         if (_owner == address(0)) revert ZeroAddress();
         if (_usdc == address(0)) revert ZeroAddress();
         if (_initialSupply == 0) revert ZeroAmount();
-        if (_price == 0) revert ZeroAmount();
+        if (_mintPrice == 0) revert ZeroAmount();
 
         __UUPSUpgradeable_init();
         __Ownable_init(_owner);
@@ -107,9 +107,7 @@ contract SuccinctTitan1GPU is
         usdc = _usdc;
         baseURI = _baseTokenURI;
         initialSupply = _initialSupply;
-        price = _price;
-
-        currentStage = Stage.NONE;
+        mintPrice = _mintPrice;
 
         // Start paused, owner must begin Stage 1 explicitly.
         _pause();
@@ -140,7 +138,7 @@ contract SuccinctTitan1GPU is
     /// @inheritdoc ISuccinctTitanGPU
     function stage1Mint(uint256 _amount) external override nonReentrant whenNotPaused {
         // Transfer funds for all of the tokens being minted.
-        IERC20(usdc).safeTransferFrom(msg.sender, address(this), price * _amount);
+        IERC20(usdc).safeTransferFrom(msg.sender, address(this), mintPrice * _amount);
 
         _stage1Mint(msg.sender, _amount);
     }
@@ -154,7 +152,7 @@ contract SuccinctTitan1GPU is
         bytes32 _s
     ) external override {
         // Transfer funds for all of the tokens being minted.
-        uint256 value = price * _amount;
+        uint256 value = mintPrice * _amount;
         IERC20Permit(usdc).permit(msg.sender, address(this), value, _deadline, _v, _r, _s);
         IERC20(usdc).safeTransferFrom(msg.sender, address(this), value);
 
@@ -164,7 +162,7 @@ contract SuccinctTitan1GPU is
     /// @inheritdoc ISuccinctTitanGPU
     function stage2Mint() external override nonReentrant whenNotPaused {
         // Transfer funds for the token being minted.
-        IERC20(usdc).safeTransferFrom(msg.sender, address(this), price);
+        IERC20(usdc).safeTransferFrom(msg.sender, address(this), mintPrice);
 
         _stage2Mint(msg.sender);
     }
@@ -175,7 +173,7 @@ contract SuccinctTitan1GPU is
         override
     {
         // Transfer funds for the token being minted.
-        uint256 value = price;
+        uint256 value = mintPrice;
         IERC20Permit(usdc).permit(msg.sender, address(this), value, _deadline, _v, _r, _s);
         IERC20(usdc).safeTransferFrom(msg.sender, address(this), value);
 
@@ -278,11 +276,6 @@ contract SuccinctTitan1GPU is
         if (totalSupply + 1 > initialSupply) revert SoldOut();
 
         _mintLoop(_minter, 1, Stage.STAGE2);
-
-        // Auto-pause when cap reached.
-        if (totalSupply == initialSupply && !paused()) {
-            _pause();
-        }
     }
 
     /// @dev Mint `_amount` tokens to `_to` for `_stage`.
@@ -297,6 +290,11 @@ contract SuccinctTitan1GPU is
             }
             emit Mint(_to, tokenId, _stage);
         }
+
+        // Auto-pause when cap reached.
+        if (totalSupply == initialSupply && !paused()) {
+            _pause();
+        }
     }
 
     /// @dev Prevents transfers after minting (soulbound).

contracts/test/SuccinctTitan1GPU.t.sol

@@ -100,7 +100,7 @@ contract SuccinctTitan1GPUTest is Test {
     function test_setUp() public view {
         assertEq(SuccinctTitan1GPU(nft).owner(), owner);
         assertEq(SuccinctTitan1GPU(nft).usdc(), usdc);
-        assertEq(SuccinctTitan1GPU(nft).price(), PRICE);
+        assertEq(SuccinctTitan1GPU(nft).mintPrice(), PRICE);
         assertEq(SuccinctTitan1GPU(nft).initialSupply(), INITIAL_SUPPLY);
         assertEq(SuccinctTitan1GPU(nft).totalSupply(), 0);
         assertEq(uint8(SuccinctTitan1GPU(nft).currentStage()), uint8(ISuccinctTitanGPU.Stage.NONE));