Merge pull request #69 from SetProtocol/brian/aggregate_modifiers

Moved common modifiers to own contract. Extensions now inherit this …

Author: asoong

contracts/core/extensions/CoreAccounting.sol

@@ -17,6 +17,7 @@
 pragma solidity 0.4.24;
 
 import { SafeMath } from "zeppelin-solidity/contracts/math/SafeMath.sol";
+import { CoreModifiers } from "../lib/CoreSharedModifiers.sol";
 import { CoreState } from "../lib/CoreState.sol";
 import { ITransferProxy } from "../interfaces/ITransferProxy.sol";
 import { IVault } from "../interfaces/IVault.sol";
@@ -30,7 +31,8 @@ import { IVault } from "../interfaces/IVault.sol";
  * for storage of tokenized assets
  */
 contract CoreAccounting is
-    CoreState
+    CoreState,
+    CoreModifiers
 {
     // Use SafeMath library for all uint256 arithmetic
     using SafeMath for uint256;
@@ -66,14 +68,6 @@ contract CoreAccounting is
         _;
     }
 
-    modifier isPositiveQuantity(uint _quantity) {
-        require(
-            _quantity > 0,
-            ZERO_QUANTITY
-        );
-        _;
-    }
-
     /* ============ Public Functions ============ */
 
     /**

contracts/core/extensions/CoreFactory.sol

@@ -17,6 +17,7 @@
 pragma solidity 0.4.24;
 
 import { SafeMath } from "zeppelin-solidity/contracts/math/SafeMath.sol";
+import { CoreModifiers } from "../lib/CoreSharedModifiers.sol";
 import { CoreState } from "../lib/CoreState.sol";
 import { ISetFactory } from "../interfaces/ISetFactory.sol";
 
@@ -28,7 +29,8 @@ import { ISetFactory } from "../interfaces/ISetFactory.sol";
  * The CoreCreate contract contains public set token operations
  */
 contract CoreFactory is
-    CoreState
+    CoreState,
+    CoreModifiers
 {
     // Use SafeMath library for all uint256 arithmetic
     using SafeMath for uint256;
@@ -49,15 +51,6 @@ contract CoreFactory is
         string _symbol
     );
 
-    /* ============ Modifiers ============ */
-
-    modifier isValidFactory(address _factoryAddress) {
-        require(
-            state.validFactories[_factoryAddress],
-            INVALID_FACTORY
-        );
-        _;
-    }
 
     /* ============ Public Functions ============ */
 

contracts/core/extensions/CoreInternal.sol

@@ -17,6 +17,7 @@
 pragma solidity 0.4.24;
 
 import { Ownable } from "zeppelin-solidity/contracts/ownership/Ownable.sol";
+import { CoreModifiers } from "../lib/CoreSharedModifiers.sol";
 import { CoreState } from "../lib/CoreState.sol";
 
 
@@ -29,7 +30,8 @@ import { CoreState } from "../lib/CoreState.sol";
  */
 contract CoreInternal is
     Ownable,
-    CoreState
+    CoreState,
+    CoreModifiers
 {
     /* ============ Setter Functions ============ */
 
@@ -87,6 +89,7 @@ contract CoreInternal is
     )
         external
         onlyOwner
+        isValidFactory(_factoryAddress)
     {
         state.validFactories[_factoryAddress] = false;
     }
@@ -101,6 +104,7 @@ contract CoreInternal is
     )
         external
         onlyOwner
+        isValidSet(_setAddress)
     {
         state.validSets[_setAddress] = false;
     }

contracts/core/extensions/CoreIssuance.sol

@@ -17,6 +17,7 @@
 pragma solidity 0.4.24;
 
 import { SafeMath } from "zeppelin-solidity/contracts/math/SafeMath.sol";
+import { CoreModifiers } from "../lib/CoreSharedModifiers.sol";
 import { CoreState } from "../lib/CoreState.sol";
 import { ISetToken } from "../interfaces/ISetToken.sol";
 import { ITransferProxy } from "../interfaces/ITransferProxy.sol";
@@ -30,7 +31,8 @@ import { IVault } from "../interfaces/IVault.sol";
  * The CoreIssuance contract contains public set token operations
  */
 contract CoreIssuance is
-    CoreState
+    CoreState,
+    CoreModifiers
 {
     // Use SafeMath library for all uint256 arithmetic
     using SafeMath for uint256;
@@ -60,23 +62,6 @@ contract CoreIssuance is
         _;
     }
 
-    modifier isPositive(uint _quantity) {
-        require(
-            _quantity > 0,
-            ZERO_QUANTITY
-        );
-        _;
-    }
-
-    // Verify set was created by core and is enabled
-    modifier isValidSet(address _setAddress) {
-        require(
-            state.validSets[_setAddress],
-            INVALID_SET
-        );
-        _;
-    }
-
     /* ============ Public Functions ============ */
 
     /**
@@ -91,7 +76,7 @@ contract CoreIssuance is
     )
         public
         isValidSet(_setAddress)
-        isPositive(_quantity)
+        isPositiveQuantity(_quantity)
         isNaturalUnitMultiple(_quantity, _setAddress)
     {
         // Fetch set token components
@@ -172,7 +157,7 @@ contract CoreIssuance is
     )
         public
         isValidSet(_setAddress)
-        isPositive(_quantity)
+        isPositiveQuantity(_quantity)
         isNaturalUnitMultiple(_quantity, _setAddress)
     {
         // Burn the Set token (thereby decrementing the SetToken balance)

contracts/core/lib/CoreSharedModifiers.sol

@@ -0,0 +1,67 @@
+/*
+    Copyright 2018 Set Labs Inc.
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+pragma solidity 0.4.24;
+
+import { CoreState } from "../lib/CoreState.sol";
+
+/**
+ * @title Core Shared Modifiers
+ * @author Set Protocol
+ *
+ * The Core Shared Modifiers library contains the modifiers that are shared across the different
+ * Core extensions.
+ */
+
+contract CoreModifiers is
+    CoreState
+{
+
+    /* ============ Constants ============ */
+
+    string constant ZERO_QUANTITY = "Quantity must be greater than zero.";
+    string constant INVALID_SET = "Set token is disabled or does not exist.";
+    string constant INVALID_FACTORY = "Factory is disabled or does not exist.";
+
+    /* ============ Modifiers ============ */
+
+    // Check that quantity submitted is greater than 0
+    modifier isPositiveQuantity(uint _quantity) {
+        require(
+            _quantity > 0,
+            ZERO_QUANTITY
+        );
+        _;
+    }
+
+    // Verify Factory is linked to Core
+    modifier isValidFactory(address _factoryAddress) {
+        require(
+            state.validFactories[_factoryAddress],
+            INVALID_FACTORY
+        );
+        _;
+    }
+
+    // Verify set was created by core and is enabled
+    modifier isValidSet(address _setAddress) {
+        require(
+            state.validSets[_setAddress],
+            INVALID_SET
+        );
+        _;
+    }
+}