I terminus

.gitignore

@@ -132,3 +132,6 @@ dmypy.json
 .dao/
 .secrets/
 .vscode/
+
+# MacOS
+.DS_Store

contracts/interfaces/IERC1155WithTerminusStorage.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+
+pragma solidity ^0.8.0;
+
+import "@openzeppelin-contracts/contracts/token/ERC1155/extensions/IERC1155MetadataURI.sol";
+
+interface IERC1155WithTerminusStorage is IERC1155, IERC1155MetadataURI {
+    function isApprovedForPool(uint256 poolID, address operator)
+        external
+        view
+        returns (bool);
+
+    function approveForPool(uint256 poolID, address operator) external;
+}

contracts/interfaces/ITerminus.sol

@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: Apache-2.0
+
+pragma solidity ^0.8.0;
+import "./IERC1155WithTerminusStorage.sol";
+
+interface ITerminus is IERC1155WithTerminusStorage {
+    event PoolMintBatch(
+        uint256 indexed id,
+        address indexed operator,
+        address from,
+        address[] toAddresses,
+        uint256[] amounts
+    );
+
+    function setController(address newController) external;
+
+    function poolMintBatch(
+        uint256 id,
+        address[] memory toAddresses,
+        uint256[] memory amounts
+    ) external;
+
+    function terminusController() external view returns (address);
+
+    function paymentToken() external view returns (address);
+
+    function setPaymentToken(address newPaymentToken) external;
+
+    function poolBasePrice() external view returns (uint256);
+
+    function setPoolBasePrice(uint256 newBasePrice) external;
+
+    function withdrawPayments(address toAddress, uint256 amount) external;
+
+    function contractURI() external view returns (string memory);
+
+    function setContractURI(string memory _contractURI) external;
+
+    function setURI(uint256 poolID, string memory poolURI) external;
+
+    function totalPools() external view returns (uint256);
+
+    function setPoolController(uint256 poolID, address newController) external;
+
+    function terminusPoolController(uint256 poolID)
+        external
+        view
+        returns (address);
+
+    function terminusPoolCapacity(uint256 poolID)
+        external
+        view
+        returns (uint256);
+
+    function terminusPoolSupply(uint256 poolID) external view returns (uint256);
+
+    function createSimplePool(uint256 _capacity) external returns (uint256);
+
+    function createPoolV1(
+        uint256 _capacity,
+        bool _transferable,
+        bool _burnable
+    ) external returns (uint256);
+
+    function mint(
+        address to,
+        uint256 poolID,
+        uint256 amount,
+        bytes memory data
+    ) external;
+
+    function mintBatch(
+        address to,
+        uint256[] memory poolIDs,
+        uint256[] memory amounts,
+        bytes memory data
+    ) external;
+
+    function burn(
+        address from,
+        uint256 poolID,
+        uint256 amount
+    ) external;
+}

contracts/terminus/ERC1155WithTerminusStorage.sol

@@ -15,20 +15,13 @@
 
 pragma solidity ^0.8.9;
 
-import "@openzeppelin-contracts/contracts/token/ERC1155/IERC1155.sol";
 import "@openzeppelin-contracts/contracts/token/ERC1155/IERC1155Receiver.sol";
-import "@openzeppelin-contracts/contracts/token/ERC1155/extensions/IERC1155MetadataURI.sol";
 import "@openzeppelin-contracts/contracts/utils/Address.sol";
 import "@openzeppelin-contracts/contracts/utils/Context.sol";
-import "@openzeppelin-contracts/contracts/utils/introspection/ERC165.sol";
 import "./LibTerminus.sol";
+import "../interfaces/IERC1155WithTerminusStorage.sol";
 
