Make upgradable

contracts/community/Administration.sol

@@ -1,10 +1,12 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.9;
+pragma solidity ^0.8.17;
 
-abstract contract Administration {
+import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+
+abstract contract Administration is Initializable {
     mapping(address => bool) private _admins;
 
-    constructor() {
+    function _initializeAdministration() internal virtual initializer {
         _admins[msg.sender] = true;
     }
 
@@ -35,4 +37,4 @@ abstract contract Administration {
     function deleteAdmin(address _deleteAdmin) external onlyAdmins {
         _admins[_deleteAdmin] = false;
     }
-}
+}

contracts/community/InteractCommunityToken.sol

@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.17;
+
+import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
+import "./Administration.sol";
+import "./MintManager.sol";
+import "./interfaces/IHenkakuToken.sol";
+
+abstract contract InteractCommunityToken is Administration, MintManager {
+    address public communityToken;
+
+    function _initializeInteractCommunityToken(address _communityToken) internal virtual initializer {
+        communityToken = _communityToken;
+    }
+
+    function setCommunityToken(address _communityToken) external onlyAdmins {
+        communityToken = _communityToken;
+    }
+
+    function _batchTransferCommunityToken(
+        uint256 totalAmount,
+        uint256[] memory _amounts,
+        address[] memory _to
+    ) internal {
+        _checkCommunityTokenBalance(totalAmount);
+
+        uint256[] memory amounts = _amounts;
+        uint256 amountsLength = amounts.length;
+        require(amountsLength == _to.length, "amounts and to length mismatch");
+
+        for (uint256 i = 0; i < amountsLength; ) {
+            bool sent = IHenkakuToken(communityToken).transferFrom(msg.sender, _to[i], amounts[i]);
+            require(sent, "Ticket: ERC20 Token transfer failed");
+
+            unchecked {
+                ++i;
+            }
+        }
+    }
+
+    function _checkCommunityTokenBalance(uint256 _requiredAmount) internal view {
+        require(
+            IHenkakuToken(communityToken).balanceOf(msg.sender) >= _requiredAmount,
+            "Ticket: Insufficient ERC20 token"
+        );
+    }
+}

contracts/community/MintManager.sol

@@ -1,13 +1,11 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.9;
+pragma solidity ^0.8.17;
 
 import "./Administration.sol";
 
 abstract contract MintManager is Administration {
     bool public mintable;
 
-    constructor() {}
-
     function switchMintable() external onlyAdmins {
         mintable = !mintable;
     }

contracts/community/Ticket.sol

@@ -1,13 +1,21 @@
 // SPDX-License-Identifier: MIT
-pragma solidity ^0.8.9;
+pragma solidity ^0.8.17;
 
-import "@openzeppelin/contracts/token/ERC1155/extensions/ERC1155Supply.sol";
+import "@openzeppelin/contracts-upgradeable/token/ERC1155/extensions/ERC1155SupplyUpgradeable.sol";
 import "@openzeppelin/contracts/utils/Counters.sol";
+import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";
 import "./Administration.sol";
-import "./InteractHenkakuToken.sol";
+import "./InteractCommunityToken.sol";
 import "./MintManager.sol";
 
-contract Ticket is ERC1155, ERC1155Supply, Administration, MintManager, InteractHenakuToken {
+contract Ticket is
+    Initializable,
+    ERC1155Upgradeable,
+    ERC1155SupplyUpgradeable,
+    Administration,
+    MintManager,
+    InteractCommunityToken
+{
     //@dev count up tokenId from 0
     using Counters for Counters.Counter;
     Counters.Counter private _tokenIds;
@@ -35,9 +43,15 @@ contract Ticket is ERC1155, ERC1155Supply, Administration, MintManager, Interact
     error InvalidParams(string);
 
     /**
-     * @param uri: metadata uri
      * @param creator: creator's wallet address
+     * @param open_blockTimestamp: open block timestamp for sales period
+     * @param close_blockTimestamp: close block timestamp for sales period
      * @param maxSupply: max supply number of token
+     * @param id: event id
+     * @param price: price of ticket
+     * @param uri: metadata uri
+     * @param sharesAmounts: shares amount of shareholders
+     * @param shareholdersAddresses: shareholders' wallet addresses
      */
     struct TicketInfo {
         address creator;
@@ -51,22 +65,21 @@ contract Ticket is ERC1155, ERC1155Supply, Administration, MintManager, Interact
         address[] shareholdersAddresses;
     }
 
-    TicketInfo[] private registeredTickets;
+    TicketInfo[] private _registeredTickets;
 
-    constructor(
-        string memory _name,
-        string memory _symbol,
-        address _communityToken
-    ) ERC1155("") MintManager() InteractHenakuToken(_communityToken) {
+    function initialize(string memory _name, string memory _symbol, address _communityToken) public initializer {
         name = _name;
         symbol = _symbol;
 
-        registeredTickets.push(TicketInfo(address(0), 0, 0, 0, 0, 0, "", new uint256[](0), new address[](0)));
+        _registeredTickets.push(TicketInfo(address(0), 0, 0, 0, 0, 0, "", new uint256[](0), new address[](0)));
         _tokenIds.increment();
+
+        super._initializeAdministration();
+        super._initializeInteractCommunityToken(_communityToken);
     }
 
-    modifier onlyHenkakuHolders() {
-        _checkHenkakuV2Balance(1);
+    modifier onlyCommunityTokenHolders() {
+        _checkCommunityTokenBalance(1);
         _;
     }
 
@@ -91,7 +104,7 @@ contract Ticket is ERC1155, ERC1155Supply, Administration, MintManager, Interact
         uint64 _close_blockTimestamp,
         address[] memory _shareholdersAddresses,
         uint256[] memory _sharesAmounts
-    ) external onlyHenkakuHolders {
+    ) external onlyCommunityTokenHolders {
         if (
             _maxSupply == 0 ||
             keccak256(bytes(_metaDataURL)) == keccak256(bytes("")) ||
@@ -100,7 +113,7 @@ contract Ticket is ERC1155, ERC1155Supply, Administration, MintManager, Interact
 
         uint256 tokenId = _tokenIds.current();
         ownerOfRegisteredIds[msg.sender].push(tokenId);
-        registeredTickets.push(
+        _registeredTickets.push(
             TicketInfo(
                 msg.sender,
                 _open_blockTimestamp,
@@ -132,13 +145,13 @@ contract Ticket is ERC1155, ERC1155Supply, Administration, MintManager, Interact
 
     // @return all registered TicketInfo
     function retrieveAllTickets() public view returns (TicketInfo[] memory) {
-        return registeredTickets;
+        return _registeredTickets;
     }
 
     // @return registered TicketInfo by tokenId
     function retrieveRegisteredTicket(uint256 _tokenId) public view returns (TicketInfo memory) {
-        require(registeredTickets.length > _tokenId, "Ticket: not available");
-        return registeredTickets[_tokenId];
+        require(_registeredTickets.length > _tokenId, "Ticket: not available");
+        return _registeredTickets[_tokenId];
     }
 
     // @return registered TicketInfo by address
@@ -148,7 +161,7 @@ contract Ticket is ERC1155, ERC1155Supply, Administration, MintManager, Interact
         TicketInfo[] memory _ownerOfRegisteredTickets = new TicketInfo[](_ownerOfRegisteredIdsLength);
 
         for (uint256 i = 0; i < _ownerOfRegisteredIdsLength; ) {
-            TicketInfo memory _registeredTicket = registeredTickets[_ownerOfRegisteredIds[i]];
+            TicketInfo memory _registeredTicket = _registeredTickets[_ownerOfRegisteredIds[i]];
             _ownerOfRegisteredTickets[i] = _registeredTicket;
             unchecked {
                 ++i;
@@ -158,7 +171,7 @@ contract Ticket is ERC1155, ERC1155Supply, Administration, MintManager, Interact
     }
 
     // @dev mint function
-    function mint(uint256 _tokenId) external onlyHenkakuHolders {
+    function mint(uint256 _tokenId) external onlyCommunityTokenHolders {
         require(mintable, "Ticket: Not mintable");
         require(balanceOf(msg.sender, _tokenId) == 0, "Ticket: You already have this ticket");
 
@@ -169,7 +182,7 @@ contract Ticket is ERC1155, ERC1155Supply, Administration, MintManager, Interact
 
         ownerOfMintedIds[msg.sender].push(_tokenId);
 
-        batchTransferHenkakuV2(ticket.price, ticket.sharesAmounts, ticket.shareholdersAddresses);
+        _batchTransferCommunityToken(ticket.price, ticket.sharesAmounts, ticket.shareholdersAddresses);
 
         _mint(msg.sender, _tokenId, 1, "");
 
@@ -185,7 +198,7 @@ contract Ticket is ERC1155, ERC1155Supply, Administration, MintManager, Interact
         TicketInfo[] memory _ownerOfMintedTickets = new TicketInfo[](_ownerOfMintedIdsLength);
 
         for (uint256 i = 0; i < _ownerOfMintedIdsLength; ) {
-            _ownerOfMintedTickets[i] = registeredTickets[_ownerOfMintedIds[i]];
+            _ownerOfMintedTickets[i] = _registeredTickets[_ownerOfMintedIds[i]];
             unchecked {
                 ++i;
             }
@@ -195,7 +208,7 @@ contract Ticket is ERC1155, ERC1155Supply, Administration, MintManager, Interact
     }
 
     // @return token metadata uri
-    function uri(uint256 _tokenId) public view override(ERC1155) returns (string memory) {
+    function uri(uint256 _tokenId) public view override(ERC1155Upgradeable) returns (string memory) {
         return retrieveRegisteredTicket(_tokenId).uri;
     }
 
@@ -211,7 +224,7 @@ contract Ticket is ERC1155, ERC1155Supply, Administration, MintManager, Interact
         uint256[] memory _ids,
         uint256[] memory _amounts,
         bytes memory _data
-    ) internal virtual override(ERC1155, ERC1155Supply) {
-        ERC1155Supply._beforeTokenTransfer(_operator, _from, _to, _ids, _amounts, _data);
+    ) internal virtual override(ERC1155Upgradeable, ERC1155SupplyUpgradeable) {
+        ERC1155SupplyUpgradeable._beforeTokenTransfer(_operator, _from, _to, _ids, _amounts, _data);
     }
 }

contracts/community/external/henkaku-v2/HenkakuToken.sol → contracts/community/external/erc20/CommunityToken.sol

@@ -6,14 +6,14 @@ import "hardhat/console.sol";
 import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import "@openzeppelin/contracts/access/Ownable.sol";
 
-contract HenkakuToken is ERC20, Ownable {
-    uint256 private maxSupply = 1_000_000_000e18; // 1 billion henkaku
+contract CommunityToken is ERC20, Ownable {
+    uint256 private maxSupply = 1_000_000_000e18; // 1 billion Community
     mapping(address => bool) private whitelist;
-    address public gateKeeper; // multisig contract address managed by henkaku community
+    address public gateKeeper; // multisig contract address managed by Community community
     address public dev; // EOA which updates whitelist systematically like using crontab.
     bool unlock;
 
-    constructor() ERC20("HENKAKU", "HENKAKU") {
+    constructor() ERC20("Community", "Community") {
         unlock = false;
     }
 

contracts/community/interfaces/IHenkakuToken.sol

@@ -2,30 +2,55 @@
 pragma solidity ^0.8.9;
 
 interface IHenkakuToken {
-  function addWhitelistUser ( address user ) external;
-  function addWhitelistUsers ( address[] memory users ) external;
-  function allowance ( address owner, address spender ) external view returns ( uint256 );
-  function approve ( address spender, uint256 amount ) external returns ( bool );
-  function balanceOf ( address account ) external view returns ( uint256 );
-  function burn ( address _of, uint256 amount ) external;
-  function decimals (  ) external view returns ( uint8 );
-  function decreaseAllowance ( address spender, uint256 subtractedValue ) external returns ( bool );
-  function dev (  ) external view returns ( address );
-  function gateKeeper (  ) external view returns ( address );
-  function increaseAllowance ( address spender, uint256 addedValue ) external returns ( bool );
-  function isAllowed ( address user ) external view returns ( bool );
-  function mint ( address _to, uint256 amount ) external;
-  function name (  ) external view returns ( string memory );
-  function owner (  ) external view returns ( address );
-  function removeWhitelistUser ( address user ) external;
-  function removeWhitelistUsers ( address[] memory users ) external;
-  function renounceOwnership (  ) external;
-  function setDevAddress ( address user ) external;
-  function setGateKeeper ( address user ) external;
-  function symbol (  ) external view returns ( string memory );
-  function totalSupply (  ) external view returns ( uint256 );
-  function transfer ( address to, uint256 amount ) external returns ( bool );
-  function transferFrom ( address from, address to, uint256 amount ) external returns ( bool );
-  function transferOwnership ( address newOwner ) external;
-  function unLock (  ) external;
+    function addWhitelistUser(address user) external;
+
+    function addWhitelistUsers(address[] memory users) external;
+
+    function allowance(address owner, address spender) external view returns (uint256);
+
+    function approve(address spender, uint256 amount) external returns (bool);
+
+    function balanceOf(address account) external view returns (uint256);
+
+    function burn(address _of, uint256 amount) external;
+
+    function decimals() external view returns (uint8);
+
+    function decreaseAllowance(address spender, uint256 subtractedValue) external returns (bool);
+
+    function dev() external view returns (address);
+
+    function gateKeeper() external view returns (address);
+
+    function increaseAllowance(address spender, uint256 addedValue) external returns (bool);
+
+    function isAllowed(address user) external view returns (bool);
+
+    function mint(address _to, uint256 amount) external;
+
+    function name() external view returns (string memory);
+
+    function owner() external view returns (address);
+
+    function removeWhitelistUser(address user) external;
+
+    function removeWhitelistUsers(address[] memory users) external;
+
+    function renounceOwnership() external;
+
+    function setDevAddress(address user) external;
+
+    function setGateKeeper(address user) external;
+
+    function symbol() external view returns (string memory);
+
+    function totalSupply() external view returns (uint256);
+
+    function transfer(address to, uint256 amount) external returns (bool);
+
+    function transferFrom(address from, address to, uint256 amount) external returns (bool);
+
+    function transferOwnership(address newOwner) external;
+
+    function unLock() external;
 }