Remove Thirdweb prefix from IThirdweb...

Krishang Nadgauda · Krishang Nadgauda · commit 079789c38430 · 2022-05-03T16:27:11.000-07:00
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/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,
diff --git a/contracts/feature/Context.sol b/contracts/feature/Context.sol
@@ -1,6 +1,4 @@
-// SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.1 (utils/Context.sol)
-
+// SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
 /**
diff --git a/contracts/feature/ContractMetadata.sol b/contracts/feature/ContractMetadata.sol
@@ -1,10 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "../interfaces/IThirdwebContract.sol";
-import "@openzeppelin/contracts-upgradeable/access/AccessControlEnumerableUpgradeable.sol";
+import "./interface/IContractMetadata.sol";
 
-abstract contract ContractMetadata is IThirdwebContract {
+abstract contract ContractMetadata is IContractMetadata {
     
     /// @dev Contract level metadata.
     string public contractURI;
diff --git a/contracts/feature/Ownable.sol b/contracts/feature/Ownable.sol
@@ -1,15 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "./interface/IThirdwebOwnable.sol";
+import "./interface/IOwnable.sol";
 
-abstract contract Ownable is IThirdwebOwnable {
+abstract contract Ownable is IOwnable {
 
     /// @dev Owner of the contract (purpose: OpenSea compatibility)
     address public owner;
 
     /// @dev Lets a contract admin set a new owner for the contract. The new owner must be a contract admin.
-    function setOwner(address _newOwner) external {
+    function setOwner(address _newOwner) public {
         require(_canSetOwner(), "Not authorized");
 
         address _prevOwner = owner;
diff --git a/contracts/feature/PlatformFee.sol b/contracts/feature/PlatformFee.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "./interface/IThirdwebPlatformFee.sol";
+import "./interface/IPlatformFee.sol";
 
-abstract contract PlatformFee is IThirdwebPlatformFee {
+abstract contract PlatformFee is IPlatformFee {
 
     /// @dev The address that receives all platform fees from all sales.
     address private platformFeeRecipient;
diff --git a/contracts/feature/PrimarySale.sol b/contracts/feature/PrimarySale.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "./interface/IThirdwebPrimarySale.sol";
+import "./interface/IPrimarySale.sol";
 
-abstract contract PrimarySale is IThirdwebPrimarySale {
+abstract contract PrimarySale is IPrimarySale {
     
     /// @dev The address that receives all primary sales value.
     address private recipient;
diff --git a/contracts/feature/Royalty.sol b/contracts/feature/Royalty.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "./interface/IThirdwebRoyalty.sol";
+import "./interface/IRoyalty.sol";
 
-abstract contract Royalty is IThirdwebRoyalty {
+abstract contract Royalty is IRoyalty {
 
     /// @dev The (default) address that receives all royalty value.
     address private royaltyRecipient;
diff --git a/contracts/feature/interface/IContractMetadata.sol b/contracts/feature/interface/IContractMetadata.sol
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.0;
+
+interface IContractMetadata {
+
+    /// @dev Returns the metadata URI of the contract.
+    function contractURI() external view returns (string memory);
+
+    /**
+     *  @dev Sets contract URI for the storefront-level metadata of the contract.
+     *       Only module admin can call this function.
+     */
+    function setContractURI(string calldata _uri) external;
+}
diff --git a/contracts/feature/interface/IOwnable.sol b/contracts/feature/interface/IOwnable.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-interface IThirdwebOwnable {
+interface IOwnable {
     /// @dev Returns the owner of the contract.
     function owner() external view returns (address);
 
diff --git a/contracts/feature/interface/IPermissions.sol b/contracts/feature/interface/IPermissions.sol
@@ -1,6 +1,4 @@
-// SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.1 (access/IAccessControl.sol)
-
+// SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
 /**
diff --git a/contracts/feature/interface/IPermissionsEnumerable.sol b/contracts/feature/interface/IPermissionsEnumerable.sol
@@ -1,6 +1,4 @@
-// SPDX-License-Identifier: MIT
-// OpenZeppelin Contracts v4.4.1 (access/IAccessControlEnumerable.sol)
-
+// SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
 import "./IPermissions.sol";
diff --git a/contracts/feature/interface/IPlatformFee.sol b/contracts/feature/interface/IPlatformFee.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-interface IThirdwebPlatformFee {
+interface IPlatformFee {
     /// @dev Returns the platform fee bps and recipient.
     function getPlatformFeeInfo() external view returns (address, uint16);
 
diff --git a/contracts/feature/interface/IPrimarySale.sol b/contracts/feature/interface/IPrimarySale.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-interface IThirdwebPrimarySale {
+interface IPrimarySale {
     /// @dev The adress that receives all primary sales value.
     function primarySaleRecipient() external view returns (address);
 
diff --git a/contracts/feature/interface/IRoyalty.sol b/contracts/feature/interface/IRoyalty.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-interface IThirdwebRoyalty {
+interface IRoyalty {
     struct RoyaltyInfo {
         address recipient;
         uint256 bps;
diff --git a/contracts/interfaces/IMultiwrap.sol b/contracts/interfaces/IMultiwrap.sol
@@ -2,11 +2,11 @@
 pragma solidity ^0.8.11;
 
 import "./IThirdwebContract.sol";
-import "../feature/interface/IThirdwebRoyalty.sol";
-import "../feature/interface/IThirdwebOwnable.sol";
+import "../feature/interface/IRoyalty.sol";
+import "../feature/interface/IOwnable.sol";
 import "../lib/MultiTokenTransferLib.sol";
 
-interface IMultiwrap is IThirdwebContract, IThirdwebOwnable, IThirdwebRoyalty {
+interface IMultiwrap is IThirdwebContract, IOwnable, IRoyalty {
     /// @dev Emitted when tokens are wrapped.
     event TokensWrapped(
         address indexed wrapper,
diff --git a/contracts/interfaces/IPack.sol b/contracts/interfaces/IPack.sol
@@ -2,10 +2,10 @@
 pragma solidity ^0.8.11;
 
 import "./IThirdwebContract.sol";
-import "../feature/interface/IThirdwebOwnable.sol";
-import "../feature/interface/IThirdwebRoyalty.sol";
+import "../feature/interface/IOwnable.sol";
+import "../feature/interface/IRoyalty.sol";
 
-interface IPack is IThirdwebContract, IThirdwebOwnable, IThirdwebRoyalty {
+interface IPack is IThirdwebContract, IOwnable, IRoyalty {
     /**
      *  @notice A pack can contain ERC1155 tokens from n number of ERC1155 contracts.
      *          You can add any kinds of tokens to a pack via Multiwrap.
diff --git a/contracts/interfaces/marketplace/IMarketplace.sol b/contracts/interfaces/marketplace/IMarketplace.sol
@@ -2,9 +2,9 @@
 pragma solidity ^0.8.11;
 
 import "../IThirdwebContract.sol";
-import "../../feature/interface/IThirdwebPlatformFee.sol";
+import "../../feature/interface/IPlatformFee.sol";
 
-interface IMarketplace is IThirdwebContract, IThirdwebPlatformFee {
+interface IMarketplace is IThirdwebContract, IPlatformFee {
     /// @notice Type of the tokens that can be listed for sale.
     enum TokenType {
         ERC1155,
diff --git a/contracts/token/TokenERC1155.sol b/contracts/token/TokenERC1155.sol
@@ -5,10 +5,10 @@ pragma solidity ^0.8.11;
 import { ITokenERC1155 } from "../interfaces/token/ITokenERC1155.sol";
 
 import "../interfaces/IThirdwebContract.sol";
-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";
 
 // Token
 import "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";
@@ -37,10 +37,10 @@ import "../interfaces/ITWFee.sol";
 contract TokenERC1155 is
     Initializable,
     IThirdwebContract,
-    IThirdwebOwnable,
-    IThirdwebRoyalty,
-    IThirdwebPrimarySale,
-    IThirdwebPlatformFee,
+    IOwnable,
+    IRoyalty,
+    IPrimarySale,
+    IPlatformFee,
     EIP712Upgradeable,
     ReentrancyGuardUpgradeable,
     ERC2771ContextUpgradeable,
diff --git a/contracts/token/TokenERC20.sol b/contracts/token/TokenERC20.sol
@@ -5,8 +5,8 @@ pragma solidity ^0.8.11;
 import { ITokenERC20 } from "../interfaces/token/ITokenERC20.sol";
 
 import "../interfaces/IThirdwebContract.sol";
-import "../feature/interface/IThirdwebPlatformFee.sol";
-import "../feature/interface/IThirdwebPrimarySale.sol";
+import "../feature/interface/IPlatformFee.sol";
+import "../feature/interface/IPrimarySale.sol";
 
 // Token
 import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/ERC20BurnableUpgradeable.sol";
@@ -35,8 +35,8 @@ import "../interfaces/ITWFee.sol";
 contract TokenERC20 is
     Initializable,
     IThirdwebContract,
-    IThirdwebPrimarySale,
-    IThirdwebPlatformFee,
+    IPrimarySale,
+    IPlatformFee,
     ReentrancyGuardUpgradeable,
     ERC2771ContextUpgradeable,
     MulticallUpgradeable,
diff --git a/contracts/token/TokenERC721.sol b/contracts/token/TokenERC721.sol
@@ -5,10 +5,10 @@ pragma solidity ^0.8.11;
 import { ITokenERC721 } from "../interfaces/token/ITokenERC721.sol";
 
 import "../interfaces/IThirdwebContract.sol";
-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";
 
 // Token
 import "@openzeppelin/contracts-upgradeable/token/ERC721/extensions/ERC721EnumerableUpgradeable.sol";
@@ -39,10 +39,10 @@ import "../interfaces/ITWFee.sol";
 contract TokenERC721 is
     Initializable,
     IThirdwebContract,
-    IThirdwebOwnable,
-    IThirdwebRoyalty,
-    IThirdwebPrimarySale,
-    IThirdwebPlatformFee,
+    IOwnable,
+    IRoyalty,
+    IPrimarySale,
+    IPlatformFee,
     ReentrancyGuardUpgradeable,
     EIP712Upgradeable,
     ERC2771ContextUpgradeable,
