Change updating and checking max per wallet limit

Author: wojciech-turek

packages/game-passes/contracts/GamePasses.sol

@@ -580,11 +580,10 @@ contract GamePasses is
         }
 
         _updateAndCheckTotalMinted(mintTokenId, mintAmount);
-        mintConfig.mintedPerWallet[mintTo] += mintAmount;
+        _updateAndCheckMaxPerWallet(mintTokenId, mintTo, mintAmount);
 
         _burn(burnFrom, burnTokenId, burnAmount);
 
-        _checkMaxPerWallet(mintTokenId, mintTo, mintAmount);
         _mint(mintTo, mintTokenId, mintAmount, "");
     }
 
@@ -638,8 +637,7 @@ contract GamePasses is
             }
 
             _updateAndCheckTotalMinted(mintTokenIds[i], mintAmounts[i]);
-            _checkMaxPerWallet(mintTokenIds[i], mintTo, mintAmounts[i]);
-            mintConfig.mintedPerWallet[mintTo] += mintAmounts[i];
+            _updateAndCheckMaxPerWallet(mintTokenIds[i], mintTo, mintAmounts[i]);
         }
 
         _burnBatch(burnFrom, burnTokenIds, burnAmounts);
@@ -705,11 +703,9 @@ contract GamePasses is
         verifyBurnAndMintSignature(request, signature);
 
         _updateAndCheckTotalMinted(mintId, mintAmount);
-        mintConfig.mintedPerWallet[caller] += mintAmount;
+        _updateAndCheckMaxPerWallet(mintId, caller, mintAmount);
 
         _burn(caller, burnId, burnAmount);
-
-        _checkMaxPerWallet(mintId, caller, mintAmount);
         _mint(caller, mintId, mintAmount, "");
     }
 
@@ -1269,11 +1265,9 @@ contract GamePasses is
 
         verifySignature(request, signature);
 
-        _checkMaxPerWallet(request.tokenId, request.caller, request.amount);
+        _updateAndCheckMaxPerWallet(request.tokenId, request.caller, request.amount);
         _updateAndCheckTotalMinted(request.tokenId, request.amount);
 
-        config.mintedPerWallet[request.caller] += request.amount;
-
         address treasury = config.treasuryWallet;
         if (treasury == address(0)) {
             treasury = _coreStorage().defaultTreasuryWallet;
@@ -1305,11 +1299,9 @@ contract GamePasses is
                 revert TokenNotConfigured(request.tokenIds[i]);
             }
 
-            _checkMaxPerWallet(request.tokenIds[i], request.caller, request.amounts[i]);
+            _updateAndCheckMaxPerWallet(request.tokenIds[i], request.caller, request.amounts[i]);
             _updateAndCheckTotalMinted(request.tokenIds[i], request.amounts[i]);
 
-            config.mintedPerWallet[request.caller] += request.amounts[i];
-
             address treasury = config.treasuryWallet;
             if (treasury == address(0)) {
                 treasury = _coreStorage().defaultTreasuryWallet;
@@ -1388,14 +1380,16 @@ contract GamePasses is
      *      - Current wallet balance + amount would exceed max per wallet
      * @dev Skips check if maxPerWallet is type(uint256).max (unlimited)
      */
-    function _checkMaxPerWallet(uint256 tokenId, address to, uint256 amount) private view {
+    function _updateAndCheckMaxPerWallet(uint256 tokenId, address to, uint256 amount) private {
         TokenConfig storage config = _tokenStorage().tokenConfigs[tokenId];
 
+        config.mintedPerWallet[to] += amount;
+
         if (config.maxPerWallet == 0) {
             revert ExceedsMaxPerWallet(tokenId, to, amount, 0);
         }
 
-        if (config.maxPerWallet != type(uint256).max && config.mintedPerWallet[to] + amount > config.maxPerWallet) {
+        if (config.maxPerWallet != type(uint256).max && config.mintedPerWallet[to] > config.maxPerWallet) {
             revert ExceedsMaxPerWallet(tokenId, to, amount, config.maxPerWallet);
         }
     }