Merge pull request #158 from thirdweb-dev/nkrishang/signature-drop

SignatureDrop implementation using contracts sdk features
thirdweb-dev · May 4, 2022 · b2733d7 · b2733d7
2 parents 22d18b0 + 0c6c762
commit b2733d7
Show file tree

Hide file tree

Showing 93 changed files with 13,156 additions and 664 deletions.
diff --git a/contracts/Pack.sol b/contracts/Pack.sol
@@ -4,8 +4,8 @@ pragma solidity ^0.8.11;
 // Base
 import "./openzeppelin-presets/ERC1155PresetUpgradeable.sol";
 import "./interfaces/IThirdwebContract.sol";
-import "./feature/interface/IThirdwebOwnable.sol";
-import "./feature/interface/IThirdwebRoyalty.sol";
+import "./feature/interface/IOwnable.sol";
+import "./feature/interface/IRoyalty.sol";
 
 // Randomness
 import "@chainlink/contracts/src/v0.8/VRFConsumerBase.sol";
@@ -28,8 +28,8 @@ import "./interfaces/ITWFee.sol";
 contract Pack is
     Initializable,
     IThirdwebContract,
-    IThirdwebOwnable,
-    IThirdwebRoyalty,
+    IOwnable,
+    IRoyalty,
     VRFConsumerBase,
     ERC2771ContextUpgradeable,
     MulticallUpgradeable,

diff --git a/contracts/ThirdwebContract.sol b/contracts/ThirdwebContract.sol
@@ -1,17 +1,20 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-contract ThirdwebContract {
-    /// @dev The publish metadata of the contract of which this contract is an instance.
-    string private publishMetadataUri;
-    /// @dev The metadata for this contract.
-    string public contractURI;
+import "./feature/Ownable.sol";
+import "./feature/Context.sol";
+import "./feature/ContractMetadata.sol";
 
+contract ThirdwebContract is Context, Ownable, ContractMetadata {
     struct ThirdwebInfo {
         string publishMetadataUri;
         string contractURI;
+        address owner;
     }
 
+    /// @dev The publish metadata of the contract of which this contract is an instance.
+    string private publishMetadataUri;
+
     /// @dev Returns the publish metadata for this contract.
     function getPublishMetadataUri() external view returns (string memory) {
         return publishMetadataUri;
@@ -23,5 +26,16 @@ contract ThirdwebContract {
 
         publishMetadataUri = _thirdwebInfo.publishMetadataUri;
         contractURI = _thirdwebInfo.contractURI;
+        owner = _thirdwebInfo.owner;
+    }
+
+    /// @dev Returns whether owner can be set in the given execution context.
+    function _canSetOwner() internal virtual override returns (bool) {
+        return _msgSender() == owner;
+    }
+
+    /// @dev Returns whether contract metadata can be set in the given execution context.
+    function _canSetContractURI() internal virtual override returns (bool) {
+        return _msgSender() == owner;
     }
 }
diff --git a/contracts/drop/DropERC1155.sol b/contracts/drop/DropERC1155.sol
@@ -20,10 +20,10 @@ import "../interfaces/IThirdwebContract.sol";
 
 //  ==========  Features    ==========
 
-import "../feature/interface/IThirdwebPlatformFee.sol";
-import "../feature/interface/IThirdwebPrimarySale.sol";
-import "../feature/interface/IThirdwebRoyalty.sol";
-import "../feature/interface/IThirdwebOwnable.sol";
+import "../feature/interface/IPlatformFee.sol";
+import "../feature/interface/IPrimarySale.sol";
+import "../feature/interface/IRoyalty.sol";
+import "../feature/interface/IOwnable.sol";
 
 import { IDropERC1155 } from "../interfaces/drop/IDropERC1155.sol";
 import { ITWFee } from "../interfaces/ITWFee.sol";
@@ -37,10 +37,10 @@ import "../lib/MerkleProof.sol";
 contract DropERC1155 is
     Initializable,
     IThirdwebContract,
-    IThirdwebOwnable,
-    IThirdwebRoyalty,
-    IThirdwebPrimarySale,
-    IThirdwebPlatformFee,
+    IOwnable,
+    IRoyalty,
+    IPrimarySale,
+    IPlatformFee,
     ReentrancyGuardUpgradeable,
     ERC2771ContextUpgradeable,
     MulticallUpgradeable,

diff --git a/contracts/drop/DropERC20.sol b/contracts/drop/DropERC20.sol
@@ -19,8 +19,8 @@ import "../interfaces/IThirdwebContract.sol";
 
 //  ==========  Features    ==========
 
-import "../feature/interface/IThirdwebPlatformFee.sol";
-import "../feature/interface/IThirdwebPrimarySale.sol";
+import "../feature/interface/IPlatformFee.sol";
+import "../feature/interface/IPrimarySale.sol";
 
 import { IDropERC20 } from "../interfaces/drop/IDropERC20.sol";
 import { ITWFee } from "../interfaces/ITWFee.sol";
@@ -34,8 +34,8 @@ import "../lib/FeeType.sol";
 contract DropERC20 is
     Initializable,
     IThirdwebContract,
-    IThirdwebPrimarySale,
-    IThirdwebPlatformFee,
+    IPrimarySale,
+    IPlatformFee,
     ReentrancyGuardUpgradeable,
     ERC2771ContextUpgradeable,
     MulticallUpgradeable,

diff --git a/contracts/drop/DropERC721.sol b/contracts/drop/DropERC721.sol
@@ -21,10 +21,10 @@ import "../interfaces/IThirdwebContract.sol";
 
 //  ==========  Features    ==========
 
-import "../feature/interface/IThirdwebPlatformFee.sol";
-import "../feature/interface/IThirdwebPrimarySale.sol";
-import "../feature/interface/IThirdwebRoyalty.sol";
-import "../feature/interface/IThirdwebOwnable.sol";
+import "../feature/interface/IPlatformFee.sol";
+import "../feature/interface/IPrimarySale.sol";
+import "../feature/interface/IRoyalty.sol";
+import "../feature/interface/IOwnable.sol";
 
 import "../openzeppelin-presets/metatx/ERC2771ContextUpgradeable.sol";
 
@@ -35,10 +35,10 @@ import "../lib/MerkleProof.sol";
 contract DropERC721 is
     Initializable,
     IThirdwebContract,
-    IThirdwebOwnable,
-    IThirdwebRoyalty,
-    IThirdwebPrimarySale,
-    IThirdwebPlatformFee,
+    IOwnable,
+    IRoyalty,
+    IPrimarySale,
+    IPlatformFee,
     ReentrancyGuardUpgradeable,
     ERC2771ContextUpgradeable,
     MulticallUpgradeable,