leanify thirdwebContract

Author: joaquim-verges

contracts/ByocFactory.sol

@@ -51,19 +51,19 @@ contract ByocFactory is IByocFactory, ERC2771Context, AccessControlEnumerable, T
         bytes memory _constructorArgs,
         bytes32 _salt,
         uint256 _value,
-        ThirdwebContract.ThirdwebInfo memory _thirdwebInfo
+        string memory publishMetadataUri
     ) external onlyUnpausedOrAdmin returns (address deployedAddress) {
-        require(bytes(_thirdwebInfo.publishMetadataUri).length > 0, "No publish metadata");
+        require(bytes(publishMetadataUri).length > 0, "No publish metadata");
 
         bytes memory contractBytecode = abi.encodePacked(_contractBytecode, _constructorArgs);
         bytes32 salt = _salt == "" ? keccak256(abi.encodePacked(_msgSender(), block.number)) : _salt;
 
         deployedAddress = Create2.deploy(_value, salt, contractBytecode);
 
-        ThirdwebContract(deployedAddress).setThirdwebInfo(_thirdwebInfo);
+        ThirdwebContract(deployedAddress).setPublisheMetadataUi(publishMetadataUri);
         require(
             keccak256(bytes(ThirdwebContract(deployedAddress).getPublishMetadataUri())) ==
-                keccak256(bytes(_thirdwebInfo.publishMetadataUri)),
+                keccak256(bytes(publishMetadataUri)),
             "Not a thirdweb contract"
         );
 
@@ -79,15 +79,15 @@ contract ByocFactory is IByocFactory, ERC2771Context, AccessControlEnumerable, T
         bytes memory _initializeData,
         bytes32 _salt,
         uint256 _value,
-        ThirdwebContract.ThirdwebInfo memory _thirdwebInfo
+        string memory publishMetadataUri
     ) external onlyUnpausedOrAdmin returns (address deployedAddress) {
         bytes32 salt = _salt == "" ? keccak256(abi.encodePacked(_msgSender(), block.number)) : _salt;
         deployedAddress = Clones.cloneDeterministic(_implementation, salt);
 
-        ThirdwebContract(deployedAddress).setThirdwebInfo(_thirdwebInfo);
+        ThirdwebContract(deployedAddress).setPublisheMetadataUi(publishMetadataUri);
         require(
             keccak256(bytes(ThirdwebContract(deployedAddress).getPublishMetadataUri())) ==
-                keccak256(bytes(_thirdwebInfo.publishMetadataUri)),
+                keccak256(bytes(publishMetadataUri)),
             "Not a thirdweb contract"
         );
 

contracts/ThirdwebContract.sol

@@ -1,16 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "./feature/Ownable.sol";
-import "./feature/ContractMetadata.sol";
-
-contract ThirdwebContract is Ownable, ContractMetadata {
-    struct ThirdwebInfo {
-        string publishMetadataUri;
-        string contractURI;
-        address owner;
-    }
-
+contract ThirdwebContract {
     /// @dev The publish metadata of the contract of which this contract is an instance.
     string private publishMetadataUri;
 
@@ -19,23 +10,9 @@ contract ThirdwebContract is Ownable, ContractMetadata {
         return publishMetadataUri;
     }
 
-    /// @dev Initializes the publish metadata and contract metadata at deploy time.
-    function setThirdwebInfo(ThirdwebInfo memory _thirdwebInfo) external {
+    /// @dev Initializes the publish metadata and at deploy time.
+    function setPublisheMetadataUi(string memory uri) external {
         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
-    function _canSetOwner() internal virtual override returns (bool) {
-        return msg.sender == owner;
-    }
-
-    /// @dev Returns whether contract metadata can be set
-    function _canSetContractURI() internal virtual override returns (bool) {
-        return msg.sender == owner;
+        publishMetadataUri = uri;
     }
 }

contracts/interfaces/IByocFactory.sol

@@ -18,7 +18,7 @@ interface IByocFactory {
      *  @param constructorArgs  The encoded constructor args to deploy the contract with.
      *  @param salt             The salt to use in the CREATE2 contract deployment.
      *  @param value            The native token value to pass to the contract on deployment.
-     *  @param thirdwebInfo     The publish metadata URI and contract URI for the contract to deploy.
+     *  @param publishMetadataUri     The publish metadata URI for the contract to deploy.
      *
      *  @return deployedAddress The address of the contract deployed.
      */
@@ -28,7 +28,7 @@ interface IByocFactory {
         bytes memory constructorArgs,
         bytes32 salt,
         uint256 value,
-        ThirdwebContract.ThirdwebInfo memory thirdwebInfo
+        string memory publishMetadataUri
     ) external returns (address deployedAddress);
 
     /**
@@ -39,7 +39,7 @@ interface IByocFactory {
      *  @param initializeData   The encoded function call to initialize the contract with.
      *  @param salt             The salt to use in the CREATE2 contract deployment.
      *  @param value            The native token value to pass to the contract on deployment.
-     *  @param thirdwebInfo     The publish metadata URI and contract URI for the contract to deploy.
+     *  @param publishMetadataUri     The publish metadata URI and for the contract to deploy.
      *
      *  @return deployedAddress The address of the contract deployed.
      */
@@ -49,6 +49,6 @@ interface IByocFactory {
         bytes memory initializeData,
         bytes32 salt,
         uint256 value,
-        ThirdwebContract.ThirdwebInfo memory thirdwebInfo
+        string memory publishMetadataUri
     ) external returns (address deployedAddress);
 }