Add ERC721CMRoyalties

me-foundation · Feb 24, 2024 · b4a9b46 · b4a9b46
1 parent dfbec62
commit b4a9b46
Show file tree

Hide file tree

Showing 12 changed files with 392 additions and 92 deletions.
diff --git a/contracts/ERC721CM.sol b/contracts/ERC721CM.sol
@@ -170,7 +170,8 @@ contract ERC721CM is IERC721M, ERC721ACQueryable, Ownable, ReentrancyGuard {
             if (i >= 1) {
                 if (
                     newStages[i].startTimeUnixSeconds <
-                    newStages[i - 1].endTimeUnixSeconds + _timestampExpirySeconds
+                    newStages[i - 1].endTimeUnixSeconds +
+                        _timestampExpirySeconds
                 ) {
                     revert InsufficientStageTimeGap();
                 }
@@ -365,7 +366,7 @@ contract ERC721CM is IERC721M, ERC721ACQueryable, Ownable, ReentrancyGuard {
         bytes32[] calldata proof,
         uint64 timestamp,
         bytes calldata signature
-    ) virtual external payable nonReentrant {
+    ) external payable virtual nonReentrant {
         _mintInternal(qty, msg.sender, proof, timestamp, signature);
     }
 
@@ -417,7 +418,8 @@ contract ERC721CM is IERC721M, ERC721ACQueryable, Ownable, ReentrancyGuard {
         stage = _mintStages[activeStage];
 
         // Check value if minting with ETH
-        if (_mintCurrency == address(0) && msg.value < stage.price * qty) revert NotEnoughValue();
+        if (_mintCurrency == address(0) && msg.value < stage.price * qty)
+            revert NotEnoughValue();
 
         // Check stage supply if applicable
         if (stage.maxStageSupply > 0) {
@@ -450,7 +452,11 @@ contract ERC721CM is IERC721M, ERC721ACQueryable, Ownable, ReentrancyGuard {
         }
 
         if (_mintCurrency != address(0)) {
-            IERC20(_mintCurrency).safeTransferFrom(msg.sender, address(this), stage.price * qty);
+            IERC20(_mintCurrency).safeTransferFrom(
+                msg.sender,
+                address(this),
+                stage.price * qty
+            );
         }
 
         _stageMintedCountsPerWallet[activeStage][to] += qty;
@@ -552,7 +558,7 @@ contract ERC721CM is IERC721M, ERC721ACQueryable, Ownable, ReentrancyGuard {
      */
     function setContractURI(string calldata uri) external onlyOwner {
         _contractURI = uri;
-    } 
+    }
 
     /**
      * @dev Returns data hash for the given minter, qty and timestamp.
@@ -646,4 +652,4 @@ contract ERC721CM is IERC721M, ERC721ACQueryable, Ownable, ReentrancyGuard {
     function _requireCallerIsContractOwner() internal view virtual override {
         _checkOwner();
     }
-}
+}
diff --git a/contracts/ERC721CMBasicRoyalties.sol b/contracts/ERC721CMBasicRoyalties.sol
@@ -19,7 +19,8 @@ contract ERC721CMBasicRoyalties is ERC721CM, BasicRoyalties {
         uint64 timestampExpirySeconds,
         address mintCurrency,
         address royaltyReceiver,
-        uint96 royaltyFeeNumerator)
+        uint96 royaltyFeeNumerator
+    )
         ERC721CM(
             collectionName,
             collectionSymbol,
@@ -28,10 +29,18 @@ contract ERC721CMBasicRoyalties is ERC721CM, BasicRoyalties {
             globalWalletLimit,
             cosigner,
             timestampExpirySeconds,
-            mintCurrency)
-        BasicRoyalties(royaltyReceiver, royaltyFeeNumerator) {}
+            mintCurrency
+        )
+        BasicRoyalties(royaltyReceiver, royaltyFeeNumerator)
+    {}
 
-    function supportsInterface(bytes4 interfaceId) public view virtual override(ERC2981, ERC721ACQueryable, IERC721A) returns (bool) {
+    function supportsInterface(bytes4 interfaceId)
+        public
+        view
+        virtual
+        override(ERC2981, ERC721ACQueryable, IERC721A)
+        returns (bool)
+    {
         return super.supportsInterface(interfaceId);
     }
-}
+}
diff --git a/contracts/ERC721CMRoyalties.sol b/contracts/ERC721CMRoyalties.sol
@@ -0,0 +1,46 @@
+//SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.4;
+
+import {ERC2981, UpdatableRoyalties} from "./royalties/UpdatableRoyalties.sol";
+import {ERC721CM, ERC721ACQueryable, IERC721A} from "./ERC721CM.sol";
+
+/**
+ * @title ERC721CMRoyalties
+ */
+contract ERC721CMRoyalties is ERC721CM, UpdatableRoyalties {
+    constructor(
+        string memory collectionName,
+        string memory collectionSymbol,
+        string memory tokenURISuffix,
+        uint256 maxMintableSupply,
+        uint256 globalWalletLimit,
+        address cosigner,
+        uint64 timestampExpirySeconds,
+        address mintCurrency,
+        address royaltyReceiver,
+        uint96 royaltyFeeNumerator
+    )
+        ERC721CM(
+            collectionName,
+            collectionSymbol,
+            tokenURISuffix,
+            maxMintableSupply,
+            globalWalletLimit,
+            cosigner,
+            timestampExpirySeconds,
+            mintCurrency
+        )
+        UpdatableRoyalties(royaltyReceiver, royaltyFeeNumerator)
+    {}
+
+    function supportsInterface(bytes4 interfaceId)
+        public
+        view
+        virtual
+        override(ERC2981, ERC721ACQueryable, IERC721A)
+        returns (bool)
+    {
+        return super.supportsInterface(interfaceId);
+    }
+}