-contract ERC1155WithTerminusStorage is
-    Context,
-    ERC165,
-    IERC1155,
-    IERC1155MetadataURI
-{
+contract ERC1155WithTerminusStorage is Context, IERC1155WithTerminusStorage {
     using Address for address;
 
     constructor() {}
@@ -40,13 +33,13 @@ contract ERC1155WithTerminusStorage is
         public
         view
         virtual
-        override(ERC165, IERC165)
+        override
         returns (bool)
     {
         return
             interfaceId == type(IERC1155).interfaceId ||
             interfaceId == type(IERC1155MetadataURI).interfaceId ||
-            super.supportsInterface(interfaceId);
+            interfaceId == type(IERC1155WithTerminusStorage).interfaceId;
     }
 
     function uri(uint256 poolID)
@@ -138,12 +131,16 @@ contract ERC1155WithTerminusStorage is
     function isApprovedForPool(uint256 poolID, address operator)
         public
         view
+        override
         returns (bool)
     {
         return LibTerminus._isApprovedForPool(poolID, operator);
     }
 
-    function approveForPool(uint256 poolID, address operator) external {
+    function approveForPool(uint256 poolID, address operator)
+        external
+        override
+    {
         LibTerminus.enforcePoolIsController(poolID, _msgSender());
         LibTerminus._approveForPool(poolID, operator);
     }

contracts/terminus/TerminusFacet.sol

@@ -24,22 +24,15 @@ import "@openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
 import "./ERC1155WithTerminusStorage.sol";
 import "./LibTerminus.sol";
 import "../diamond/libraries/LibDiamond.sol";
+import "../interfaces/ITerminus.sol";
 
-contract TerminusFacet is ERC1155WithTerminusStorage {
+contract TerminusFacet is ITerminus, ERC1155WithTerminusStorage {
     constructor() {
         LibTerminus.TerminusStorage storage ts = LibTerminus.terminusStorage();
         ts.controller = msg.sender;
     }
 
-    event PoolMintBatch(
-        uint256 indexed id,
-        address indexed operator,
-        address from,
-        address[] toAddresses,
-        uint256[] amounts
-    );
-
-    function setController(address newController) external {
+    function setController(address newController) external override {
         LibTerminus.enforceIsController();
         LibTerminus.setController(newController);
     }

contracts/terminus/TerminusPermissions.sol

@@ -7,7 +7,7 @@
  */
 
 import "@openzeppelin-contracts/contracts/access/Ownable.sol";
-import "./TerminusFacet.sol";
+import "../interfaces/ITerminus.sol";
 
 pragma solidity ^0.8.9;
 
@@ -17,7 +17,7 @@ abstract contract TerminusPermissions {
         uint256 poolId,
         uint256 _amount
     ) internal view returns (bool) {
-        TerminusFacet terminus = TerminusFacet(terminusAddress);
+        ITerminus terminus = ITerminus(terminusAddress);
         return terminus.balanceOf(msg.sender, poolId) >= _amount;
     }
 
@@ -34,7 +34,7 @@ abstract contract TerminusPermissions {
             _holdsPoolToken(terminusAddress, poolId, 1),
             "TerminusPermissions.spendsPoolToken: Sender doens't hold  pool tokens"
         );
-        TerminusFacet terminusContract = TerminusFacet(terminusAddress);
+        ITerminus terminusContract = ITerminus(terminusAddress);
         terminusContract.burn(msg.sender, poolId, 1);
         _;
     }

contracts/terminus/controller/TerminusControllerFacet.sol

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-
+pragma solidity ^0.8.9;
 /**
  * Authors: Moonstream Engineering (engineering@moonstream.to)
  * GitHub: https://github.com/bugout-dev/dao
@@ -8,13 +8,11 @@
  * with a ability to whitelist operators by using Terminus Pools
  */
 import "@openzeppelin-contracts/contracts/token/ERC20/IERC20.sol";
-import "../TerminusFacet.sol";
+import "../../interfaces/ITerminus.sol";
 import "../TerminusPermissions.sol";
 import "./LibTerminusController.sol";
 import "../TokenDrainerFacet.sol";
 
-pragma solidity ^0.8.9;
-
 // Permissions:
 // - Contract owner can change _TERMINUS_MAIN_ADMIN_POOL_ID (+ all other operations?)
 // - Holder of _TERMINUS_MAIN_ADMIN_POOL_ID can change poolControllerPoolID, create pool (+ pool operations?)
@@ -70,9 +68,9 @@ contract TerminusControllerFacet is TerminusPermissions, TokenDrainerFacet {
         ts.terminusAddress = terminusAddress;
     }
 
-    function terminusContract() internal view returns (TerminusFacet) {
+    function terminusContract() internal view returns (ITerminus) {
         return
-            TerminusFacet(
+            ITerminus(
                 LibTerminusController
                     .terminusControllerStorage()
                     .terminusAddress