better interfaces, _isOwnerOrProxy helper

ProjectOpenSea · Oct 16, 2019 · 59d2e0c · 59d2e0c
1 parent 52bcaf3
commit 59d2e0c
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 33 deletions.
diff --git a/contracts/IFactory.sol b/contracts/IFactory.sol
@@ -54,14 +54,13 @@ interface IFactory {
     */
   function mint(uint256 _optionId, address _toAddress, uint256 _amount, bytes calldata _data) external;
 
-  /**
-   * @dev Transfers assets to the _to address, minting them out of the factory if needed.
-   * Should call the same logic under `mint`
-   * @param _from The address to transfer from (ignored)
-   * @param _to The address to transfer to
-   * @param _optionId the option id
-   * @param _amount amount of the option to mint
-   * @param _data Extra data to pass
-   */
+  ///////
+  // Get things to work on OpenSea with mock methods below
+  ///////
+
   function safeTransferFrom(address _from, address _to, uint256 _optionId, uint256 _amount, bytes calldata _data) external;
+
+  function balanceOf(address _owner, uint256 _optionId) external view returns (uint256);
+
+  function isApprovedForAll(address _owner, address _operator) external view returns (bool);
 }
diff --git a/contracts/ILootBox.sol b/contracts/ILootBox.sol
@@ -53,17 +53,9 @@ interface ILootBox {
     */
   function open(uint256 _optionId, address _toAddress, uint256 _amount) external;
 
-  /**
-   * @dev Transfers assets to the _to address, minting them out of the factory if needed.
-   * Should call the same logic under `mint`
-   * @param _from The address to transfer from (ignored)
-   * @param _to The address to transfer to
-   * @param _optionId the option id
-   * @param _amount amount of the option to mint
-   * @param _data Extra data to pass
-   */
-  function safeTransferFrom(address _from, address _to, uint256 _optionId, uint256 _amount, bytes calldata _data) external;
-
+  ////////
+  // ADMINISTRATION
+  ////////
 
   /**
    * @dev If the tokens for some class are pre-minted and owned by the
@@ -76,4 +68,20 @@ interface ILootBox {
    * creating/minting into the nft address
    */
   function resetClass(uint256 _classId) external;
+
+  /**
+   * @dev Withdraw lootbox revenue
+   * Only accessible by contract owner
+   */
+  function withdraw() external;
+
+  ///////
+  // Get things to work on OpenSea with mock methods below
+  ///////
+
+  function safeTransferFrom(address _from, address _to, uint256 _optionId, uint256 _amount, bytes calldata _data) external;
+
+  function balanceOf(address _owner, uint256 _optionId) external view returns (uint256);
+
+  function isApprovedForAll(address _owner, address _operator) external view returns (bool);
 }
diff --git a/contracts/MyFactory.sol b/contracts/MyFactory.sol
@@ -107,8 +107,7 @@ contract MyFactory is IFactory, Ownable {
     address _owner,
     uint256 _optionId
   ) public view returns (uint256) {
-    ProxyRegistry proxyRegistry = ProxyRegistry(proxyRegistryAddress);
-    if (owner() != _owner && address(proxyRegistry.proxies(owner())) != _owner) {
+    if (!_isOwnerOrProxy(_owner)) {
       // Only the factory owner or owner's proxy can have supply
       return 0;
     }
@@ -145,16 +144,7 @@ contract MyFactory is IFactory, Ownable {
     address _owner,
     address _operator
   ) public view returns (bool) {
-    if (owner() == _owner && _owner == _operator) {
-      return true;
-    }
-
-    ProxyRegistry proxyRegistry = ProxyRegistry(proxyRegistryAddress);
-    if (owner() == _owner && address(proxyRegistry.proxies(_owner)) == _operator) {
-      return true;
-    }
-
-    return false;
+    return owner() == _owner && _isOwnerOrProxy(_operator);
   }
 
   function _canMint(
@@ -165,4 +155,11 @@ contract MyFactory is IFactory, Ownable {
     uint256 optionId = uint256(_option);
     return _amount > 0 && balanceOf(_fromAddress, optionId) >= _amount;
   }
+
+  function _isOwnerOrProxy(
+    address _address
+  ) internal view returns (bool) {
+    ProxyRegistry proxyRegistry = ProxyRegistry(proxyRegistryAddress);
+    return owner() == _address || address(proxyRegistry.proxies(owner())) == _address;
+  }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -5523,7 +5523,7 @@ ms@^2.1.1:
 
 "multi-token-standard@github:ProjectOpenSea/multi-token-standard":
   version "0.8.4"
-  resolved "https://codeload.github.com/ProjectOpenSea/multi-token-standard/tar.gz/fd5a9089307066067c46606b028fbeaff370c464"
+  resolved "https://codeload.github.com/ProjectOpenSea/multi-token-standard/tar.gz/de2d0af8852a588c1eb7160b1a5b742d5fa8ce90"
 
 mute-stdout@^1.0.0:
   version "1.0.1"