Merge pull request #31 from nventuro/peer-dep

Added zos-lib as a peer dependency and used its Initializable.

.travis.yml

@@ -18,6 +18,11 @@ jobs:
     - env: SOLIDITY_COVERAGE=true
     - env: SOLC_NIGHTLY=true
   include:
+    - stage: install
+      script: true
+      install:
+        - npm install
+        - npx npm-install-peers
     # Run the unit test suite three times in parallel.
     # The first one gets results faster and is the only one required to pass.
     # The second one generates the coverage report.
@@ -25,18 +30,22 @@ jobs:
     # upcoming solidity release.
     - stage: tests
       name: "unit tests"
+      install: npx npm-install-peers
       script: npm run test
     - stage: tests
       name: "unit tests with coverage"
+      install: npx npm-install-peers
       script: npm run test
       env: SOLIDITY_COVERAGE=true
     - stage: tests
       name: "unit tests with solc nightly"
+      install: npx npm-install-peers
       script: npm run test
       env: SOLC_NIGHTLY=true
     # solidity and javascript style tests.
     - stage: tests
       name: "static tests"
+      install: npx npm-install-peers
       script: npm run lint
     - stage: update docs
       if: tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$

contracts/Initializable.sol

-pragma solidity ^0.4.24;
-
-
-/**
- * @title Initializable
- *
- * @dev Helper contract to support initializer functions. To use it, replace
- * the constructor with a function that has the `initializer` modifier.
- * WARNING: Unlike constructors, initializer functions must be manually
- * invoked. This applies both to deploying an Initializable contract, as well
- * as extending an Initializable contract via inheritance.
- * WARNING: When used with inheritance, manual care must be taken to not invoke
- * a parent initializer twice, because this is not dealt with automatically as
- * with constructors.
- */
-contract Initializable {
-
-  /**
-   * @dev Indicates that the contract has been initialized.
-   */
-  bool private initialized;
-
-  /**
-   * @dev Indicates that the contract is in the process of being initialized.
-   */
-  bool private initializing;
-
-  /**
-   * @dev Modifier to use in the initializer function of a contract.
-   */
-  modifier initializer() {
-    require(initializing || isConstructor() || !initialized, "Contract instance has already been initialized");
-
-    bool wasInitializing = initializing;
-    initializing = true;
-    initialized = true;
-
-    _;
-
-    initializing = wasInitializing;
-  }
-
-  /// @dev Returns true if and only if the function is running in the constructor
-  function isConstructor() private view returns (bool) {
-    uint cs;
-    assembly { cs := extcodesize(address) }
-    return cs == 0;
-  }
-
-  uint256[50] private ______gap;
-}

contracts/access/roles/CapperRole.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../Roles.sol";
 
 

contracts/access/roles/MinterRole.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../Roles.sol";
 
 

contracts/access/roles/PauserRole.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../Roles.sol";
 
 

contracts/access/roles/SignerRole.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../Roles.sol";
 
 

contracts/crowdsale/Crowdsale.sol

 pragma solidity ^0.4.24;
 
-import "../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../token/ERC20/IERC20.sol";
 import "../math/SafeMath.sol";
 import "../token/ERC20/SafeERC20.sol";

contracts/crowdsale/distribution/FinalizableCrowdsale.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../../math/SafeMath.sol";
 import "../validation/TimedCrowdsale.sol";
 

contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../validation/TimedCrowdsale.sol";
 import "../../token/ERC20/IERC20.sol";
 import "../../math/SafeMath.sol";

contracts/crowdsale/distribution/RefundableCrowdsale.sol

 pragma solidity ^0.4.24;
 
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../../math/SafeMath.sol";
 import "./FinalizableCrowdsale.sol";
 import "../../payment/RefundEscrow.sol";

contracts/crowdsale/emission/AllowanceCrowdsale.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../Crowdsale.sol";
 import "../../token/ERC20/IERC20.sol";
 import "../../token/ERC20/SafeERC20.sol";

contracts/crowdsale/emission/MintedCrowdsale.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../Crowdsale.sol";
 import "../../token/ERC20/ERC20Mintable.sol";
 

contracts/crowdsale/price/IncreasingPriceCrowdsale.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../validation/TimedCrowdsale.sol";
 import "../../math/SafeMath.sol";
 

contracts/crowdsale/validation/CappedCrowdsale.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../../math/SafeMath.sol";
 import "../Crowdsale.sol";
 

contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../../math/SafeMath.sol";
 import "../Crowdsale.sol";
 import "../../access/roles/CapperRole.sol";

contracts/crowdsale/validation/TimedCrowdsale.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../../math/SafeMath.sol";
 import "../Crowdsale.sol";
 

contracts/drafts/ERC1046/TokenMetadata.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../../token/ERC20/IERC20.sol";
 
 

contracts/drafts/ERC20Migrator.sol

 pragma solidity ^0.4.24;
 
-import "../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../token/ERC20/IERC20.sol";
 import "../token/ERC20/ERC20Mintable.sol";
 import "../token/ERC20/SafeERC20.sol";

contracts/drafts/SignatureBouncer.sol

 pragma solidity ^0.4.24;
 
-import "../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../access/roles/SignerRole.sol";
 import "../cryptography/ECDSA.sol";
 

contracts/drafts/TokenVesting.sol

