update new max supply check to check totalMinted instead

ProjectOpenSea · Apr 6, 2024 · 43bc829 · 43bc829
1 parent d649b49
commit 43bc829
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/src-upgradeable/src/ERC721ContractMetadataUpgradeable.sol b/src-upgradeable/src/ERC721ContractMetadataUpgradeable.sol
@@ -146,11 +146,11 @@ contract ERC721ContractMetadataUpgradeable is
             revert CannotExceedMaxSupplyOfUint64(newMaxSupply);
         }
 
-        // Ensure the max supply does not exceed the total supply.
-        if (newMaxSupply < totalSupply()) {
-            revert NewMaxSupplyCannotBeLessThenTotalSupply(
+        // Ensure the max supply does not exceed the total minted.
+        if (newMaxSupply < _totalMinted()) {
+            revert NewMaxSupplyCannotBeLessThenTotalMinted(
                 newMaxSupply,
-                totalSupply()
+                _totalMinted()
             );
         }
 

diff --git a/src-upgradeable/src/interfaces/ISeaDropTokenContractMetadataUpgradeable.sol b/src-upgradeable/src/interfaces/ISeaDropTokenContractMetadataUpgradeable.sol
@@ -15,7 +15,7 @@ interface ISeaDropTokenContractMetadataUpgradeable is IERC2981Upgradeable {
     /**
      * @notice Throw if the max supply exceeds the total supply.
      */
-    error NewMaxSupplyCannotBeLessThenTotalSupply(
+    error NewMaxSupplyCannotBeLessThenTotalMinted(
         uint256 got,
         uint256 totalSupply
     );

diff --git a/src/ERC721ContractMetadata.sol b/src/ERC721ContractMetadata.sol
@@ -143,11 +143,11 @@ contract ERC721ContractMetadata is
             revert CannotExceedMaxSupplyOfUint64(newMaxSupply);
         }
 
-        // Ensure the max supply does not exceed the total supply.
-        if (newMaxSupply < totalSupply()) {
-            revert NewMaxSupplyCannotBeLessThenTotalSupply(
+        // Ensure the max supply does not exceed the total minted.
+        if (newMaxSupply < _totalMinted()) {
+            revert NewMaxSupplyCannotBeLessThenTotalMinted(
                 newMaxSupply,
-                totalSupply()
+                _totalMinted()
             );
         }
 

diff --git a/src/clones/ERC721ContractMetadataCloneable.sol b/src/clones/ERC721ContractMetadataCloneable.sol
@@ -138,11 +138,11 @@ contract ERC721ContractMetadataCloneable is
             revert CannotExceedMaxSupplyOfUint64(newMaxSupply);
         }
 
-        // Ensure the max supply does not exceed the total supply.
-        if (newMaxSupply < totalSupply()) {
-            revert NewMaxSupplyCannotBeLessThenTotalSupply(
+        // Ensure the max supply does not exceed the total minted.
+        if (newMaxSupply < _totalMinted()) {
+            revert NewMaxSupplyCannotBeLessThenTotalMinted(
                 newMaxSupply,
-                totalSupply()
+                _totalMinted()
             );
         }
 

diff --git a/src/interfaces/ISeaDropTokenContractMetadata.sol b/src/interfaces/ISeaDropTokenContractMetadata.sol
@@ -11,11 +11,11 @@ interface ISeaDropTokenContractMetadata is IERC2981 {
     error CannotExceedMaxSupplyOfUint64(uint256 newMaxSupply);
 
     /**
-     * @notice Throw if the max supply exceeds the total supply.
+     * @notice Throw if the max supply exceeds the total minted.
      */
-    error NewMaxSupplyCannotBeLessThenTotalSupply(
+    error NewMaxSupplyCannotBeLessThenTotalMinted(
         uint256 got,
-        uint256 totalSupply
+        uint256 totalMinted
     );
 
     /**

diff --git a/test/ERC721ContractMetadata.spec.ts b/test/ERC721ContractMetadata.spec.ts
@@ -109,7 +109,7 @@ describe(`ERC721ContractMetadata (v${VERSION})`, function () {
     );
   });
 
-  it("Should not let the owner set the max supply over the totalSupply", async () => {
+  it("Should not let the owner set the max supply over the totalMinted", async () => {
     await token.setMaxSupply(3);
     await whileImpersonating(
       seadrop.address,
@@ -121,7 +121,7 @@ describe(`ERC721ContractMetadata (v${VERSION})`, function () {
     expect(await token.totalSupply()).to.equal(3);
 
     await expect(token.setMaxSupply(2)).to.be.revertedWith(
-      "NewMaxSupplyCannotBeLessThenTotalSupply(2, 3)"
+      "NewMaxSupplyCannotBeLessThenTotalMinted(2, 3)"
     );
   });