Merge pull request #19 from dev-protocol/feat-update-sbtfactory

feat: make sbt factory upgradeable

Author: yashdesu

contracts/SBTFactory.sol

@@ -1,12 +1,13 @@
 // SPDX-License-Identifier: MPL-2.0
 pragma solidity =0.8.9;
 
-import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
+import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
 import {SBT} from "./SBT.sol";
 import {SBTProxy} from "./SBTProxy.sol";
+import {ISBTFactory} from "./interfaces/ISBTFactory.sol";
 
-contract SBTFactory is Ownable {
+contract SBTFactory is ISBTFactory, OwnableUpgradeable {
 	mapping(bytes => address) public sbtProxyMapping;
 
 	event SBTProxyCreated(bytes indexed identifier, address sbtProxyAddress);
@@ -15,15 +16,17 @@ contract SBTFactory is Ownable {
 		address sbtProxyAddress
 	);
 
-	constructor() {}
+	function initialize() external initializer {
+		__Ownable_init();
+	}
 
 	function makeNewSBT(
 		address proxyAdmin,
 		bytes memory proxyCallData,
 		address minterUpdater,
 		address[] calldata minters,
 		bytes calldata identifier
-	) external onlyOwner returns (address) {
+	) external override onlyOwner returns (address) {
 		// Create the implementation.
 		address implementation = address(
 			new SBT{salt: keccak256(identifier)}()

contracts/SBTFactoryProxy.sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: MPL-2.0
+pragma solidity =0.8.9;
+
+import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
+
+contract SBTFactoryProxy is TransparentUpgradeableProxy {
+	constructor(
+		address _logic,
+		address admin_,
+		bytes memory _data
+	) TransparentUpgradeableProxy(_logic, admin_, _data) {}
+}

contracts/interfaces/ISBTFactory.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: MPL-2.0
+pragma solidity =0.8.9;
+
+interface ISBTFactory {
+	/*
+	 * @dev makes new SBT contract which is upgradeable.
+	 * @param proxyAdmin owner of the proxy contract which will be deployed.
+	 * @param proxyCallData the data which denotes function calls, etc when deploying new proxy contract.
+	 * @param  minterUpdater the address which can add/remove minter access eoa.
+	 * @param minters the array of minters which have rights to mint new sbts.
+	 * @param identifier unique bytes to identify a deployed sbt proxy.
+	 * @return uint256[] token id list
+	 */
+	function makeNewSBT(
+		address proxyAdmin,
+		bytes memory proxyCallData,
+		address minterUpdater,
+		address[] calldata minters,
+		bytes calldata identifier
+	) external returns (address);
+}