@@ -2,7 +2,7 @@
 
 pragma solidity ^0.4.24;
 
-import "../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../token/ERC20/SafeERC20.sol";
 import "../ownership/Ownable.sol";
 import "../math/SafeMath.sol";

contracts/examples/SampleCrowdsale.sol

 pragma solidity ^0.4.24;
 
-import "../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../crowdsale/validation/CappedCrowdsale.sol";
 import "../crowdsale/distribution/RefundableCrowdsale.sol";
 import "../crowdsale/emission/MintedCrowdsale.sol";

contracts/examples/SimpleToken.sol

 pragma solidity ^0.4.24;
 
 
-import "../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../token/ERC20/ERC20.sol";
 
 

contracts/introspection/ERC165.sol

 pragma solidity ^0.4.24;
 
-import "../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./IERC165.sol";
 
 

contracts/lifecycle/Pausable.sol

 pragma solidity ^0.4.24;
 
-import "../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../access/roles/PauserRole.sol";
 
 

contracts/ownership/Ownable.sol

 pragma solidity ^0.4.24;
 
-import "../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 
 /**
  * @title Ownable

contracts/ownership/Secondary.sol

 pragma solidity ^0.4.24;
 
-import "../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 
 /**
  * @title Secondary

contracts/payment/ConditionalEscrow.sol

 pragma solidity ^0.4.24;
 
-import "../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./Escrow.sol";
 
 

contracts/payment/Escrow.sol

 pragma solidity ^0.4.24;
 
-import "../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../math/SafeMath.sol";
 import "../ownership/Secondary.sol";
 

contracts/payment/PullPayment.sol

 pragma solidity ^0.4.24;
 
-import "../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./Escrow.sol";
 
 

contracts/payment/RefundEscrow.sol

 pragma solidity ^0.4.24;
 
-import "../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./ConditionalEscrow.sol";
 
 

contracts/payment/SplitPayment.sol

 pragma solidity ^0.4.24;
 
-import "../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../math/SafeMath.sol";
 
 

contracts/token/ERC20/ERC20.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./IERC20.sol";
 import "../../math/SafeMath.sol";
 

contracts/token/ERC20/ERC20Burnable.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./ERC20.sol";
 
 

contracts/token/ERC20/ERC20Capped.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./ERC20Mintable.sol";
 
 

contracts/token/ERC20/ERC20Detailed.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./IERC20.sol";
 
 

contracts/token/ERC20/ERC20Mintable.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./ERC20.sol";
 import "../../access/roles/MinterRole.sol";
 

contracts/token/ERC20/ERC20Pausable.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./ERC20.sol";
 import "../../lifecycle/Pausable.sol";
 

contracts/token/ERC20/TokenTimelock.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./SafeERC20.sol";
 
 

contracts/token/ERC721/ERC721.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./IERC721.sol";
 import "./IERC721Receiver.sol";
 import "../../math/SafeMath.sol";

contracts/token/ERC721/ERC721Burnable.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./ERC721.sol";
 
 

contracts/token/ERC721/ERC721Enumerable.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./IERC721Enumerable.sol";
 import "./ERC721.sol";
 import "../../introspection/ERC165.sol";

contracts/token/ERC721/ERC721Full.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./ERC721.sol";
 import "./ERC721Enumerable.sol";
 import "./ERC721Metadata.sol";

contracts/token/ERC721/ERC721Holder.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./IERC721Receiver.sol";
 
 

contracts/token/ERC721/ERC721Metadata.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./ERC721.sol";
 import "./IERC721Metadata.sol";
 import "../../introspection/ERC165.sol";

contracts/token/ERC721/ERC721MetadataMintable.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./ERC721Metadata.sol";
 import "../../access/roles/MinterRole.sol";
 

contracts/token/ERC721/ERC721Mintable.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./ERC721.sol";
 import "../../access/roles/MinterRole.sol";
 

contracts/token/ERC721/ERC721Pausable.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./ERC721.sol";
 import "../../lifecycle/Pausable.sol";
 

contracts/token/ERC721/IERC721.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "../../introspection/IERC165.sol";
 
 

contracts/token/ERC721/IERC721Enumerable.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./IERC721.sol";
 
 

contracts/token/ERC721/IERC721Full.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./IERC721.sol";
 import "./IERC721Enumerable.sol";
 import "./IERC721Metadata.sol";

contracts/token/ERC721/IERC721Metadata.sol

 pragma solidity ^0.4.24;
 
-import "../../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 import "./IERC721.sol";
 
 

contracts/utils/ReentrancyGuard.sol

 pragma solidity ^0.4.24;
 
-import "../Initializable.sol";
+import "zos-lib/contracts/Initializable.sol";
 
 /**
  * @title Helps contracts guard against reentrancy attacks.

package.json

@@ -50,10 +50,14 @@
     "eslint-plugin-standard": "^3.1.0",
     "ethjs-abi": "^0.2.1",
     "ganache-cli": "6.1.0",
+    "npm-install-peers": "^1.2.1",
     "solidity-coverage": "^0.5.4",
     "solium": "^1.1.8",
     "truffle": "^4.1.13",
     "truffle-hdwallet-provider": "0.0.5",
     "web3-utils": "^1.0.0-beta.34"
+  },
+  "peerDependencies": {
+    "zos-lib": "^2.0.0-alpha.3"
   }
 }