Merge pull request #159 from thirdweb-dev/joaquim/fix_twcontract

remove context from ThirdwebContract, fix override

Author: joaquim-verges

contracts/ByocFactory.sol

@@ -112,11 +112,11 @@ contract ByocFactory is IByocFactory, ERC2771Context, AccessControlEnumerable, T
         emit Paused(_pause);
     }
 
-    function _msgSender() internal view virtual override(Context, ERC2771Context, ExecutionContext) returns (address sender) {
+    function _msgSender() internal view virtual override(Context, ERC2771Context) returns (address sender) {
         return ERC2771Context._msgSender();
     }
 
-    function _msgData() internal view virtual override(Context, ERC2771Context, ExecutionContext) returns (bytes calldata) {
+    function _msgData() internal view virtual override(Context, ERC2771Context) returns (bytes calldata) {
         return ERC2771Context._msgData();
     }
 }

contracts/ThirdwebContract.sol

@@ -5,7 +5,7 @@ import "./feature/Ownable.sol";
 import "./feature/ExecutionContext.sol";
 import "./feature/ContractMetadata.sol";
 
-contract ThirdwebContract is ExecutionContext, Ownable, ContractMetadata {
+contract ThirdwebContract is Ownable, ContractMetadata {
     struct ThirdwebInfo {
         string publishMetadataUri;
         string contractURI;
@@ -22,20 +22,21 @@ contract ThirdwebContract is ExecutionContext, Ownable, ContractMetadata {
 
     /// @dev Initializes the publish metadata and contract metadata at deploy time.
     function setThirdwebInfo(ThirdwebInfo memory _thirdwebInfo) external {
-        require(bytes(publishMetadataUri).length == 0, "Already initialized");
+        require(bytes(publishMetadataUri).length == 0, "Published metadata already initialized");
+        require(owner == address(0), "Owner already initialized");
 
         publishMetadataUri = _thirdwebInfo.publishMetadataUri;
         contractURI = _thirdwebInfo.contractURI;
         owner = _thirdwebInfo.owner;
     }
 
-    /// @dev Returns whether owner can be set in the given execution context.
+    /// @dev Returns whether owner can be set
     function _canSetOwner() internal virtual override returns (bool) {
-        return _msgSender() == owner;
+        return msg.sender == owner;
     }
 
-    /// @dev Returns whether contract metadata can be set in the given execution context.
+    /// @dev Returns whether contract metadata can be set
     function _canSetContractURI() internal virtual override returns (bool) {
-        return _msgSender() == owner;
+        return msg.sender == owner;
     }
 }

contracts/feature/ContractMetadata.sol

@@ -5,10 +5,10 @@ import "./interface/IContractMetadata.sol";
 
 abstract contract ContractMetadata is IContractMetadata {
     /// @dev Contract level metadata.
-    string public contractURI;
+    string public override contractURI;
 
     /// @dev Lets a contract admin set the URI for contract-level metadata.
-    function setContractURI(string calldata _uri) external {
+    function setContractURI(string calldata _uri) external override {
         require(_canSetContractURI(), "Not authorized");
         contractURI = _uri;
     }

contracts/feature/Ownable.sol

@@ -5,10 +5,10 @@ import "./interface/IOwnable.sol";
 
 abstract contract Ownable is IOwnable {
     /// @dev Owner of the contract (purpose: OpenSea compatibility)
-    address public owner;
+    address public override 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) public {
+    function setOwner(address _newOwner) public override {
         require(_canSetOwner(), "Not authorized");
 
         address _prevOwner = owner;