Merge branch 'main' into channing/readme

me-foundation · Mar 1, 2024 · 084c3b8 · 084c3b8
2 parents eb8a081 + ce1323a
commit 084c3b8
Show file tree

Hide file tree

Showing 27 changed files with 3,937 additions and 43 deletions.
diff --git a/contracts/ERC721CM.sol b/contracts/ERC721CM.sol
diff --git a/contracts/ERC721CMBasicRoyalties.sol b/contracts/ERC721CMBasicRoyalties.sol
@@ -0,0 +1,48 @@
+//SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.4;
+
+import "@limitbreak/creator-token-standards/src/programmable-royalties/BasicRoyalties.sol";
+import "./ERC721CM.sol";
+
+/**
+ * @title ERC721CM with BasicRoyalties
+ */
+contract ERC721CMBasicRoyalties is ERC721CM, BasicRoyalties {
+    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
+        )
+        BasicRoyalties(royaltyReceiver, royaltyFeeNumerator)
+    {}
+
+    function supportsInterface(bytes4 interfaceId)
+        public
+        view
+        virtual
+        override(ERC2981, ERC721ACQueryable, IERC721A)
+        returns (bool)
+    {
+        return
+            ERC721ACQueryable.supportsInterface(interfaceId) ||
+            ERC2981.supportsInterface(interfaceId);
+    }
+}
diff --git a/contracts/ERC721CMRoyalties.sol b/contracts/ERC721CMRoyalties.sol
@@ -0,0 +1,48 @@
+//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
+            ERC721ACQueryable.supportsInterface(interfaceId) ||
+            ERC2981.supportsInterface(interfaceId);
+    }
+}