feat(contracts): use ERC721A for Titan 1

Author: mattstam

.gitmodules

@@ -18,3 +18,7 @@
 	path = contracts/lib/murky
 	url = https://github.com/dmfxyz/murky
 	tag = v0.1.0
+[submodule "contracts/lib/ERC721A-Upgradeable"]
+	path = contracts/lib/ERC721A-Upgradeable
+	url = https://github.com/chiru-labs/ERC721A-Upgradeable
+	tag = v4.3.0

contracts/.gas-snapshot

@@ -1,5 +1,5 @@
 SuccinctGovernorTest:test_Cancel_WhenValid() (gas: 454202)
-SuccinctGovernorTest:test_Execute_WhenSlashNoIndexShift() (gas: 1221270)
+SuccinctGovernorTest:test_Execute_WhenSlashNoIndexShift() (gas: 1221312)
 SuccinctGovernorTest:test_Propose_WhenValid() (gas: 583900)
 SuccinctGovernorTest:test_RevertCancel_WhenNotProverOwner() (gas: 444114)
 SuccinctGovernorTest:test_RevertCastVote_WhenNotProverOwner() (gas: 452153)
@@ -155,40 +155,40 @@ SuccinctStakingUnstakeTests:test_Unstake_WhenTwoStakersOneProverReward() (gas: 1
 SuccinctStakingUnstakeTests:test_Unstake_WhenTwoStakersTwoProversDispenseOnly() (gas: 1052844)
 SuccinctStakingUnstakeTests:test_Unstake_WhenValid() (gas: 654142)
 SuccinctTitan1GPUTest:test_BeginFCFSSale() (gas: 125844)
-SuccinctTitan1GPUTest:test_BeginSale_FinalizesActiveSale() (gas: 175622)
+SuccinctTitan1GPUTest:test_BeginSale_FinalizesActiveSale() (gas: 197855)
 SuccinctTitan1GPUTest:test_BeginWhitelistSale() (gas: 125891)
-SuccinctTitan1GPUTest:test_CanScheduleSaleAfterCurrentEnds() (gas: 173586)
-SuccinctTitan1GPUTest:test_CanScheduleSaleAfterCurrentEndsWithBuffer() (gas: 173519)
-SuccinctTitan1GPUTest:test_CanStartSaleAfterPreviousSaleExpired() (gas: 173452)
+SuccinctTitan1GPUTest:test_CanScheduleSaleAfterCurrentEnds() (gas: 195819)
+SuccinctTitan1GPUTest:test_CanScheduleSaleAfterCurrentEndsWithBuffer() (gas: 195752)
+SuccinctTitan1GPUTest:test_CanStartSaleAfterPreviousSaleExpired() (gas: 195685)
 SuccinctTitan1GPUTest:test_CanStartSaleWhenNoPreviousSale() (gas: 121879)
-SuccinctTitan1GPUTest:test_DecreaseAllocationAfterMinting() (gas: 2872141)
-SuccinctTitan1GPUTest:test_FcfsMint() (gas: 279111)
-SuccinctTitan1GPUTest:test_FullWorkflow() (gas: 57369937)
-SuccinctTitan1GPUTest:test_IncreaseAllocationAfterMinting() (gas: 3166285)
-SuccinctTitan1GPUTest:test_MintExactlyToIncreasedAllocation() (gas: 3182322)
-SuccinctTitan1GPUTest:test_Mint_Batch() (gas: 454818)
-SuccinctTitan1GPUTest:test_Mint_MultipleUsers() (gas: 348465)
-SuccinctTitan1GPUTest:test_Mint_Single() (gas: 334134)
-SuccinctTitan1GPUTest:test_MultipleAllocationUpdatesActiveSale() (gas: 2451988)
-SuccinctTitan1GPUTest:test_PermitAuctionPriceDrop() (gas: 348339)
-SuccinctTitan1GPUTest:test_PermitFCFSMint() (gas: 312629)
-SuccinctTitan1GPUTest:test_PermitWhitelistMint() (gas: 434152)
+SuccinctTitan1GPUTest:test_DecreaseAllocationAfterMinting() (gas: 802544)
+SuccinctTitan1GPUTest:test_FcfsMint() (gas: 300500)
+SuccinctTitan1GPUTest:test_FullWorkflow() (gas: 9922563)
+SuccinctTitan1GPUTest:test_IncreaseAllocationAfterMinting() (gas: 859198)
+SuccinctTitan1GPUTest:test_MintExactlyToIncreasedAllocation() (gas: 875178)
+SuccinctTitan1GPUTest:test_Mint_Batch() (gas: 392431)
+SuccinctTitan1GPUTest:test_Mint_MultipleUsers() (gas: 369357)
+SuccinctTitan1GPUTest:test_Mint_Single() (gas: 355523)
+SuccinctTitan1GPUTest:test_MultipleAllocationUpdatesActiveSale() (gas: 738724)
+SuccinctTitan1GPUTest:test_PermitAuctionPriceDrop() (gas: 369704)
+SuccinctTitan1GPUTest:test_PermitFCFSMint() (gas: 334018)
+SuccinctTitan1GPUTest:test_PermitWhitelistMint() (gas: 413131)
 SuccinctTitan1GPUTest:test_RevertBeginFCFSSale_InvalidPriceConfig() (gas: 24247)
 SuccinctTitan1GPUTest:test_RevertBeginWhitelistSale_InvalidPriceConfig() (gas: 24282)
 SuccinctTitan1GPUTest:test_RevertFCFSMint_MultipleTokens() (gas: 157409)
 SuccinctTitan1GPUTest:test_RevertNonAuctioneer_beginSale() (gas: 23960)
 SuccinctTitan1GPUTest:test_RevertNonOwner_setBaseURI() (gas: 18921)
 SuccinctTitan1GPUTest:test_RevertNonOwner_setWhitelistAllocation() (gas: 21103)
 SuccinctTitan1GPUTest:test_RevertNonOwner_withdraw() (gas: 19080)
-SuccinctTitan1GPUTest:test_RevertPermitAndWhitelistMint_WhenDeadlineExpired() (gas: 318976)
-SuccinctTitan1GPUTest:test_RevertPermitMint_PermitValueTooLow() (gas: 315695)
-SuccinctTitan1GPUTest:test_RevertSetAllocationBelowMintedAmount() (gas: 2563180)
-SuccinctTitan1GPUTest:test_RevertSetAllocationToZeroAfterMinting() (gas: 1143912)
+SuccinctTitan1GPUTest:test_RevertPermitAndWhitelistMint_WhenDeadlineExpired() (gas: 340355)
+SuccinctTitan1GPUTest:test_RevertPermitMint_PermitValueTooLow() (gas: 337074)
+SuccinctTitan1GPUTest:test_RevertSetAllocationBelowMintedAmount() (gas: 707899)
+SuccinctTitan1GPUTest:test_RevertSetAllocationToZeroAfterMinting() (gas: 476394)
 SuccinctTitan1GPUTest:test_RevertSetWhitelistAllocation_ZeroAddress() (gas: 18496)
 SuccinctTitan1GPUTest:test_RevertSetWhitelistAllocationsBatch_ArrayLengthMismatch() (gas: 24379)
 SuccinctTitan1GPUTest:test_RevertSetWhitelistAllocationsBatch_ZeroAddress() (gas: 48658)
-SuccinctTitan1GPUTest:test_RevertTokenURI_WhenTokenDoesNotExist() (gas: 28954)
-SuccinctTitan1GPUTest:test_RevertTransferFrom_TokenIsSoulbound() (gas: 342662)
+SuccinctTitan1GPUTest:test_RevertTokenURI_WhenTokenDoesNotExist() (gas: 28230)
+SuccinctTitan1GPUTest:test_RevertTransferFrom_TokenIsSoulbound() (gas: 366512)
 SuccinctTitan1GPUTest:test_RevertWhitelistMint_ExceedsBatch() (gas: 190019)
 SuccinctTitan1GPUTest:test_RevertWhitelistMint_ExceedsBatchSize() (gas: 189352)
 SuccinctTitan1GPUTest:test_RevertWhitelistMint_NoAllocation() (gas: 159416)
@@ -197,14 +197,14 @@ SuccinctTitan1GPUTest:test_RevertWhitelistMint_ZeroAmount() (gas: 125984)
 SuccinctTitan1GPUTest:test_RevertWithdraw_InvalidPayment() (gas: 28154)
 SuccinctTitan1GPUTest:test_RevertWithdraw_ZeroAddress() (gas: 18473)
 SuccinctTitan1GPUTest:test_RevertWithdraw_ZeroAmount() (gas: 20516)
-SuccinctTitan1GPUTest:test_SetAllocationToExactlyMintedAmount() (gas: 2457153)
-SuccinctTitan1GPUTest:test_SetBaseURI() (gas: 338857)
-SuccinctTitan1GPUTest:test_SetUp() (gas: 43010)
+SuccinctTitan1GPUTest:test_SetAllocationToExactlyMintedAmount() (gas: 720649)
+SuccinctTitan1GPUTest:test_SetBaseURI() (gas: 360412)
+SuccinctTitan1GPUTest:test_SetUp() (gas: 42973)
 SuccinctTitan1GPUTest:test_SetWhitelistAllocation() (gas: 50249)
 SuccinctTitan1GPUTest:test_SetWhitelistAllocationsBatch() (gas: 117646)
 SuccinctTitan1GPUTest:test_SetWhitelistAllocationsBatch_AfterSaleStart() (gas: 156263)
-SuccinctTitan1GPUTest:test_TokenURI() (gas: 346876)
-SuccinctTitan1GPUTest:test_Withdraw() (gas: 558254)
+SuccinctTitan1GPUTest:test_TokenURI() (gas: 368431)
+SuccinctTitan1GPUTest:test_Withdraw() (gas: 484325)
 SuccinctTokenTest:test_InitialOwner() (gas: 12808)
 SuccinctTokenTest:test_Mint_WhenOwner() (gas: 61178)
 SuccinctTokenTest:test_RevertMint_WhenNotOwner() (gas: 11221)
@@ -238,10 +238,10 @@ SuccinctVAppRewardsTest:test_IsClaimed_BitMapLogic() (gas: 219830)
 SuccinctVAppRewardsTest:test_RevertRewardClaim_WhenAfterDeadline() (gas: 89373)
 SuccinctVAppRewardsTest:test_RevertRewardClaim_WhenAlreadyClaimed() (gas: 631653)
 SuccinctVAppRewardsTest:test_RevertRewardClaim_WhenEmptyProof() (gas: 129650)
-SuccinctVAppRewardsTest:test_RevertRewardClaim_WhenInvalidProof() (gas: 155554)
+SuccinctVAppRewardsTest:test_RevertRewardClaim_WhenInvalidProof() (gas: 155530)
 SuccinctVAppRewardsTest:test_RevertRewardClaim_WhenPaused() (gas: 138531)
 SuccinctVAppRewardsTest:test_RevertRewardClaim_WhenWrongAccount() (gas: 152658)
-SuccinctVAppRewardsTest:test_RevertRewardClaim_WhenWrongAmount() (gas: 155663)
+SuccinctVAppRewardsTest:test_RevertRewardClaim_WhenWrongAmount() (gas: 155639)
 SuccinctVAppRewardsTest:test_RevertSetRewardRoot_WhenBeforeDeadline() (gas: 70205)
 SuccinctVAppRewardsTest:test_RevertSetRewardRoot_WhenNotAuctioneer() (gas: 30986)
 SuccinctVAppRewardsTest:test_RewardClaim_MultipleRoots() (gas: 315217)

contracts/foundry.lock

@@ -0,0 +1,23 @@
+{
+  "lib/sp1-contracts": {
+    "rev": "512b5e029abc27f6e46a3c7eba220dac83ecc306"
+  },
+  "lib/ERC721A-Upgradeable": {
+    "tag": {
+      "name": "v4.3.0",
+      "rev": "4508a3d65ed75ccab59e80f25571c2818c03f55b"
+    }
+  },
+  "lib/forge-std": {
+    "rev": "8f24d6b04c92975e0795b5868aa0d783251cdeaa"
+  },
+  "lib/murky": {
+    "rev": "5feccd1253d7da820f7cccccdedf64471025455d"
+  },
+  "lib/openzeppelin-contracts": {
+    "rev": "acd4ff74de833399287ed6b31b4debf6b2b35527"
+  },
+  "lib/openzeppelin-contracts-upgradeable": {
+    "rev": "3d5fa5c24c411112bab47bec25cfa9ad0af0e6e8"
+  }
+}

contracts/lib/ERC721A-Upgradeable

@@ -10,8 +10,11 @@ import {UUPSUpgradeable} from
     "../../lib/openzeppelin-contracts-upgradeable/contracts/proxy/utils/UUPSUpgradeable.sol";
 import {ReentrancyGuardUpgradeable} from
     "../../lib/openzeppelin-contracts-upgradeable/contracts/utils/ReentrancyGuardUpgradeable.sol";
-import {ERC721Upgradeable} from
-    "../../lib/openzeppelin-contracts-upgradeable/contracts/token/ERC721/ERC721Upgradeable.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 {ERC721AStorage} from "../../lib/ERC721A-Upgradeable/contracts/ERC721AStorage.sol";
 import {IERC20} from "../../lib/openzeppelin-contracts/contracts/interfaces/IERC20.sol";
 import {IERC20Permit} from
     "../../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Permit.sol";
@@ -26,13 +29,15 @@ string constant SYMBOL = "Titan1GPU";
 contract SuccinctTitan1GPU is
     ISuccinctTitan1GPU,
     Initializable,
+    ERC721A__Initializable,
     OwnableUpgradeable,
-    ERC721Upgradeable,
+    ERC721AUpgradeable,
     ReentrancyGuardUpgradeable,
     UUPSUpgradeable
 {
     using SafeERC20 for IERC20;
     using Strings for uint256;
+    using ERC721AStorage for ERC721AStorage.Layout;
 
     /*//////////////////////////////////////////////////////////////
                                 STORAGE
@@ -47,8 +52,8 @@ contract SuccinctTitan1GPU is
     /// @inheritdoc ISuccinctTitan1GPU
     string public override baseURI;
 
-    /// @inheritdoc ISuccinctTitan1GPU
-    uint256 public override totalSupply;
+    /// @dev Track actual minted supply since ERC721A's totalSupply includes skipped tokens
+    uint256 private _actualSupply;
 
     /// @inheritdoc ISuccinctTitan1GPU
     uint256 public override nextId;
@@ -66,7 +71,7 @@ contract SuccinctTitan1GPU is
     mapping(address => uint256) public override whitelistMinted;
 
     /// @dev Reserved storage gap for future upgrades.
-    uint256[50] internal __gap;
+    uint256[49] internal __gap;
 
     /*//////////////////////////////////////////////////////////////
                                 MODIFIERS
@@ -94,6 +99,7 @@ contract SuccinctTitan1GPU is
     function initialize(address _owner, address _auctioneer, address _usdc, string memory _uri)
         external
         initializer
+        initializerERC721A
     {
         // Ensure that parameters critical for functionality are non-zero.
         if (_owner == address(0) || _auctioneer == address(0) || _usdc == address(0)) {
@@ -103,7 +109,7 @@ contract SuccinctTitan1GPU is
         // Set initial state.
         __UUPSUpgradeable_init();
         __Ownable_init(_owner);
-        __ERC721_init(NAME, SYMBOL);
+        __ERC721A_init(NAME, SYMBOL);
         __ReentrancyGuard_init();
         _updateAuctioneer(_auctioneer);
         usdc = _usdc;
@@ -118,13 +124,23 @@ contract SuccinctTitan1GPU is
     function tokenURI(uint256 _tokenId)
         public
         view
-        override(ERC721Upgradeable, ISuccinctTitan1GPU)
+        override(ERC721AUpgradeable, ISuccinctTitan1GPU)
         returns (string memory)
     {
-        _requireOwned(_tokenId);
+        if (!_exists(_tokenId)) revert IERC721AUpgradeable.URIQueryForNonexistentToken();
         return string(abi.encodePacked(baseURI, _tokenId.toString()));
     }
 
+    /// @inheritdoc ISuccinctTitan1GPU
+    function totalSupply()
+        public
+        view
+        override(ERC721AUpgradeable, ISuccinctTitan1GPU)
+        returns (uint256)
+    {
+        return _actualSupply;
+    }
+
     /// @inheritdoc ISuccinctTitan1GPU
     function currentPrice() external view override returns (uint256) {
         return _currentPrice();
@@ -196,6 +212,8 @@ contract SuccinctTitan1GPU is
         if (_isSaleActive()) {
             uint256 skipped = currentSale.batchSize - currentSale.sold;
             nextId += skipped;
+            // Update ERC721A's internal counter to match our nextId
+            ERC721AStorage.layout()._currentIndex = nextId;
             emit SaleFinalized(currentSale.saleId, skipped);
         }
 
@@ -373,16 +391,15 @@ contract SuccinctTitan1GPU is
         uint256 startId = nextId;
         unchecked {
             nextId += _amount;
-            totalSupply += _amount;
+            _actualSupply += _amount;
         }
 
+        // Single batch mint call
+        _mint(_to, _amount);
+
+        // Emit individual Mint events for compatibility
         for (uint256 i = 0; i < _amount; ++i) {
-            // Get the next token ID.
             uint256 tokenId = startId + i;
-
-            // Mint the token.
-            _safeMint(_to, tokenId);
-
             emit Mint(_saleId, _to, tokenId, _saleType, _unitPrice);
         }
     }
@@ -411,18 +428,23 @@ 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 _update(address _to, uint256 _tokenId, address _auth)
+    function _beforeTokenTransfers(address from, address to, uint256 startTokenId, uint256 quantity)
         internal
         virtual
-        override(ERC721Upgradeable)
-        returns (address)
+        override
     {
-        address from = _ownerOf(_tokenId);
+        // Allow minting (from == address(0))
+        // Prevent transfers (from != address(0))
         if (from != address(0)) {
             revert TokenIsSoulbound();
         }
-        return super._update(_to, _tokenId, _auth);
+        super._beforeTokenTransfers(from, to, startTokenId, quantity);
     }
 
     /// @dev Standard UUPS authorization gate.

contracts/src/tokens/SuccinctTitan1GPU.sol

@@ -7,6 +7,7 @@ import {IERC20} from "../lib/openzeppelin-contracts/contracts/interfaces/IERC20.
 import {IERC20Permit} from
     "../lib/openzeppelin-contracts/contracts/token/ERC20/extensions/IERC20Permit.sol";
 import {IERC721Errors} from "../lib/openzeppelin-contracts/contracts/interfaces/draft-IERC6093.sol";
+import {IERC721AUpgradeable} from "../lib/ERC721A-Upgradeable/contracts/IERC721AUpgradeable.sol";
 import {ERC1967Proxy} from "../lib/openzeppelin-contracts/contracts/proxy/ERC1967/ERC1967Proxy.sol";
 import {OwnableUpgradeable} from
     "../lib/openzeppelin-contracts-upgradeable/contracts/access/OwnableUpgradeable.sol";
@@ -1401,11 +1402,11 @@ contract SuccinctTitan1GPUTest is Test {
 
     function test_RevertTokenURI_WhenTokenDoesNotExist() public {
         // Try to get tokenURI for a non-existent token
-        vm.expectRevert(abi.encodeWithSelector(IERC721Errors.ERC721NonexistentToken.selector, 999));
+        vm.expectRevert(IERC721AUpgradeable.URIQueryForNonexistentToken.selector);
         SuccinctTitan1GPU(nft).tokenURI(999);
 
         // Also test with token ID 0 when no tokens have been minted
-        vm.expectRevert(abi.encodeWithSelector(IERC721Errors.ERC721NonexistentToken.selector, 0));
+        vm.expectRevert(IERC721AUpgradeable.URIQueryForNonexistentToken.selector);
         SuccinctTitan1GPU(nft).tokenURI(0);
     }