Release v2.0.1

Fix SafeERC20.safeApprove bug

(cherry picked from commit 3111291b4a)

.babelrc

@@ -1,3 +0,0 @@
-{
-  "presets": ["es2015", "stage-2", "stage-3"]
-}

.editorconfig

@@ -0,0 +1,12 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+indent_size = 2
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true

.eslintrc

@@ -21,31 +21,35 @@
   "rules": {
 
     // Strict mode
-    "strict": [2, "global"],
+    "strict": ["error", "global"],
 
     // Code style
-    "indent": [2, 2],
-    "quotes": [2, "single"],
+    "camelcase": ["error", {"properties": "always"}],
+    "comma-dangle": ["error", "always-multiline"],
+    "comma-spacing": ["error", {"before": false, "after": true}],
+    "dot-notation": ["error", {"allowKeywords": true, "allowPattern": ""}],
+    "eol-last": ["error", "always"],
+    "eqeqeq": ["error", "smart"],
+    "generator-star-spacing": ["error", "before"],
+    "indent": ["error", 2],
+    "linebreak-style": ["error", "unix"],
+    "max-len": ["error", 120, 2],
+    "no-debugger": "off",
+    "no-dupe-args": "error",
+    "no-dupe-keys": "error",
+    "no-mixed-spaces-and-tabs": ["error", "smart-tabs"],
+    "no-redeclare": ["error", {"builtinGlobals": true}],
+    "no-trailing-spaces": ["error", { "skipBlankLines": false }],
+    "no-undef": "error",
+    "no-use-before-define": "off",
+    "no-var": "error",
+    "object-curly-spacing": ["error", "always"],
+    "prefer-const": "error",
+    "quotes": ["error", "single"],
     "semi": ["error", "always"],
     "space-before-function-paren": ["error", "always"],
-    "no-use-before-define": 0,
-    "eqeqeq": [2, "smart"],
-    "dot-notation": [2, {"allowKeywords": true, "allowPattern": ""}],
-    "no-redeclare": [2, {"builtinGlobals": true}],
-    "no-trailing-spaces": [2, { "skipBlankLines": true }],
-    "eol-last": 1,
-    "comma-spacing": [2, {"before": false, "after": true}],
-    "camelcase": [2, {"properties": "always"}],
-    "no-mixed-spaces-and-tabs": [2, "smart-tabs"],
-    "comma-dangle": [1, "always-multiline"],
-    "no-dupe-args": 2,
-    "no-dupe-keys": 2,
-    "no-debugger": 0,
-    "no-undef": 2,
-    "object-curly-spacing": [2, "always"],
-    "max-len": [2, 120, 2],
-    "generator-star-spacing": ["error", "before"],
-    "promise/avoid-new": 0,
-    "promise/always-return": 0
+
+    "promise/always-return": "off",
+    "promise/avoid-new": "off",
   }
 }

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,4 +14,4 @@ Fixes #
 - [ ] 📘 I've reviewed the [OpenZeppelin Contributor Guidelines](../blob/master/CONTRIBUTING.md)
 - [ ] ✅ I've added tests where applicable to test my new functionality.
 - [ ] 📖 I've made sure that my contracts are well-documented.
-- [ ] 🎨 I've run the JS/Solidity linters and fixed any issues (`npm run lint:all:fix`).
+- [ ] 🎨 I've run the JS/Solidity linters and fixed any issues (`npm run lint:fix`).

.gitignore

@@ -34,3 +34,6 @@ build/
 
 # lol macs
 .DS_Store/
+
+# truffle
+.node-xmlhttprequest-*

.jshintrc

@@ -1,48 +0,0 @@
-{
-    "bitwise": false,     // Prohibit bitwise operators (&, |, ^, etc.).
-    "browser": true,      // Standard browser globals e.g. `window`, `document`.
-    "camelcase": false,   // Permit only camelcase for `var` and `object indexes`.
-    "curly": true,        // Require {} for every new block or scope.
-    "devel": false,       // Allow development statements e.g. `console.log();`.
-    "eqeqeq": true,       // Require triple equals i.e. `===`.
-    "esnext": true,       // Allow ES.next specific features such as `const` and `let`.
-    "freeze": true,       // Forbid overwriting prototypes of native objects such as Array, Date and so on.
-    "immed": true,        // Require immediate invocations to be wrapped in parens e.g. `( function(){}() );`
-    "indent": 2,          // Specify indentation spacing
-    "latedef": true,      // Prohibit variable use before definition.
-    "newcap": false,      // Require capitalization of all constructor functions e.g. `new F()`.
-    "noarg": true,        // Prohibit use of `arguments.caller` and `arguments.callee`.
-    "node": true,         // Enable globals available when code is running inside of the NodeJS runtime environment.
-    "noempty": true,      // Prohibit use of empty blocks.
-    "nonew": true,        // Prohibits the use of constructor functions for side-effects
-    "quotmark": "single", // Define quotes to string values.
-    "regexp": true,       // Prohibit `.` and `[^...]` in regular expressions.
-    "smarttabs": false,   // Supress warnings about mixed tabs and spaces
-    "strict": true,       // Require `use strict` pragma in every file.
-    "trailing": true,     // Prohibit trailing whitespaces.
-    "undef": true,        // Require all non-global variables be declared before they are used.
-    "unused": true,       // Warn unused variables.
-
-    "maxparams": 4,       // Maximum number of parameters for a function
-    "maxstatements": 15,  // Maximum number of statements in a function
-    "maxcomplexity": 10,  // Cyclomatic complexity (http://en.wikipedia.org/wiki/Cyclomatic_complexity)
-    "maxdepth": 4,        // Maximum depth of nested control structures
-    "maxlen": 120,        // Maximum number of cols in a line
-    "multistr": true,     // Allow use of multiline EOL escaping
-    "experimental": ["asyncawait", "asyncreqawait"],
-
-    "predef": [ // Extra globals.
-        "after",
-        "afterEach",
-        "before",
-        "beforeEach",
-        "define",
-        "describe",
-        "exports",
-        "it",
-        "web3",
-        "artifacts",
-        "contract",
-        "assert"
-    ]
-}

.soliumrc.json

@@ -2,10 +2,18 @@
   "extends": "solium:all",
   "plugins": ["security"],
   "rules": {
-    "quotes": ["error", "double"],
-    "no-empty-blocks": "off",
+    "blank-lines": "off",
+    "error-reason": "off",
     "indentation": ["error", 2],
-    "arg-overflow": ["warning", 3],
+    "lbrace": "off",
+    "linebreak-style": ["error", "unix"],
+    "max-len": ["error", 79],
+    "no-constant": ["error"],
+    "no-empty-blocks": "off",
+    "quotes": ["error", "double"],
+    "uppercase": "off",
+    "visibility-first": "error",
+
     "security/enforce-explicit-visibility": ["error"],
     "security/no-block-members": ["warning"],
     "security/no-inline-assembly": ["warning"]

.travis.yml

@@ -1,27 +1,52 @@
 dist: trusty
-sudo: required
+sudo: false
 group: beta
 language: node_js
 node_js:
   - "8"
+
 cache:
   directories:
     - node_modules
-env:
-  -
-  - SOLIDITY_COVERAGE=true
-  - SOLC_NIGHTLY=true
-matrix:
+
+jobs:
+  # XXX fast_finish doesn't work with stages yet. See
+  # https://github.com/travis-ci/travis-ci/issues/8425
+  # --elopio - 20180531
   fast_finish: true
   allow_failures:
     - env: SOLIDITY_COVERAGE=true
     - env: SOLC_NIGHTLY=true
-before_script:
-  - truffle version
-script:
-  - npm run lint
-  - npm run lint:sol
-  - npm run test
+  include:
+    # 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.
+    # The third one is to keep us informed about possible issues with the
+    # upcoming solidity release.
+    - stage: tests
+      name: "unit tests"
+      script: npm run test
+    - stage: tests
+      name: "unit tests with coverage"
+      script: npm run test
+      env: SOLIDITY_COVERAGE=true
+    - stage: tests
+      name: "unit tests with solc nightly"
+      script: npm run test
+      env: SOLC_NIGHTLY=true
+    # solidity and javascript style tests.
+    - stage: tests
+      name: "static tests"
+      script: npm run lint
+    - stage: update docs
+      if: tag =~ ^v[0-9]+\.[0-9]+\.[0-9]+$
+      addons:
+        apt:
+          packages:
+            - curl
+      script:
+        - ./scripts/ci/trigger_docs_update "${TRAVIS_TAG}"
+
 notifications:
   slack:
     rooms:

CODE_OF_CONDUCT.md

@@ -0,0 +1,73 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at maintainers@openzeppelin.org. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org

CODE_STYLE.md

@@ -0,0 +1,63 @@
+# Code Style
+
+We value clean code and consistency, and those are prerequisites for us to
+include new code in the repository. Before proposing a change, please read this
+document and take some time to familiarize yourself with the style of the
+existing codebase.
+
+## Solidity code
+
+In order to be consistent with all the other Solidity projects, we follow the
+[official recommendations documented in the Solidity style guide](http://solidity.readthedocs.io/en/latest/style-guide.html).
+
+Any exception or additions specific to our project are documented below.
+
+### Naming
+
+* Try to avoid acronyms and abbreviations.
+
+* All state variables should be private.
+
+* Private state variables should have an underscore prefix.
+
+    ```
+    contract TestContract {
+      uint256 private _privateVar;
+      uint256 internal _internalVar;
+    }
+    ```
+
+* Parameters must not be prefixed with an underscore.
+
+    ```
+    function test(uint256 testParameter1, uint256 testParameter2) {
+    ...
+    }
+    ```
+
+* Internal and private functions should have an underscore prefix.
+
+    ```
+    function _testInternal() internal {
+      ...
+    }
+    ```
+
+    ```
+    function _testPrivate() private {
+      ...
+    }
+    ```
+
+* Events should be emitted immediately after the state change that they
+  represent, and consequently they should be named in past tense.
+
+    ```
+    function _burn(address _who, uint256 _value) internal {
+      super._burn(_who, _value);
+      emit TokensBurned(_who, _value);
+    }
+    ```
+
+  Some standards (e.g. ERC20) use present tense, and in those cases the
+  standard specification prevails.

CONTRIBUTING.md

@@ -20,13 +20,13 @@ As a contributor, you are expected to fork this repository, work on your own for
 
 ```
 cd openzeppelin-solidity
+git remote add upstream https://github.com/OpenZeppelin/openzeppelin-solidity.git
 git fetch upstream
-git checkout development
-git pull --rebase upstream development
+git pull --rebase upstream master
 ```
 NOTE: The directory `openzeppelin-solidity` represents your fork's local copy.
 
-2) Branch out from `development` into `fix/some-bug-#123`:
+2) Branch out from `master` into `fix/some-bug-#123`:
 (Postfixing #123 will associate your PR with the issue #123 and make everyone's life easier =D)
 ```
 git checkout -b fix/some-bug-#123

README.md

@@ -1,64 +1,58 @@
-# OpenZeppelin Solidity
+# <img src="logo.png" alt="OpenZeppelin" width="400px">
+
 [![NPM Package](https://img.shields.io/npm/v/openzeppelin-solidity.svg?style=flat-square)](https://www.npmjs.org/package/openzeppelin-solidity)
 [![Build Status](https://img.shields.io/travis/OpenZeppelin/openzeppelin-solidity.svg?branch=master&style=flat-square)](https://travis-ci.org/OpenZeppelin/openzeppelin-solidity)
 [![Coverage Status](https://img.shields.io/coveralls/github/OpenZeppelin/openzeppelin-solidity/master.svg?style=flat-square)](https://coveralls.io/github/OpenZeppelin/openzeppelin-solidity?branch=master)
 
-OpenZeppelin is a library for writing secure [Smart Contracts](https://en.wikipedia.org/wiki/Smart_contract) on Ethereum.
+**OpenZeppelin is a library for secure smart contract development.** It provides implementations of standards like ERC20 and ERC721 which you can deploy as-is or extend to suit your needs, as well as Solidity components to build custom contracts and more complex decentralized systems.
 
-With OpenZeppelin, you can build distributed applications, protocols and organizations:
-- using common contract security patterns (See [Onward with Ethereum Smart Contract Security](https://medium.com/bitcorps-blog/onward-with-ethereum-smart-contract-security-97a827e47702#.y3kvdetbz))
-- in the [Solidity language](https://solidity.readthedocs.io/en/develop/).
+## Install
 
-> NOTE: New to smart contract development? Check our [introductory guide](https://medium.com/zeppelin-blog/the-hitchhikers-guide-to-smart-contracts-in-ethereum-848f08001f05#.cox40d2ut).
-
-## Getting Started
-
-OpenZeppelin integrates with [Truffle](https://github.com/ConsenSys/truffle), an Ethereum development environment. Please install Truffle and initialize your project with `truffle init`.
-
-```sh
-npm install -g truffle
-mkdir myproject && cd myproject
-truffle init
+```
+npm install openzeppelin-solidity
 ```
 
-To install the OpenZeppelin library, run the following in your Solidity project root directory:
-```sh
-npm init -y
-npm install -E openzeppelin-solidity
-```
+## Usage
 
-**Note that OpenZeppelin does not currently follow semantic versioning.** You may encounter breaking changes upon a minor version bump. We recommend pinning the version of OpenZeppelin you use, as done by the `-E` (`--save-exact`) option.
-
-After that, you'll get all the library's contracts in the `node_modules/openzeppelin-solidity/contracts` folder. You can use the contracts in the library like so:
+To write your custom contracts, import ours and extend them through inheritance.
 
 ```solidity
-import 'openzeppelin-solidity/contracts/ownership/Ownable.sol';
+pragma solidity ^0.4.24;
 
-contract MyContract is Ownable {
-  ...
+import 'openzeppelin-solidity/contracts/token/ERC721/ERC721Full.sol';
+import 'openzeppelin-solidity/contracts/token/ERC721/ERC721Mintable.sol';
+
+contract MyNFT is ERC721Full, ERC721Mintable {
+  constructor() ERC721Full("MyNFT", "MNFT") public {
+  }
 }
 ```
 
+> You need an ethereum development framework for the above import statements to work! Check out these guides for [Truffle] or [Embark].
+
+On our site you will find a few [guides] to learn about the diferent parts of OpenZeppelin, as well as [documentation for the API][API docs]. Keep in mind that the API docs are work in progress, and don’t hesitate to ask questions in [our Slack][Slack].
 
 ## Security
-OpenZeppelin is meant to provide secure, tested and community-audited code, but please use common sense when doing anything that deals with real money! We take no responsibility for your implementation decisions and any security problem you might experience.
 
-If you find a security issue, please email [security@openzeppelin.org](mailto:security@openzeppelin.org).
+OpenZeppelin the project is maintained by [Zeppelin] the company, and developed following our high standards for code quality and security. OpenZeppelin is meant to provide tested and community-audited code, but please use common sense when doing anything that deals with real money! We take no responsibility for your implementation decisions and any security problems you might experience.
 
-## Developer Resources
+The core development principles and strategies that OpenZeppelin is based on include: security in depth, simple and modular code, clarity-driven naming conventions, comprehensive unit testing, pre-and-post-condition sanity checks, code consistency, and regular audits.
 
-Building a distributed application, protocol or organization with OpenZeppelin?
+Please report any security issues you find to security@openzeppelin.org.
 
-- Read documentation: https://openzeppelin.org/api/docs/open-zeppelin.html
+## Contribute
 
-- Ask for help and follow progress at: https://slack.openzeppelin.org/
-
-Interested in contributing to OpenZeppelin?
-
-- Framework proposal and roadmap: https://medium.com/zeppelin-blog/zeppelin-framework-proposal-and-development-roadmap-fdfa9a3a32ab#.iain47pak
-- Issue tracker: https://github.com/OpenZeppelin/openzeppelin-solidity/issues
-- Contribution guidelines: https://github.com/OpenZeppelin/openzeppelin-solidity/blob/master/CONTRIBUTING.md
-- Wiki: https://github.com/OpenZeppelin/openzeppelin-solidity/wiki
+OpenZeppelin exists thanks to its contributors. There are many ways you can participate and help build high quality software. Check out the [contribution guide]!
 
 ## License
-Code released under the [MIT License](https://github.com/OpenZeppelin/openzeppelin-solidity/blob/master/LICENSE).
+
+OpenZeppelin is released under the [MIT License](LICENSE).
+
+
+[API docs]: https://openzeppelin.org/api/docs/token_ERC721_ERC721BasicToken.html
+[guides]: https://openzeppelin.org/api/docs/get-started.html
+[Slack]: https://slack.openzeppelin.org
+[Zeppelin]: https://zeppelin.solutions
+[contribution guide]: CONTRIBUTING.md
+[Truffle]: https://truffleframework.com/docs/truffle/quickstart
+[Embark]: https://embark.status.im/docs/quick_start.html

RELEASING.md

@@ -0,0 +1,96 @@
+# Releasing
+
+This document describes our release process, and contains the steps to be followed by an OpenZeppelin maintainer at the several stages of a release.
+
+We release a new version of OpenZeppelin monthly. Release cycles are tracked in the [issue milestones](https://github.com/OpenZeppelin/openzeppelin-solidity/milestones).
+
+Each release has at least one release candidate published first, intended for community review and any critical fixes that may come out of it. At the moment we leave 1 week between the first release candidate and the final release.
+
+Before starting make sure to verify the following items.
+* Your local `master` branch is in sync with your `upstream` remote (it may have another name depending on your setup).
+* Your repo is clean, particularly with no untracked files in the contracts and tests directories. Verify with `git clean -n`.
+
+
+## Creating the release branch
+
+We'll refer to a release `vX.Y.Z`.
+
+```
+git checkout master
+git checkout -b release-vX.Y.Z
+```
+
+## Creating a release candidate
+
+Once in the release branch, change the version string in `package.json`, `package-lock.json` and `ethpm.json` to `X.Y.Z-rc.R`. (This will be `X.Y.Z-rc.1` for the first release candidate.) Commit these changes and tag the commit as `vX.Y.Z-rc.R`.
+
+```
+git add package.json package-lock.json ethpm.json
+git commit -m "Release candidate vX.Y.Z-rc.R"
+git tag -a vX.Y.Z-rc.R
+git push upstream release-vX.Y.Z
+git push upstream vX.Y.Z-rc.R
+```
+
+Draft the release notes in our [GitHub releases](https://github.com/OpenZeppelin/openzeppelin-solidity/releases). Make sure to mark it as a pre-release! Try to be consistent with our previous release notes in the title and format of the text. Release candidates don't need a detailed changelog, but make sure to include a link to GitHub's compare page.
+
+Once the CI run for the new tag is green, publish on npm under the `next` tag.
+
+```
+npm publish --tag next
+```
+
+Publish the release notes on GitHub and ask our community manager to announce the release candidate on at least Slack and Twitter.
+
+## Creating the final release
+
+Make sure to have the latest changes from `upstream` in your local release branch.
+
+```
+git checkout release-vX.Y.Z
+git pull upstream
+```
+
+Change the version string in `package.json`, `package-lock.json` and `ethpm.json` removing the "-rc.R" suffix. Commit these changes and tag the commit as `vX.Y.Z`.
+
+```
+git add package.json package-lock.json ethpm.json
+git commit -m "Release vX.Y.Z"
+git tag -a vX.Y.Z
+git push upstream vX.Y.Z
+```
+
+Draft the release notes in GitHub releases. Try to be consistent with our previous release notes in the title and format of the text. Make sure to include a detailed changelog.
+
+Once the CI run for the new tag is green, publish on npm.
+
+```
+npm publish
+```
+
+Publish the release notes on GitHub and ask our community manager to announce the release!
+
+Delete the `next` tag in the npm package as there is no longer a release candidate.
+
+```
+npm dist-tag rm --otp $2FA_CODE openzeppelin-solidity next
+```
+
+## Merging the release branch
+
+After the final release, the release branch should be merged back into `master`. This merge must not be squashed because it would lose the tagged release commit. Since the GitHub repo is set up to only allow squashed merges, the merge should be done locally and pushed.
+
+Make sure to have the latest changes from `upstream` in your local release branch.
+
+```
+git checkout release-vX.Y.Z
+git pull upstream
+```
+
+```
+git checkout master
+git merge --no-ff release-vX.Y.Z
+git push upstream master
+```
+
+The release branch can then be deleted on GitHub.

contracts/ARCHITECTURE.md

@@ -0,0 +1,27 @@
+## Architecture
+
+The following provides visibility into how OpenZeppelin's contracts are organized:
+
+- **access** - Smart contracts that enable functionality that can be used for selective restrictions and basic authorization control functions.
+- **crowdsale** - A collection of smart contracts used to manage token crowdsales that allow investors to purchase tokens with ETH. Includes a base contract which implements fundamental crowdsale functionality in its simplest form. The base contract can be extended in order to satisfy your crowdsale’s specific requirements.
+	- **distribution** - Includes extensions of the base crowdsale contract which can be used to customize the completion of a crowdsale.
+	- **emission** - Includes extensions of the base crowdsale contract which can be used to mint and manage how tokens are issued to purchasers.
+	- **price** - Includes extensions of the crowdsale contract that can be used to manage changes in token prices.
+	- **validation**  - Includes extensions of the crowdsale contract that can be used to enforce restraints and limit access to token purchases.
+- **examples** - A collection of simple smart contracts that demonstrate how to add new features to base contracts through multiple inheritance.
+- **introspection**  - An interface that can be used to make a contract comply with the ERC-165 standard as well as a contract that implements ERC-165 using a lookup table.
+- **lifecycle** - A collection of base contracts used to manage the existence and behavior of your contracts and their funds.
+- **math** - Libraries with safety checks on operations that throw on errors.
+- **mocks** - A collection of abstract contracts that are primarily used for unit testing. They also serve as good usage examples and demonstrate how to combine contracts with inheritance when developing your own custom applications.
+- **ownership** - A collection of smart contracts that can be used to manage contract and token ownership
+- **payment** - A collection of smart contracts that can be used to manage payments through escrow arrangements, withdrawals, and claims. Includes support for both single payees and multiple payees.
+- **proposals** - A collection of smart contracts that reflect community Ethereum Improvement Proposals (EIPs). These contracts are under development and standardization. They are not recommended for production, but they are useful for experimentation with pending EIP standards. Go [here](https://github.com/OpenZeppelin/openzeppelin-solidity/wiki/ERC-Process) for more information.
+
+- **token** - A collection of approved ERC standard tokens -- their interfaces and implementations.
+	- **ERC20** - A standard interface for fungible tokens:
+		- *Interfaces* - Includes the ERC-20 token standard basic interface. I.e., what the contract’s ABI can represent.
+		- *Implementations* - Includes ERC-20 token implementations that include all required and some optional ERC-20 functionality.
+	- **ERC721** - A standard interface for non-fungible tokens
+		- *Interfaces* - Includes the ERC-721 token standard basic interface. I.e., what the contract’s ABI can represent.
+		- *Implementations* - Includes ERC-721 token implementations that include all required and some optional ERC-721 functionality.
+

contracts/Bounty.sol

@@ -1,72 +0,0 @@
-pragma solidity ^0.4.21;
-
-
-import "./payment/PullPayment.sol";
-import "./lifecycle/Destructible.sol";
-
-
-/**
- * @title Bounty
- * @dev This bounty will pay out to a researcher if they break invariant logic of the contract.
- */
-contract Bounty is PullPayment, Destructible {
-  bool public claimed;
-  mapping(address => address) public researchers;
-
-  event TargetCreated(address createdAddress);
-
-  /**
-   * @dev Fallback function allowing the contract to receive funds, if they haven't already been claimed.
-   */
-  function() external payable {
-    require(!claimed);
-  }
-
-  /**
-   * @dev Create and deploy the target contract (extension of Target contract), and sets the
-   * msg.sender as a researcher
-   * @return A target contract
-   */
-  function createTarget() public returns(Target) {
-    Target target = Target(deployContract());
-    researchers[target] = msg.sender;
-    emit TargetCreated(target);
-    return target;
-  }
-
-  /**
-   * @dev Sends the contract funds to the researcher that proved the contract is broken.
-   * @param target contract
-   */
-  function claim(Target target) public {
-    address researcher = researchers[target];
-    require(researcher != 0);
-    // Check Target contract invariants
-    require(!target.checkInvariant());
-    asyncSend(researcher, address(this).balance);
-    claimed = true;
-  }
-
-  /**
-   * @dev Internal function to deploy the target contract.
-   * @return A target contract address
-   */
-  function deployContract() internal returns(address);
-
-}
-
-
-/**
- * @title Target
- * @dev Your main contract should inherit from this class and implement the checkInvariant method.
- */
-contract Target {
-
-   /**
-    * @dev Checks all values a contract assumes to be true all the time. If this function returns
-    * false, the contract is broken in some way and is in an inconsistent state.
-    * In order to win the bounty, security researchers will try to cause this broken state.
-    * @return True if all invariant values are correct, false otherwise.
-    */
-  function checkInvariant() public returns(bool);
-}

contracts/DayLimit.sol

@@ -1,75 +0,0 @@
-pragma solidity ^0.4.21;
-
-
-/**
- * @title DayLimit
- * @dev Base contract that enables methods to be protected by placing a linear limit (specifiable)
- * on a particular resource per calendar day. Is multiowned to allow the limit to be altered.
- */
-contract DayLimit {
-
-  uint256 public dailyLimit;
-  uint256 public spentToday;
-  uint256 public lastDay;
-
-  /**
-   * @dev Constructor that sets the passed value as a dailyLimit.
-   * @param _limit uint256 to represent the daily limit.
-   */
-  function DayLimit(uint256 _limit) public {
-    dailyLimit = _limit;
-    lastDay = today();
-  }
-
-  /**
-   * @dev sets the daily limit. Does not alter the amount already spent today.
-   * @param _newLimit uint256 to represent the new limit.
-   */
-  function _setDailyLimit(uint256 _newLimit) internal {
-    dailyLimit = _newLimit;
-  }
-
-  /**
-   * @dev Resets the amount already spent today.
-   */
-  function _resetSpentToday() internal {
-    spentToday = 0;
-  }
-
-  /**
-   * @dev Checks to see if there is enough resource to spend today. If true, the resource may be expended.
-   * @param _value uint256 representing the amount of resource to spend.
-   * @return A boolean that is True if the resource was spent and false otherwise.
-   */
-  function underLimit(uint256 _value) internal returns (bool) {
-    // reset the spend limit if we're on a different day to last time.
-    if (today() > lastDay) {
-      spentToday = 0;
-      lastDay = today();
-    }
-    // check to see if there's enough left - if so, subtract and return true.
-    // overflow protection                    // dailyLimit check
-    if (spentToday + _value >= spentToday && spentToday + _value <= dailyLimit) {
-      spentToday += _value;
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * @dev Private function to determine today's index
-   * @return uint256 of today's index.
-   */
-  function today() private view returns (uint256) {
-    // solium-disable-next-line security/no-block-members
-    return block.timestamp / 1 days;
-  }
-
-  /**
-   * @dev Simple modifier for daily limit.
-   */
-  modifier limitedDaily(uint256 _value) {
-    require(underLimit(_value));
-    _;
-  }
-}

contracts/LimitBalance.sol

@@ -1,31 +0,0 @@
-pragma solidity ^0.4.21;
-
-
-/**
- * @title LimitBalance
- * @dev Simple contract to limit the balance of child contract.
- * @dev Note this doesn't prevent other contracts to send funds by using selfdestruct(address);
- * @dev See: https://github.com/ConsenSys/smart-contract-best-practices#remember-that-ether-can-be-forcibly-sent-to-an-account
- */
-contract LimitBalance {
-
-  uint256 public limit;
-
-  /**
-   * @dev Constructor that sets the passed value as a limit.
-   * @param _limit uint256 to represent the limit.
-   */
-  function LimitBalance(uint256 _limit) public {
-    limit = _limit;
-  }
-
-  /**
-   * @dev Checks if limit was reached. Case true, it throws.
-   */
-  modifier limitedPayable() {
-    require(address(this).balance <= limit);
-    _;
-
-  }
-
-}

contracts/MerkleProof.sol

@@ -1,35 +0,0 @@
-pragma solidity ^0.4.21;
-
-
-/*
- * @title MerkleProof
- * @dev Merkle proof verification
- * @note Based on https://github.com/ameensol/merkle-tree-solidity/blob/master/src/MerkleProof.sol
- */
-library MerkleProof {
-  /*
-   * @dev Verifies a Merkle proof proving the existence of a leaf in a Merkle tree. Assumes that each pair of leaves
-   * and each pair of pre-images is sorted.
-   * @param _proof Merkle proof containing sibling hashes on the branch from the leaf to the root of the Merkle tree
-   * @param _root Merkle root
-   * @param _leaf Leaf of Merkle tree
-   */
-  function verifyProof(bytes32[] _proof, bytes32 _root, bytes32 _leaf) internal pure returns (bool) {
-    bytes32 computedHash = _leaf;
-
-    for (uint256 i = 0; i < _proof.length; i++) {
-      bytes32 proofElement = _proof[i];
-
-      if (computedHash < proofElement) {
-        // Hash(current computed hash + current element of the proof)
-        computedHash = keccak256(computedHash, proofElement);
-      } else {
-        // Hash(current element of the proof + current computed hash)
-        computedHash = keccak256(proofElement, computedHash);
-      }
-    }
-
-    // Check if the computed hash (root) is equal to the provided root
-    return computedHash == _root;
-  }
-}

contracts/ReentrancyGuard.sol

@@ -1,32 +0,0 @@
-pragma solidity ^0.4.21;
-
-
-/**
- * @title Helps contracts guard agains reentrancy attacks.
- * @author Remco Bloemen <remco@2π.com>
- * @notice If you mark a function `nonReentrant`, you should also
- * mark it `external`.
- */
-contract ReentrancyGuard {
-
-  /**
-   * @dev We use a single lock for the whole contract.
-   */
-  bool private reentrancyLock = false;
-
-  /**
-   * @dev Prevents a contract from calling itself, directly or indirectly.
-   * @notice If you mark a function `nonReentrant`, you should also
-   * mark it `external`. Calling one nonReentrant function from
-   * another is not supported. Instead, you can implement a
-   * `private` function doing the actual work, and a `external`
-   * wrapper marked as `nonReentrant`.
-   */
-  modifier nonReentrant() {
-    require(!reentrancyLock);
-    reentrancyLock = true;
-    _;
-    reentrancyLock = false;
-  }
-
-}

contracts/access/Roles.sol

@@ -0,0 +1,44 @@
+pragma solidity ^0.4.24;
+
+/**
+ * @title Roles
+ * @dev Library for managing addresses assigned to a Role.
+ */
+library Roles {
+  struct Role {
+    mapping (address => bool) bearer;
+  }
+
+  /**
+   * @dev give an account access to this role
+   */
+  function add(Role storage role, address account) internal {
+    require(account != address(0));
+    require(!has(role, account));
+
+    role.bearer[account] = true;
+  }
+
+  /**
+   * @dev remove an account's access to this role
+   */
+  function remove(Role storage role, address account) internal {
+    require(account != address(0));
+    require(has(role, account));
+
+    role.bearer[account] = false;
+  }
+
+  /**
+   * @dev check if an account has this role
+   * @return bool
+   */
+  function has(Role storage role, address account)
+    internal
+    view
+    returns (bool)
+  {
+    require(account != address(0));
+    return role.bearer[account];
+  }
+}

contracts/access/SignatureBouncer.sol

@@ -1,90 +0,0 @@
-pragma solidity ^0.4.18;
-
-import "../ownership/Ownable.sol";
-import "../ownership/rbac/RBAC.sol";
-import "../ECRecovery.sol";
-
-/**
- * @title SignatureBouncer
- * @author PhABC and Shrugs
- * @dev Bouncer allows users to submit a signature as a permission to do an action.
- * @dev If the signature is from one of the authorized bouncer addresses, the signature
- * @dev is valid. The owner of the contract adds/removes bouncers.
- * @dev Bouncer addresses can be individual servers signing grants or different
- * @dev users within a decentralized club that have permission to invite other members.
- * @dev
- * @dev This technique is useful for whitelists and airdrops; instead of putting all
- * @dev valid addresses on-chain, simply sign a grant of the form
- * @dev keccak256(`:contractAddress` + `:granteeAddress`) using a valid bouncer address.
- * @dev Then restrict access to your crowdsale/whitelist/airdrop using the
- * @dev `onlyValidSignature` modifier (or implement your own using isValidSignature).
- * @dev
- * @dev See the tests Bouncer.test.js for specific usage examples.
- */
-contract SignatureBouncer is Ownable, RBAC {
-  using ECRecovery for bytes32;
-
-  string public constant ROLE_BOUNCER = "bouncer";
-
-  /**
-   * @dev requires that a valid signature of a bouncer was provided
-   */
-  modifier onlyValidSignature(bytes _sig)
-  {
-    require(isValidSignature(msg.sender, _sig));
-    _;
-  }
-
-  /**
-   * @dev allows the owner to add additional bouncer addresses
-   */
-  function addBouncer(address _bouncer)
-    onlyOwner
-    public
-  {
-    require(_bouncer != address(0));
-    addRole(_bouncer, ROLE_BOUNCER);
-  }
-
-  /**
-   * @dev allows the owner to remove bouncer addresses
-   */
-  function removeBouncer(address _bouncer)
-    onlyOwner
-    public
-  {
-    require(_bouncer != address(0));
-    removeRole(_bouncer, ROLE_BOUNCER);
-  }
-
-  /**
-   * @dev is the signature of `this + sender` from a bouncer?
-   * @return bool
-   */
-  function isValidSignature(address _address, bytes _sig)
-    internal
-    view
-    returns (bool)
-  {
-    return isValidDataHash(
-      keccak256(address(this), _address),
-      _sig
-    );
-  }
-
-  /**
-   * @dev internal function to convert a hash to an eth signed message
-   * @dev and then recover the signature and check it against the bouncer role
-   * @return bool
-   */
-  function isValidDataHash(bytes32 hash, bytes _sig)
-    internal
-    view
-    returns (bool)
-  {
-    address signer = hash
-      .toEthSignedMessageHash()
-      .recover(_sig);
-    return hasRole(signer, ROLE_BOUNCER);
-  }
-}

contracts/access/roles/CapperRole.sol

@@ -0,0 +1,43 @@
+pragma solidity ^0.4.24;
+
+import "../Roles.sol";
+
+contract CapperRole {
+  using Roles for Roles.Role;
+
+  event CapperAdded(address indexed account);
+  event CapperRemoved(address indexed account);
+
+  Roles.Role private cappers;
+
+  constructor() internal {
+    _addCapper(msg.sender);
+  }
+
+  modifier onlyCapper() {
+    require(isCapper(msg.sender));
+    _;
+  }
+
+  function isCapper(address account) public view returns (bool) {
+    return cappers.has(account);
+  }
+
+  function addCapper(address account) public onlyCapper {
+    _addCapper(account);
+  }
+
+  function renounceCapper() public {
+    _removeCapper(msg.sender);
+  }
+
+  function _addCapper(address account) internal {
+    cappers.add(account);
+    emit CapperAdded(account);
+  }
+
+  function _removeCapper(address account) internal {
+    cappers.remove(account);
+    emit CapperRemoved(account);
+  }
+}

contracts/access/roles/MinterRole.sol

@@ -0,0 +1,43 @@
+pragma solidity ^0.4.24;
+
+import "../Roles.sol";
+
+contract MinterRole {
+  using Roles for Roles.Role;
+
+  event MinterAdded(address indexed account);
+  event MinterRemoved(address indexed account);
+
+  Roles.Role private minters;
+
+  constructor() internal {
+    _addMinter(msg.sender);
+  }
+
+  modifier onlyMinter() {
+    require(isMinter(msg.sender));
+    _;
+  }
+
+  function isMinter(address account) public view returns (bool) {
+    return minters.has(account);
+  }
+
+  function addMinter(address account) public onlyMinter {
+    _addMinter(account);
+  }
+
+  function renounceMinter() public {
+    _removeMinter(msg.sender);
+  }
+
+  function _addMinter(address account) internal {
+    minters.add(account);
+    emit MinterAdded(account);
+  }
+
+  function _removeMinter(address account) internal {
+    minters.remove(account);
+    emit MinterRemoved(account);
+  }
+}

contracts/access/roles/PauserRole.sol

@@ -0,0 +1,43 @@
+pragma solidity ^0.4.24;
+
+import "../Roles.sol";
+
+contract PauserRole {
+  using Roles for Roles.Role;
+
+  event PauserAdded(address indexed account);
+  event PauserRemoved(address indexed account);
+
+  Roles.Role private pausers;
+
+  constructor() internal {
+    _addPauser(msg.sender);
+  }
+
+  modifier onlyPauser() {
+    require(isPauser(msg.sender));
+    _;
+  }
+
+  function isPauser(address account) public view returns (bool) {
+    return pausers.has(account);
+  }
+
+  function addPauser(address account) public onlyPauser {
+    _addPauser(account);
+  }
+
+  function renouncePauser() public {
+    _removePauser(msg.sender);
+  }
+
+  function _addPauser(address account) internal {
+    pausers.add(account);
+    emit PauserAdded(account);
+  }
+
+  function _removePauser(address account) internal {
+    pausers.remove(account);
+    emit PauserRemoved(account);
+  }
+}

contracts/access/roles/SignerRole.sol

@@ -0,0 +1,43 @@
+pragma solidity ^0.4.24;
+
+import "../Roles.sol";
+
+contract SignerRole {
+  using Roles for Roles.Role;
+
+  event SignerAdded(address indexed account);
+  event SignerRemoved(address indexed account);
+
+  Roles.Role private signers;
+
+  constructor() internal {
+    _addSigner(msg.sender);
+  }
+
+  modifier onlySigner() {
+    require(isSigner(msg.sender));
+    _;
+  }
+
+  function isSigner(address account) public view returns (bool) {
+    return signers.has(account);
+  }
+
+  function addSigner(address account) public onlySigner {
+    _addSigner(account);
+  }
+
+  function renounceSigner() public {
+    _removeSigner(msg.sender);
+  }
+
+  function _addSigner(address account) internal {
+    signers.add(account);
+    emit SignerAdded(account);
+  }
+
+  function _removeSigner(address account) internal {
+    signers.remove(account);
+    emit SignerRemoved(account);
+  }
+}

contracts/crowdsale/Crowdsale.sol

@@ -1,8 +1,9 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
-import "../token/ERC20/ERC20.sol";
+import "../token/ERC20/IERC20.sol";
 import "../math/SafeMath.sol";
-
+import "../token/ERC20/SafeERC20.sol";
+import "../utils/ReentrancyGuard.sol";
 
 /**
  * @title Crowdsale
@@ -11,25 +12,29 @@ import "../math/SafeMath.sol";
  * such functionality in its most fundamental form and can be extended to provide additional
  * functionality and/or custom behavior.
  * The external interface represents the basic interface for purchasing tokens, and conform
- * the base architecture for crowdsales. They are *not* intended to be modified / overriden.
+ * the base architecture for crowdsales. They are *not* intended to be modified / overridden.
  * The internal interface conforms the extensible and modifiable surface of crowdsales. Override
- * the methods to add functionality. Consider using 'super' where appropiate to concatenate
+ * the methods to add functionality. Consider using 'super' where appropriate to concatenate
  * behavior.
  */
-contract Crowdsale {
+contract Crowdsale is ReentrancyGuard {
   using SafeMath for uint256;
+  using SafeERC20 for IERC20;
 
   // The token being sold
-  ERC20 public token;
+  IERC20 private _token;
 
   // Address where funds are collected
-  address public wallet;
+  address private _wallet;
 
-  // How many token units a buyer gets per wei
-  uint256 public rate;
+  // How many token units a buyer gets per wei.
+  // The rate is the conversion between wei and the smallest and indivisible token unit.
+  // So, if you are using a rate of 1 with a ERC20Detailed token with 3 decimals called TOK
+  // 1 wei will give you 1 unit, or 0.001 TOK.
+  uint256 private _rate;
 
   // Amount of wei raised
-  uint256 public weiRaised;
+  uint256 private _weiRaised;
 
   /**
    * Event for token purchase logging
@@ -38,21 +43,29 @@ contract Crowdsale {
    * @param value weis paid for purchase
    * @param amount amount of tokens purchased
    */
-  event TokenPurchase(address indexed purchaser, address indexed beneficiary, uint256 value, uint256 amount);
+  event TokensPurchased(
+    address indexed purchaser,
+    address indexed beneficiary,
+    uint256 value,
+    uint256 amount
+  );
 
   /**
-   * @param _rate Number of token units a buyer gets per wei
-   * @param _wallet Address where collected funds will be forwarded to
-   * @param _token Address of the token being sold
+   * @param rate Number of token units a buyer gets per wei
+   * @dev The rate is the conversion between wei and the smallest and indivisible
+   * token unit. So, if you are using a rate of 1 with a ERC20Detailed token
+   * with 3 decimals called TOK, 1 wei will give you 1 unit, or 0.001 TOK.
+   * @param wallet Address where collected funds will be forwarded to
+   * @param token Address of the token being sold
    */
-  function Crowdsale(uint256 _rate, address _wallet, ERC20 _token) public {
-    require(_rate > 0);
-    require(_wallet != address(0));
-    require(_token != address(0));
+  constructor(uint256 rate, address wallet, IERC20 token) internal {
+    require(rate > 0);
+    require(wallet != address(0));
+    require(token != address(0));
 
-    rate = _rate;
-    wallet = _wallet;
-    token = _token;
+    _rate = rate;
+    _wallet = wallet;
+    _token = token;
   }
 
   // -----------------------------------------
@@ -61,38 +74,71 @@ contract Crowdsale {
 
   /**
    * @dev fallback function ***DO NOT OVERRIDE***
+   * Note that other contracts will transfer fund with a base gas stipend
+   * of 2300, which is not enough to call buyTokens. Consider calling
+   * buyTokens directly when purchasing tokens from a contract.
    */
   function () external payable {
     buyTokens(msg.sender);
   }
 
   /**
-   * @dev low level token purchase ***DO NOT OVERRIDE***
-   * @param _beneficiary Address performing the token purchase
+   * @return the token being sold.
    */
-  function buyTokens(address _beneficiary) public payable {
+  function token() public view returns(IERC20) {
+    return _token;
+  }
+
+  /**
+   * @return the address where funds are collected.
+   */
+  function wallet() public view returns(address) {
+    return _wallet;
+  }
+
+  /**
+   * @return the number of token units a buyer gets per wei.
+   */
+  function rate() public view returns(uint256) {
+    return _rate;
+  }
+
+  /**
+   * @return the amount of wei raised.
+   */
+  function weiRaised() public view returns (uint256) {
+    return _weiRaised;
+  }
+
+  /**
+   * @dev low level token purchase ***DO NOT OVERRIDE***
+   * This function has a non-reentrancy guard, so it shouldn't be called by
+   * another `nonReentrant` function.
+   * @param beneficiary Recipient of the token purchase
+   */
+  function buyTokens(address beneficiary) public nonReentrant payable {
 
     uint256 weiAmount = msg.value;
-    _preValidatePurchase(_beneficiary, weiAmount);
+    _preValidatePurchase(beneficiary, weiAmount);
 
     // calculate token amount to be created
     uint256 tokens = _getTokenAmount(weiAmount);
 
     // update state
-    weiRaised = weiRaised.add(weiAmount);
+    _weiRaised = _weiRaised.add(weiAmount);
 
-    _processPurchase(_beneficiary, tokens);
-    emit TokenPurchase(
+    _processPurchase(beneficiary, tokens);
+    emit TokensPurchased(
       msg.sender,
-      _beneficiary,
+      beneficiary,
       weiAmount,
       tokens
     );
 
-    _updatePurchasingState(_beneficiary, weiAmount);
+    _updatePurchasingState(beneficiary, weiAmount);
 
     _forwardFunds();
-    _postValidatePurchase(_beneficiary, weiAmount);
+    _postValidatePurchase(beneficiary, weiAmount);
   }
 
   // -----------------------------------------
@@ -100,64 +146,96 @@ contract Crowdsale {
   // -----------------------------------------
 
   /**
-   * @dev Validation of an incoming purchase. Use require statements to revert state when conditions are not met. Use super to concatenate validations.
-   * @param _beneficiary Address performing the token purchase
-   * @param _weiAmount Value in wei involved in the purchase
+   * @dev Validation of an incoming purchase. Use require statements to revert state when conditions are not met. Use `super` in contracts that inherit from Crowdsale to extend their validations.
+   * Example from CappedCrowdsale.sol's _preValidatePurchase method:
+   *   super._preValidatePurchase(beneficiary, weiAmount);
+   *   require(weiRaised().add(weiAmount) <= cap);
+   * @param beneficiary Address performing the token purchase
+   * @param weiAmount Value in wei involved in the purchase
    */
-  function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal {
-    require(_beneficiary != address(0));
-    require(_weiAmount != 0);
+  function _preValidatePurchase(
+    address beneficiary,
+    uint256 weiAmount
+  )
+    internal
+    view
+  {
+    require(beneficiary != address(0));
+    require(weiAmount != 0);
   }
 
   /**
    * @dev Validation of an executed purchase. Observe state and use revert statements to undo rollback when valid conditions are not met.
-   * @param _beneficiary Address performing the token purchase
-   * @param _weiAmount Value in wei involved in the purchase
+   * @param beneficiary Address performing the token purchase
+   * @param weiAmount Value in wei involved in the purchase
    */
-  function _postValidatePurchase(address _beneficiary, uint256 _weiAmount) internal {
+  function _postValidatePurchase(
+    address beneficiary,
+    uint256 weiAmount
+  )
+    internal
+    view
+  {
     // optional override
   }
 
   /**
    * @dev Source of tokens. Override this method to modify the way in which the crowdsale ultimately gets and sends its tokens.
-   * @param _beneficiary Address performing the token purchase
-   * @param _tokenAmount Number of tokens to be emitted
+   * @param beneficiary Address performing the token purchase
+   * @param tokenAmount Number of tokens to be emitted
    */
-  function _deliverTokens(address _beneficiary, uint256 _tokenAmount) internal {
-    token.transfer(_beneficiary, _tokenAmount);
+  function _deliverTokens(
+    address beneficiary,
+    uint256 tokenAmount
+  )
+    internal
+  {
+    _token.safeTransfer(beneficiary, tokenAmount);
   }
 
   /**
-   * @dev Executed when a purchase has been validated and is ready to be executed. Not necessarily emits/sends tokens.
-   * @param _beneficiary Address receiving the tokens
-   * @param _tokenAmount Number of tokens to be purchased
+   * @dev Executed when a purchase has been validated and is ready to be executed. Doesn't necessarily emit/send tokens.
+   * @param beneficiary Address receiving the tokens
+   * @param tokenAmount Number of tokens to be purchased
    */
-  function _processPurchase(address _beneficiary, uint256 _tokenAmount) internal {
-    _deliverTokens(_beneficiary, _tokenAmount);
+  function _processPurchase(
+    address beneficiary,
+    uint256 tokenAmount
+  )
+    internal
+  {
+    _deliverTokens(beneficiary, tokenAmount);
   }
 
   /**
    * @dev Override for extensions that require an internal state to check for validity (current user contributions, etc.)
-   * @param _beneficiary Address receiving the tokens
-   * @param _weiAmount Value in wei involved in the purchase
+   * @param beneficiary Address receiving the tokens
+   * @param weiAmount Value in wei involved in the purchase
    */
-  function _updatePurchasingState(address _beneficiary, uint256 _weiAmount) internal {
+  function _updatePurchasingState(
+    address beneficiary,
+    uint256 weiAmount
+  )
+    internal
+  {
     // optional override
   }
 
   /**
    * @dev Override to extend the way in which ether is converted to tokens.
-   * @param _weiAmount Value in wei to be converted into tokens
+   * @param weiAmount Value in wei to be converted into tokens
    * @return Number of tokens that can be purchased with the specified _weiAmount
    */
-  function _getTokenAmount(uint256 _weiAmount) internal view returns (uint256) {
-    return _weiAmount.mul(rate);
+  function _getTokenAmount(uint256 weiAmount)
+    internal view returns (uint256)
+  {
+    return weiAmount.mul(_rate);
   }
 
   /**
    * @dev Determines how ETH is stored/forwarded on purchases.
    */
   function _forwardFunds() internal {
-    wallet.transfer(msg.value);
+    _wallet.transfer(msg.value);
   }
 }

contracts/crowdsale/distribution/FinalizableCrowdsale.sol

@@ -1,42 +1,50 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
 import "../../math/SafeMath.sol";
-import "../../ownership/Ownable.sol";
 import "../validation/TimedCrowdsale.sol";
 
-
 /**
  * @title FinalizableCrowdsale
- * @dev Extension of Crowdsale where an owner can do extra work
- * after finishing.
+ * @dev Extension of Crowdsale with a one-off finalization action, where one
+ * can do extra work after finishing.
  */
-contract FinalizableCrowdsale is TimedCrowdsale, Ownable {
+contract FinalizableCrowdsale is TimedCrowdsale {
   using SafeMath for uint256;
 
-  bool public isFinalized = false;
+  bool private _finalized;
 
-  event Finalized();
+  event CrowdsaleFinalized();
+
+  constructor() internal {
+    _finalized = false;
+  }
+
+  /**
+   * @return true if the crowdsale is finalized, false otherwise.
+   */
+  function finalized() public view returns (bool) {
+    return _finalized;
+  }
 
   /**
    * @dev Must be called after crowdsale ends, to do some extra finalization
    * work. Calls the contract's finalization function.
    */
-  function finalize() onlyOwner public {
-    require(!isFinalized);
+  function finalize() public {
+    require(!_finalized);
     require(hasClosed());
 
-    finalization();
-    emit Finalized();
+    _finalized = true;
 
-    isFinalized = true;
+    _finalization();
+    emit CrowdsaleFinalized();
   }
 
   /**
    * @dev Can be overridden to add finalization logic. The overriding function
-   * should call super.finalization() to ensure the chain of finalization is
+   * should call super._finalization() to ensure the chain of finalization is
    * executed entirely.
    */
-  function finalization() internal {
+  function _finalization() internal {
   }
-
 }

contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol

@@ -1,10 +1,8 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
 import "../validation/TimedCrowdsale.sol";
-import "../../token/ERC20/ERC20.sol";
 import "../../math/SafeMath.sol";
 
-
 /**
  * @title PostDeliveryCrowdsale
  * @dev Crowdsale that locks tokens from withdrawal until it ends.
@@ -12,26 +10,41 @@ import "../../math/SafeMath.sol";
 contract PostDeliveryCrowdsale is TimedCrowdsale {
   using SafeMath for uint256;
 
-  mapping(address => uint256) public balances;
+  mapping(address => uint256) private _balances;
+
+  constructor() internal {}
 
   /**
    * @dev Withdraw tokens only after crowdsale ends.
+   * @param beneficiary Whose tokens will be withdrawn.
    */
-  function withdrawTokens() public {
+  function withdrawTokens(address beneficiary) public {
     require(hasClosed());
-    uint256 amount = balances[msg.sender];
+    uint256 amount = _balances[beneficiary];
     require(amount > 0);
-    balances[msg.sender] = 0;
-    _deliverTokens(msg.sender, amount);
+    _balances[beneficiary] = 0;
+    _deliverTokens(beneficiary, amount);
+  }
+
+  /**
+   * @return the balance of an account.
+   */
+  function balanceOf(address account) public view returns(uint256) {
+    return _balances[account];
   }
 
   /**
    * @dev Overrides parent by storing balances instead of issuing tokens right away.
-   * @param _beneficiary Token purchaser
-   * @param _tokenAmount Amount of tokens purchased
+   * @param beneficiary Token purchaser
+   * @param tokenAmount Amount of tokens purchased
    */
-  function _processPurchase(address _beneficiary, uint256 _tokenAmount) internal {
-    balances[_beneficiary] = balances[_beneficiary].add(_tokenAmount);
+  function _processPurchase(
+    address beneficiary,
+    uint256 tokenAmount
+  )
+    internal
+  {
+    _balances[beneficiary] = _balances[beneficiary].add(tokenAmount);
   }
 
 }

contracts/crowdsale/distribution/RefundableCrowdsale.sol

@@ -1,44 +1,62 @@
-pragma solidity ^0.4.21;
-
+pragma solidity ^0.4.24;
 
 import "../../math/SafeMath.sol";
 import "./FinalizableCrowdsale.sol";
-import "./utils/RefundVault.sol";
-
+import "../../payment/escrow/RefundEscrow.sol";
 
 /**
  * @title RefundableCrowdsale
  * @dev Extension of Crowdsale contract that adds a funding goal, and
  * the possibility of users getting a refund if goal is not met.
- * Uses a RefundVault as the crowdsale's vault.
+ * WARNING: note that if you allow tokens to be traded before the goal 
+ * is met, then an attack is possible in which the attacker purchases 
+ * tokens from the crowdsale and when they sees that the goal is 
+ * unlikely to be met, they sell their tokens (possibly at a discount).
+ * The attacker will be refunded when the crowdsale is finalized, and
+ * the users that purchased from them will be left with worthless 
+ * tokens. There are many possible ways to avoid this, like making the
+ * the crowdsale inherit from PostDeliveryCrowdsale, or imposing 
+ * restrictions on token trading until the crowdsale is finalized.
+ * This is being discussed in 
+ * https://github.com/OpenZeppelin/openzeppelin-solidity/issues/877
+ * This contract will be updated when we agree on a general solution
+ * for this problem.
  */
 contract RefundableCrowdsale is FinalizableCrowdsale {
   using SafeMath for uint256;
 
   // minimum amount of funds to be raised in weis
-  uint256 public goal;
+  uint256 private _goal;
 
-  // refund vault used to hold funds while crowdsale is running
-  RefundVault public vault;
+  // refund escrow used to hold funds while crowdsale is running
+  RefundEscrow private _escrow;
 
   /**
-   * @dev Constructor, creates RefundVault.
-   * @param _goal Funding goal
+   * @dev Constructor, creates RefundEscrow.
+   * @param goal Funding goal
    */
-  function RefundableCrowdsale(uint256 _goal) public {
-    require(_goal > 0);
-    vault = new RefundVault(wallet);
-    goal = _goal;
+  constructor(uint256 goal) internal {
+    require(goal > 0);
+    _escrow = new RefundEscrow(wallet());
+    _goal = goal;
+  }
+
+  /**
+   * @return minimum amount of funds to be raised in wei.
+   */
+  function goal() public view returns(uint256) {
+    return _goal;
   }
 
   /**
    * @dev Investors can claim refunds here if crowdsale is unsuccessful
+   * @param beneficiary Whose refund will be claimed.
    */
-  function claimRefund() public {
-    require(isFinalized);
+  function claimRefund(address beneficiary) public {
+    require(finalized());
     require(!goalReached());
 
-    vault.refund(msg.sender);
+    _escrow.withdraw(beneficiary);
   }
 
   /**
@@ -46,27 +64,28 @@ contract RefundableCrowdsale is FinalizableCrowdsale {
    * @return Whether funding goal was reached
    */
   function goalReached() public view returns (bool) {
-    return weiRaised >= goal;
+    return weiRaised() >= _goal;
   }
 
   /**
-   * @dev vault finalization task, called when owner calls finalize()
+   * @dev escrow finalization task, called when finalize() is called
    */
-  function finalization() internal {
+  function _finalization() internal {
     if (goalReached()) {
-      vault.close();
+      _escrow.close();
+      _escrow.beneficiaryWithdraw();
     } else {
-      vault.enableRefunds();
+      _escrow.enableRefunds();
     }
 
-    super.finalization();
+    super._finalization();
   }
 
   /**
-   * @dev Overrides Crowdsale fund forwarding, sending funds to vault.
+   * @dev Overrides Crowdsale fund forwarding, sending funds to escrow.
    */
   function _forwardFunds() internal {
-    vault.deposit.value(msg.value)(msg.sender);
+    _escrow.deposit.value(msg.value)(msg.sender);
   }
 
 }

contracts/crowdsale/distribution/utils/RefundVault.sol

@@ -1,66 +0,0 @@
-pragma solidity ^0.4.21;
-
-import "../../../math/SafeMath.sol";
-import "../../../ownership/Ownable.sol";
-
-
-/**
- * @title RefundVault
- * @dev This contract is used for storing funds while a crowdsale
- * is in progress. Supports refunding the money if crowdsale fails,
- * and forwarding it if crowdsale is successful.
- */
-contract RefundVault is Ownable {
-  using SafeMath for uint256;
-
-  enum State { Active, Refunding, Closed }
-
-  mapping (address => uint256) public deposited;
-  address public wallet;
-  State public state;
-
-  event Closed();
-  event RefundsEnabled();
-  event Refunded(address indexed beneficiary, uint256 weiAmount);
-
-  /**
-   * @param _wallet Vault address
-   */
-  function RefundVault(address _wallet) public {
-    require(_wallet != address(0));
-    wallet = _wallet;
-    state = State.Active;
-  }
-
-  /**
-   * @param investor Investor address
-   */
-  function deposit(address investor) onlyOwner public payable {
-    require(state == State.Active);
-    deposited[investor] = deposited[investor].add(msg.value);
-  }
-
-  function close() onlyOwner public {
-    require(state == State.Active);
-    state = State.Closed;
-    emit Closed();
-    wallet.transfer(address(this).balance);
-  }
-
-  function enableRefunds() onlyOwner public {
-    require(state == State.Active);
-    state = State.Refunding;
-    emit RefundsEnabled();
-  }
-
-  /**
-   * @param investor Investor address
-   */
-  function refund(address investor) public {
-    require(state == State.Refunding);
-    uint256 depositedValue = deposited[investor];
-    deposited[investor] = 0;
-    investor.transfer(depositedValue);
-    emit Refunded(investor, depositedValue);
-  }
-}

contracts/crowdsale/emission/AllowanceCrowdsale.sol

@@ -1,9 +1,10 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
 import "../Crowdsale.sol";
-import "../../token/ERC20/ERC20.sol";
+import "../../token/ERC20/IERC20.sol";
+import "../../token/ERC20/SafeERC20.sol";
 import "../../math/SafeMath.sol";
-
+import "../../math/Math.sol";
 
 /**
  * @title AllowanceCrowdsale
@@ -11,16 +12,24 @@ import "../../math/SafeMath.sol";
  */
 contract AllowanceCrowdsale is Crowdsale {
   using SafeMath for uint256;
+  using SafeERC20 for IERC20;
 
-  address public tokenWallet;
+  address private _tokenWallet;
 
   /**
-   * @dev Constructor, takes token wallet address. 
-   * @param _tokenWallet Address holding the tokens, which has approved allowance to the crowdsale
+   * @dev Constructor, takes token wallet address.
+   * @param tokenWallet Address holding the tokens, which has approved allowance to the crowdsale
    */
-  function AllowanceCrowdsale(address _tokenWallet) public {
-    require(_tokenWallet != address(0));
-    tokenWallet = _tokenWallet;
+  constructor(address tokenWallet) internal {
+    require(tokenWallet != address(0));
+    _tokenWallet = tokenWallet;
+  }
+
+  /**
+   * @return the address of the wallet that will hold the tokens.
+   */
+  function tokenWallet() public view returns(address) {
+    return _tokenWallet;
   }
 
   /**
@@ -28,15 +37,23 @@ contract AllowanceCrowdsale is Crowdsale {
    * @return Amount of tokens left in the allowance
    */
   function remainingTokens() public view returns (uint256) {
-    return token.allowance(tokenWallet, this);
+    return Math.min(
+      token().balanceOf(_tokenWallet),
+      token().allowance(_tokenWallet, this)
+    );
   }
 
   /**
    * @dev Overrides parent behavior by transferring tokens from wallet.
-   * @param _beneficiary Token purchaser
-   * @param _tokenAmount Amount of tokens purchased
+   * @param beneficiary Token purchaser
+   * @param tokenAmount Amount of tokens purchased
    */
-  function _deliverTokens(address _beneficiary, uint256 _tokenAmount) internal {
-    token.transferFrom(tokenWallet, _beneficiary, _tokenAmount);
+  function _deliverTokens(
+    address beneficiary,
+    uint256 tokenAmount
+  )
+    internal
+  {
+    token().safeTransferFrom(_tokenWallet, beneficiary, tokenAmount);
   }
 }

contracts/crowdsale/emission/MintedCrowdsale.sol

@@ -1,22 +1,29 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
 import "../Crowdsale.sol";
-import "../../token/ERC20/MintableToken.sol";
-
+import "../../token/ERC20/ERC20Mintable.sol";
 
 /**
  * @title MintedCrowdsale
  * @dev Extension of Crowdsale contract whose tokens are minted in each purchase.
- * Token ownership should be transferred to MintedCrowdsale for minting. 
+ * Token ownership should be transferred to MintedCrowdsale for minting.
  */
 contract MintedCrowdsale is Crowdsale {
+  constructor() internal {}
 
   /**
    * @dev Overrides delivery by minting tokens upon purchase.
-   * @param _beneficiary Token purchaser
-   * @param _tokenAmount Number of tokens to be minted
+   * @param beneficiary Token purchaser
+   * @param tokenAmount Number of tokens to be minted
    */
-  function _deliverTokens(address _beneficiary, uint256 _tokenAmount) internal {
-    require(MintableToken(token).mint(_beneficiary, _tokenAmount));
+  function _deliverTokens(
+    address beneficiary,
+    uint256 tokenAmount
+  )
+    internal
+  {
+    // Potentially dangerous assumption about the type of the token.
+    require(
+      ERC20Mintable(address(token())).mint(beneficiary, tokenAmount));
   }
 }

contracts/crowdsale/price/IncreasingPriceCrowdsale.sol

@@ -1,9 +1,8 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
 import "../validation/TimedCrowdsale.sol";
 import "../../math/SafeMath.sol";
 
-
 /**
  * @title IncreasingPriceCrowdsale
  * @dev Extension of Crowdsale contract that increases the price of tokens linearly in time.
@@ -13,19 +12,41 @@ import "../../math/SafeMath.sol";
 contract IncreasingPriceCrowdsale is TimedCrowdsale {
   using SafeMath for uint256;
 
-  uint256 public initialRate;
-  uint256 public finalRate;
+  uint256 private _initialRate;
+  uint256 private _finalRate;
 
   /**
-   * @dev Constructor, takes intial and final rates of tokens received per wei contributed.
-   * @param _initialRate Number of tokens a buyer gets per wei at the start of the crowdsale
-   * @param _finalRate Number of tokens a buyer gets per wei at the end of the crowdsale
+   * @dev Constructor, takes initial and final rates of tokens received per wei contributed.
+   * @param initialRate Number of tokens a buyer gets per wei at the start of the crowdsale
+   * @param finalRate Number of tokens a buyer gets per wei at the end of the crowdsale
    */
-  function IncreasingPriceCrowdsale(uint256 _initialRate, uint256 _finalRate) public {
-    require(_initialRate >= _finalRate);
-    require(_finalRate > 0);
-    initialRate = _initialRate;
-    finalRate = _finalRate;
+  constructor(uint256 initialRate, uint256 finalRate) internal {
+    require(finalRate > 0);
+    require(initialRate > finalRate);
+    _initialRate = initialRate;
+    _finalRate = finalRate;
+  }
+
+  /**
+   * The base rate function is overridden to revert, since this crowdsale doens't use it, and
+   * all calls to it are a mistake.
+   */
+  function rate() public view returns(uint256) {
+    revert();
+  }
+
+  /**
+   * @return the initial rate of the crowdsale.
+   */
+  function initialRate() public view returns(uint256) {
+    return _initialRate;
+  }
+
+  /**
+   * @return the final rate of the crowdsale.
+   */
+  function finalRate() public view returns (uint256) {
+    return _finalRate;
   }
 
   /**
@@ -34,21 +55,27 @@ contract IncreasingPriceCrowdsale is TimedCrowdsale {
    * @return The number of tokens a buyer gets per wei at a given time
    */
   function getCurrentRate() public view returns (uint256) {
+    if (!isOpen()) {
+      return 0;
+    }
+
     // solium-disable-next-line security/no-block-members
-    uint256 elapsedTime = block.timestamp.sub(openingTime);
-    uint256 timeRange = closingTime.sub(openingTime);
-    uint256 rateRange = initialRate.sub(finalRate);
-    return initialRate.sub(elapsedTime.mul(rateRange).div(timeRange));
+    uint256 elapsedTime = block.timestamp.sub(openingTime());
+    uint256 timeRange = closingTime().sub(openingTime());
+    uint256 rateRange = _initialRate.sub(_finalRate);
+    return _initialRate.sub(elapsedTime.mul(rateRange).div(timeRange));
   }
 
   /**
    * @dev Overrides parent method taking into account variable rate.
-   * @param _weiAmount The value in wei to be converted into tokens
+   * @param weiAmount The value in wei to be converted into tokens
    * @return The number of tokens _weiAmount wei will buy at present time
    */
-  function _getTokenAmount(uint256 _weiAmount) internal view returns (uint256) {
+  function _getTokenAmount(uint256 weiAmount)
+    internal view returns (uint256)
+  {
     uint256 currentRate = getCurrentRate();
-    return currentRate.mul(_weiAmount);
+    return currentRate.mul(weiAmount);
   }
 
 }

contracts/crowdsale/validation/CappedCrowdsale.sol

@@ -1,9 +1,8 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
 import "../../math/SafeMath.sol";
 import "../Crowdsale.sol";
 
-
 /**
  * @title CappedCrowdsale
  * @dev Crowdsale with a limit for total contributions.
@@ -11,33 +10,46 @@ import "../Crowdsale.sol";
 contract CappedCrowdsale is Crowdsale {
   using SafeMath for uint256;
 
-  uint256 public cap;
+  uint256 private _cap;
 
   /**
    * @dev Constructor, takes maximum amount of wei accepted in the crowdsale.
-   * @param _cap Max amount of wei to be contributed
+   * @param cap Max amount of wei to be contributed
    */
-  function CappedCrowdsale(uint256 _cap) public {
-    require(_cap > 0);
-    cap = _cap;
+  constructor(uint256 cap) internal {
+    require(cap > 0);
+    _cap = cap;
   }
 
   /**
-   * @dev Checks whether the cap has been reached. 
+   * @return the cap of the crowdsale.
+   */
+  function cap() public view returns(uint256) {
+    return _cap;
+  }
+
+  /**
+   * @dev Checks whether the cap has been reached.
    * @return Whether the cap was reached
    */
   function capReached() public view returns (bool) {
-    return weiRaised >= cap;
+    return weiRaised() >= _cap;
   }
 
   /**
    * @dev Extend parent behavior requiring purchase to respect the funding cap.
-   * @param _beneficiary Token purchaser
-   * @param _weiAmount Amount of wei contributed
+   * @param beneficiary Token purchaser
+   * @param weiAmount Amount of wei contributed
    */
-  function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal {
-    super._preValidatePurchase(_beneficiary, _weiAmount);
-    require(weiRaised.add(_weiAmount) <= cap);
+  function _preValidatePurchase(
+    address beneficiary,
+    uint256 weiAmount
+  )
+    internal
+    view
+  {
+    super._preValidatePurchase(beneficiary, weiAmount);
+    require(weiRaised().add(weiAmount) <= _cap);
   }
 
 }

contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol

@@ -1,76 +1,81 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
 import "../../math/SafeMath.sol";
 import "../Crowdsale.sol";
-import "../../ownership/Ownable.sol";
-
+import "../../access/roles/CapperRole.sol";
 
 /**
  * @title IndividuallyCappedCrowdsale
- * @dev Crowdsale with per-user caps.
+ * @dev Crowdsale with per-beneficiary caps.
  */
-contract IndividuallyCappedCrowdsale is Crowdsale, Ownable {
+contract IndividuallyCappedCrowdsale is Crowdsale, CapperRole {
   using SafeMath for uint256;
 
-  mapping(address => uint256) public contributions;
-  mapping(address => uint256) public caps;
+  mapping(address => uint256) private _contributions;
+  mapping(address => uint256) private _caps;
+
+  constructor() internal {}
 
   /**
-   * @dev Sets a specific user's maximum contribution.
-   * @param _beneficiary Address to be capped
-   * @param _cap Wei limit for individual contribution
+   * @dev Sets a specific beneficiary's maximum contribution.
+   * @param beneficiary Address to be capped
+   * @param cap Wei limit for individual contribution
    */
-  function setUserCap(address _beneficiary, uint256 _cap) external onlyOwner {
-    caps[_beneficiary] = _cap;
+  function setCap(address beneficiary, uint256 cap) external onlyCapper {
+    _caps[beneficiary] = cap;
   }
 
   /**
-   * @dev Sets a group of users' maximum contribution.
-   * @param _beneficiaries List of addresses to be capped
-   * @param _cap Wei limit for individual contribution
+   * @dev Returns the cap of a specific beneficiary.
+   * @param beneficiary Address whose cap is to be checked
+   * @return Current cap for individual beneficiary
    */
-  function setGroupCap(address[] _beneficiaries, uint256 _cap) external onlyOwner {
-    for (uint256 i = 0; i < _beneficiaries.length; i++) {
-      caps[_beneficiaries[i]] = _cap;
-    }
+  function getCap(address beneficiary) public view returns (uint256) {
+    return _caps[beneficiary];
   }
 
   /**
-   * @dev Returns the cap of a specific user.
-   * @param _beneficiary Address whose cap is to be checked
-   * @return Current cap for individual user
+   * @dev Returns the amount contributed so far by a specific beneficiary.
+   * @param beneficiary Address of contributor
+   * @return Beneficiary contribution so far
    */
-  function getUserCap(address _beneficiary) public view returns (uint256) {
-    return caps[_beneficiary];
+  function getContribution(address beneficiary)
+    public view returns (uint256)
+  {
+    return _contributions[beneficiary];
   }
 
   /**
-   * @dev Returns the amount contributed so far by a sepecific user.
-   * @param _beneficiary Address of contributor
-   * @return User contribution so far
+   * @dev Extend parent behavior requiring purchase to respect the beneficiary's funding cap.
+   * @param beneficiary Token purchaser
+   * @param weiAmount Amount of wei contributed
    */
-  function getUserContribution(address _beneficiary) public view returns (uint256) {
-    return contributions[_beneficiary];
+  function _preValidatePurchase(
+    address beneficiary,
+    uint256 weiAmount
+  )
+    internal
+    view
+  {
+    super._preValidatePurchase(beneficiary, weiAmount);
+    require(
+      _contributions[beneficiary].add(weiAmount) <= _caps[beneficiary]);
   }
 
   /**
-   * @dev Extend parent behavior requiring purchase to respect the user's funding cap.
-   * @param _beneficiary Token purchaser
-   * @param _weiAmount Amount of wei contributed
+   * @dev Extend parent behavior to update beneficiary contributions
+   * @param beneficiary Token purchaser
+   * @param weiAmount Amount of wei contributed
    */
-  function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal {
-    super._preValidatePurchase(_beneficiary, _weiAmount);
-    require(contributions[_beneficiary].add(_weiAmount) <= caps[_beneficiary]);
-  }
-
-  /**
-   * @dev Extend parent behavior to update user contributions
-   * @param _beneficiary Token purchaser
-   * @param _weiAmount Amount of wei contributed
-   */
-  function _updatePurchasingState(address _beneficiary, uint256 _weiAmount) internal {
-    super._updatePurchasingState(_beneficiary, _weiAmount);
-    contributions[_beneficiary] = contributions[_beneficiary].add(_weiAmount);
+  function _updatePurchasingState(
+    address beneficiary,
+    uint256 weiAmount
+  )
+    internal
+  {
+    super._updatePurchasingState(beneficiary, weiAmount);
+    _contributions[beneficiary] = _contributions[beneficiary].add(
+      weiAmount);
   }
 
 }

contracts/crowdsale/validation/TimedCrowdsale.sol

@@ -1,9 +1,8 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
 import "../../math/SafeMath.sol";
 import "../Crowdsale.sol";
 
-
 /**
  * @title TimedCrowdsale
  * @dev Crowdsale accepting contributions only within a time frame.
@@ -11,30 +10,51 @@ import "../Crowdsale.sol";
 contract TimedCrowdsale is Crowdsale {
   using SafeMath for uint256;
 
-  uint256 public openingTime;
-  uint256 public closingTime;
+  uint256 private _openingTime;
+  uint256 private _closingTime;
 
   /**
    * @dev Reverts if not in crowdsale time range.
    */
   modifier onlyWhileOpen {
-    // solium-disable-next-line security/no-block-members
-    require(block.timestamp >= openingTime && block.timestamp <= closingTime);
+    require(isOpen());
     _;
   }
 
   /**
    * @dev Constructor, takes crowdsale opening and closing times.
-   * @param _openingTime Crowdsale opening time
-   * @param _closingTime Crowdsale closing time
+   * @param openingTime Crowdsale opening time
+   * @param closingTime Crowdsale closing time
    */
-  function TimedCrowdsale(uint256 _openingTime, uint256 _closingTime) public {
+  constructor(uint256 openingTime, uint256 closingTime) internal {
     // solium-disable-next-line security/no-block-members
-    require(_openingTime >= block.timestamp);
-    require(_closingTime >= _openingTime);
+    require(openingTime >= block.timestamp);
+    require(closingTime > openingTime);
 
-    openingTime = _openingTime;
-    closingTime = _closingTime;
+    _openingTime = openingTime;
+    _closingTime = closingTime;
+  }
+
+  /**
+   * @return the crowdsale opening time.
+   */
+  function openingTime() public view returns(uint256) {
+    return _openingTime;
+  }
+
+  /**
+   * @return the crowdsale closing time.
+   */
+  function closingTime() public view returns(uint256) {
+    return _closingTime;
+  }
+
+  /**
+   * @return true if the crowdsale is open, false otherwise.
+   */
+  function isOpen() public view returns (bool) {
+    // solium-disable-next-line security/no-block-members
+    return block.timestamp >= _openingTime && block.timestamp <= _closingTime;
   }
 
   /**
@@ -43,16 +63,23 @@ contract TimedCrowdsale is Crowdsale {
    */
   function hasClosed() public view returns (bool) {
     // solium-disable-next-line security/no-block-members
-    return block.timestamp > closingTime;
+    return block.timestamp > _closingTime;
   }
 
   /**
    * @dev Extend parent behavior requiring to be within contributing period
-   * @param _beneficiary Token purchaser
-   * @param _weiAmount Amount of wei contributed
+   * @param beneficiary Token purchaser
+   * @param weiAmount Amount of wei contributed
    */
-  function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal onlyWhileOpen {
-    super._preValidatePurchase(_beneficiary, _weiAmount);
+  function _preValidatePurchase(
+    address beneficiary,
+    uint256 weiAmount
+  )
+    internal
+    onlyWhileOpen
+    view
+  {
+    super._preValidatePurchase(beneficiary, weiAmount);
   }
 
 }

contracts/crowdsale/validation/WhitelistedCrowdsale.sol

@@ -1,58 +0,0 @@
-pragma solidity ^0.4.21;
-
-import "../Crowdsale.sol";
-import "../../ownership/Ownable.sol";
-
-
-/**
- * @title WhitelistedCrowdsale
- * @dev Crowdsale in which only whitelisted users can contribute.
- */
-contract WhitelistedCrowdsale is Crowdsale, Ownable {
-
-  mapping(address => bool) public whitelist;
-
-  /**
-   * @dev Reverts if beneficiary is not whitelisted. Can be used when extending this contract.
-   */
-  modifier isWhitelisted(address _beneficiary) {
-    require(whitelist[_beneficiary]);
-    _;
-  }
-
-  /**
-   * @dev Adds single address to whitelist.
-   * @param _beneficiary Address to be added to the whitelist
-   */
-  function addToWhitelist(address _beneficiary) external onlyOwner {
-    whitelist[_beneficiary] = true;
-  }
-
-  /**
-   * @dev Adds list of addresses to whitelist. Not overloaded due to limitations with truffle testing.
-   * @param _beneficiaries Addresses to be added to the whitelist
-   */
-  function addManyToWhitelist(address[] _beneficiaries) external onlyOwner {
-    for (uint256 i = 0; i < _beneficiaries.length; i++) {
-      whitelist[_beneficiaries[i]] = true;
-    }
-  }
-
-  /**
-   * @dev Removes single address from whitelist.
-   * @param _beneficiary Address to be removed to the whitelist
-   */
-  function removeFromWhitelist(address _beneficiary) external onlyOwner {
-    whitelist[_beneficiary] = false;
-  }
-
-  /**
-   * @dev Extend parent behavior requiring beneficiary to be in whitelist.
-   * @param _beneficiary Token beneficiary
-   * @param _weiAmount Amount of wei contributed
-   */
-  function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal isWhitelisted(_beneficiary) {
-    super._preValidatePurchase(_beneficiary, _weiAmount);
-  }
-
-}

contracts/cryptography/ECDSA.sol

@@ -1,24 +1,20 @@
-pragma solidity ^0.4.21;
-
+pragma solidity ^0.4.24;
 
 /**
- * @title Eliptic curve signature operations
- *
+ * @title Elliptic curve signature operations
  * @dev Based on https://gist.github.com/axic/5b33912c6f61ae6fd96d6c4a47afde6d
- *
  * TODO Remove this library once solidity supports passing a signature to ecrecover.
  * See https://github.com/ethereum/solidity/issues/864
- *
  */
 
-library ECRecovery {
+library ECDSA {
 
   /**
    * @dev Recover signer address from a message by using their signature
    * @param hash bytes32 message, the hash is the signed message. What is recovered is the signer address.
-   * @param sig bytes signature, the signature is generated using web3.eth.sign()
+   * @param signature bytes signature, the signature is generated using web3.eth.sign()
    */
-  function recover(bytes32 hash, bytes sig)
+  function recover(bytes32 hash, bytes signature)
     internal
     pure
     returns (address)
@@ -28,7 +24,7 @@ library ECRecovery {
     uint8 v;
 
     // Check the signature length
-    if (sig.length != 65) {
+    if (signature.length != 65) {
       return (address(0));
     }
 
@@ -37,9 +33,9 @@ library ECRecovery {
     // currently is to use assembly.
     // solium-disable-next-line security/no-inline-assembly
     assembly {
-      r := mload(add(sig, 32))
-      s := mload(add(sig, 64))
-      v := byte(0, mload(add(sig, 96)))
+      r := mload(add(signature, 0x20))
+      s := mload(add(signature, 0x40))
+      v := byte(0, mload(add(signature, 0x60)))
     }
 
     // Version of signature should be 27 or 28, but 0 and 1 are also possible versions
@@ -59,7 +55,7 @@ library ECRecovery {
   /**
    * toEthSignedMessageHash
    * @dev prefix a bytes32 value with "\x19Ethereum Signed Message:"
-   * @dev and hash the result
+   * and hash the result
    */
   function toEthSignedMessageHash(bytes32 hash)
     internal
@@ -69,8 +65,7 @@ library ECRecovery {
     // 32 is the length in bytes of hash,
     // enforced by the type signature above
     return keccak256(
-      "\x19Ethereum Signed Message:\n32",
-      hash
+      abi.encodePacked("\x19Ethereum Signed Message:\n32", hash)
     );
   }
 }

contracts/cryptography/MerkleProof.sol

@@ -0,0 +1,42 @@
+pragma solidity ^0.4.24;
+
+/**
+ * @title MerkleProof
+ * @dev Merkle proof verification based on
+ * https://github.com/ameensol/merkle-tree-solidity/blob/master/src/MerkleProof.sol
+ */
+library MerkleProof {
+  /**
+   * @dev Verifies a Merkle proof proving the existence of a leaf in a Merkle tree. Assumes that each pair of leaves
+   * and each pair of pre-images are sorted.
+   * @param proof Merkle proof containing sibling hashes on the branch from the leaf to the root of the Merkle tree
+   * @param root Merkle root
+   * @param leaf Leaf of Merkle tree
+   */
+  function verify(
+    bytes32[] proof,
+    bytes32 root,
+    bytes32 leaf
+  )
+    internal
+    pure
+    returns (bool)
+  {
+    bytes32 computedHash = leaf;
+
+    for (uint256 i = 0; i < proof.length; i++) {
+      bytes32 proofElement = proof[i];
+
+      if (computedHash < proofElement) {
+        // Hash(current computed hash + current element of the proof)
+        computedHash = keccak256(abi.encodePacked(computedHash, proofElement));
+      } else {
+        // Hash(current element of the proof + current computed hash)
+        computedHash = keccak256(abi.encodePacked(proofElement, computedHash));
+      }
+    }
+
+    // Check if the computed hash (root) is equal to the provided root
+    return computedHash == root;
+  }
+}

contracts/drafts/Counter.sol

@@ -0,0 +1,28 @@
+pragma solidity ^0.4.24;
+
+/**
+ * @title Counter
+ * @author Matt Condon (@shrugs)
+ * @dev Provides an incrementing uint256 id acquired by the `Counter#next` getter.
+ * Use this for issuing ERC721 ids or keeping track of request ids, anything you want, really.
+ *
+ * Include with `using Counter for Counter.Counter;`
+ * @notice Does not allow an Id of 0, which is popularly used to signify a null state in solidity.
+ * Does not protect from overflows, but if you have 2^256 ids, you have other problems.
+ * (But actually, it's generally impossible to increment a counter this many times, energy wise
+ * so it's not something you have to worry about.)
+ */
+library Counter {
+
+  struct Counter {
+    uint256 current; // default: 0
+  }
+
+  function next(Counter storage index)
+    internal
+    returns (uint256)
+  {
+    index.current += 1;
+    return index.current;
+  }
+}

contracts/drafts/ERC1046/TokenMetadata.sol

@@ -0,0 +1,27 @@
+pragma solidity ^0.4.24;
+
+import "../../token/ERC20/IERC20.sol";
+
+/**
+ * @title ERC-1047 Token Metadata
+ * @dev See https://eips.ethereum.org/EIPS/eip-1046
+ * @dev tokenURI must respond with a URI that implements https://eips.ethereum.org/EIPS/eip-1047
+ * @dev TODO - update https://github.com/OpenZeppelin/openzeppelin-solidity/blob/master/contracts/token/ERC721/IERC721.sol#L17 when 1046 is finalized
+ */
+contract ERC20TokenMetadata is IERC20 {
+  function tokenURI() external view returns (string);
+}
+
+contract ERC20WithMetadata is ERC20TokenMetadata {
+  string private _tokenURI;
+
+  constructor(string tokenURI)
+    public
+  {
+    _tokenURI = tokenURI;
+  }
+
+  function tokenURI() external view returns (string) {
+    return _tokenURI;
+  }
+}

contracts/drafts/ERC20Migrator.sol

@@ -0,0 +1,100 @@
+pragma solidity ^0.4.24;
+
+import "../token/ERC20/IERC20.sol";
+import "../token/ERC20/ERC20Mintable.sol";
+import "../token/ERC20/SafeERC20.sol";
+import "../math/Math.sol";
+
+/**
+ * @title ERC20Migrator
+ * @dev This contract can be used to migrate an ERC20 token from one
+ * contract to another, where each token holder has to opt-in to the migration.
+ * To opt-in, users must approve for this contract the number of tokens they
+ * want to migrate. Once the allowance is set up, anyone can trigger the
+ * migration to the new token contract. In this way, token holders "turn in"
+ * their old balance and will be minted an equal amount in the new token.
+ * The new token contract must be mintable. For the precise interface refer to
+ * OpenZeppelin's ERC20Mintable, but the only functions that are needed are
+ * `isMinter(address)` and `mint(address, amount)`. The migrator will check
+ * that it is a minter for the token.
+ * The balance from the legacy token will be transfered to the migrator, as it
+ * is migrated, and remain there forever.
+ * Although this contract can be used in many different scenarios, the main
+ * motivation was to provide a way to migrate ERC20 tokens into an upgradeable
+ * version of it using ZeppelinOS. To read more about how this can be done
+ * using this implementation, please follow the official documentation site of
+ * ZeppelinOS: https://docs.zeppelinos.org/docs/erc20_onboarding.html
+ * Example of usage:
+ * ```
+ * const migrator = await ERC20Migrator.new(legacyToken.address);
+ * await newToken.addMinter(migrator.address);
+ * await migrator.beginMigration(newToken.address);
+ * ```
+ */
+contract ERC20Migrator {
+  using SafeERC20 for IERC20;
+
+  /// Address of the old token contract
+  IERC20 private _legacyToken;
+
+  /// Address of the new token contract
+  ERC20Mintable private _newToken;
+
+  /**
+   * @param legacyToken address of the old token contract
+   */
+  constructor(IERC20 legacyToken) public {
+    require(legacyToken != address(0));
+    _legacyToken = legacyToken;
+  }
+
+  /**
+   * @dev Returns the legacy token that is being migrated.
+   */
+  function legacyToken() public view returns (IERC20) {
+    return _legacyToken;
+  }
+
+  /**
+   * @dev Returns the new token to which we are migrating.
+   */
+  function newToken() public view returns (IERC20) {
+    return _newToken;
+  }
+
+  /**
+   * @dev Begins the migration by setting which is the new token that will be
+   * minted. This contract must be a minter for the new token.
+   * @param newToken the token that will be minted
+   */
+  function beginMigration(ERC20Mintable newToken) public {
+    require(_newToken == address(0));
+    require(newToken != address(0));
+    require(newToken.isMinter(this));
+
+    _newToken = newToken;
+  }
+
+  /**
+   * @dev Transfers part of an account's balance in the old token to this
+   * contract, and mints the same amount of new tokens for that account.
+   * @param account whose tokens will be migrated
+   * @param amount amount of tokens to be migrated
+   */
+  function migrate(address account, uint256 amount) public {
+    _legacyToken.safeTransferFrom(account, this, amount);
+    _newToken.mint(account, amount);
+  }
+
+  /**
+   * @dev Transfers all of an account's allowed balance in the old token to
+   * this contract, and mints the same amount of new tokens for that account.
+   * @param account whose tokens will be migrated
+   */
+  function migrateAll(address account) public {
+    uint256 balance = _legacyToken.balanceOf(account);
+    uint256 allowance = _legacyToken.allowance(account, this);
+    uint256 amount = Math.min(balance, allowance);
+    migrate(account, amount);
+  }
+}

contracts/drafts/SignatureBouncer.sol

@@ -0,0 +1,146 @@
+pragma solidity ^0.4.24;
+
+import "../access/roles/SignerRole.sol";
+import "../cryptography/ECDSA.sol";
+
+/**
+ * @title SignatureBouncer
+ * @author PhABC, Shrugs and aflesher
+ * @dev SignatureBouncer allows users to submit a signature as a permission to
+ * do an action.
+ * If the signature is from one of the authorized signer addresses, the
+ * signature is valid.
+ * Note that SignatureBouncer offers no protection against replay attacks, users
+ * must add this themselves!
+ *
+ * Signer addresses can be individual servers signing grants or different
+ * users within a decentralized club that have permission to invite other
+ * members. This technique is useful for whitelists and airdrops; instead of
+ * putting all valid addresses on-chain, simply sign a grant of the form
+ * keccak256(abi.encodePacked(`:contractAddress` + `:granteeAddress`)) using a
+ * valid signer address.
+ * Then restrict access to your crowdsale/whitelist/airdrop using the
+ * `onlyValidSignature` modifier (or implement your own using _isValidSignature).
+ * In addition to `onlyValidSignature`, `onlyValidSignatureAndMethod` and
+ * `onlyValidSignatureAndData` can be used to restrict access to only a given
+ * method or a given method with given parameters respectively.
+ * See the tests in SignatureBouncer.test.js for specific usage examples.
+ *
+ * @notice A method that uses the `onlyValidSignatureAndData` modifier must make
+ * the _signature parameter the "last" parameter. You cannot sign a message that
+ * has its own signature in it so the last 128 bytes of msg.data (which
+ * represents the length of the _signature data and the _signaature data itself)
+ * is ignored when validating. Also non fixed sized parameters make constructing
+ * the data in the signature much more complex.
+ * See https://ethereum.stackexchange.com/a/50616 for more details.
+ */
+contract SignatureBouncer is SignerRole {
+  using ECDSA for bytes32;
+
+  // Function selectors are 4 bytes long, as documented in
+  // https://solidity.readthedocs.io/en/v0.4.24/abi-spec.html#function-selector
+  uint256 private constant _METHOD_ID_SIZE = 4;
+  // Signature size is 65 bytes (tightly packed v + r + s), but gets padded to 96 bytes
+  uint256 private constant _SIGNATURE_SIZE = 96;
+
+  constructor() internal {}
+
+  /**
+   * @dev requires that a valid signature of a signer was provided
+   */
+  modifier onlyValidSignature(bytes signature)
+  {
+    require(_isValidSignature(msg.sender, signature));
+    _;
+  }
+
+  /**
+   * @dev requires that a valid signature with a specifed method of a signer was provided
+   */
+  modifier onlyValidSignatureAndMethod(bytes signature)
+  {
+    require(_isValidSignatureAndMethod(msg.sender, signature));
+    _;
+  }
+
+  /**
+   * @dev requires that a valid signature with a specifed method and params of a signer was provided
+   */
+  modifier onlyValidSignatureAndData(bytes signature)
+  {
+    require(_isValidSignatureAndData(msg.sender, signature));
+    _;
+  }
+
+  /**
+   * @dev is the signature of `this + sender` from a signer?
+   * @return bool
+   */
+  function _isValidSignature(address account, bytes signature)
+    internal
+    view
+    returns (bool)
+  {
+    return _isValidDataHash(
+      keccak256(abi.encodePacked(address(this), account)),
+      signature
+    );
+  }
+
+  /**
+   * @dev is the signature of `this + sender + methodId` from a signer?
+   * @return bool
+   */
+  function _isValidSignatureAndMethod(address account, bytes signature)
+    internal
+    view
+    returns (bool)
+  {
+    bytes memory data = new bytes(_METHOD_ID_SIZE);
+    for (uint i = 0; i < data.length; i++) {
+      data[i] = msg.data[i];
+    }
+    return _isValidDataHash(
+      keccak256(abi.encodePacked(address(this), account, data)),
+      signature
+    );
+  }
+
+  /**
+    * @dev is the signature of `this + sender + methodId + params(s)` from a signer?
+    * @notice the signature parameter of the method being validated must be the "last" parameter
+    * @return bool
+    */
+  function _isValidSignatureAndData(address account, bytes signature)
+    internal
+    view
+    returns (bool)
+  {
+    require(msg.data.length > _SIGNATURE_SIZE);
+    bytes memory data = new bytes(msg.data.length - _SIGNATURE_SIZE);
+    for (uint i = 0; i < data.length; i++) {
+      data[i] = msg.data[i];
+    }
+    return _isValidDataHash(
+      keccak256(abi.encodePacked(address(this), account, data)),
+      signature
+    );
+  }
+
+  /**
+   * @dev internal function to convert a hash to an eth signed message
+   * and then recover the signature and check it against the signer role
+   * @return bool
+   */
+  function _isValidDataHash(bytes32 hash, bytes signature)
+    internal
+    view
+    returns (bool)
+  {
+    address signer = hash
+      .toEthSignedMessageHash()
+      .recover(signature);
+
+    return signer != address(0) && isSigner(signer);
+  }
+}

contracts/drafts/TokenVesting.sol

@@ -0,0 +1,175 @@
+/* solium-disable security/no-block-members */
+
+pragma solidity ^0.4.24;
+
+import "../token/ERC20/SafeERC20.sol";
+import "../ownership/Ownable.sol";
+import "../math/SafeMath.sol";
+
+/**
+ * @title TokenVesting
+ * @dev A token holder contract that can release its token balance gradually like a
+ * typical vesting scheme, with a cliff and vesting period. Optionally revocable by the
+ * owner.
+ */
+contract TokenVesting is Ownable {
+  using SafeMath for uint256;
+  using SafeERC20 for IERC20;
+
+  event TokensReleased(address token, uint256 amount);
+  event TokenVestingRevoked(address token);
+
+  // beneficiary of tokens after they are released
+  address private _beneficiary;
+
+  uint256 private _cliff;
+  uint256 private _start;
+  uint256 private _duration;
+
+  bool private _revocable;
+
+  mapping (address => uint256) private _released;
+  mapping (address => bool) private _revoked;
+
+  /**
+   * @dev Creates a vesting contract that vests its balance of any ERC20 token to the
+   * beneficiary, gradually in a linear fashion until start + duration. By then all
+   * of the balance will have vested.
+   * @param beneficiary address of the beneficiary to whom vested tokens are transferred
+   * @param cliffDuration duration in seconds of the cliff in which tokens will begin to vest
+   * @param start the time (as Unix time) at which point vesting starts
+   * @param duration duration in seconds of the period in which the tokens will vest
+   * @param revocable whether the vesting is revocable or not
+   */
+  constructor(
+    address beneficiary,
+    uint256 start,
+    uint256 cliffDuration,
+    uint256 duration,
+    bool revocable
+  )
+    public
+  {
+    require(beneficiary != address(0));
+    require(cliffDuration <= duration);
+    require(duration > 0);
+    require(start.add(duration) > block.timestamp);
+
+    _beneficiary = beneficiary;
+    _revocable = revocable;
+    _duration = duration;
+    _cliff = start.add(cliffDuration);
+    _start = start;
+  }
+
+  /**
+   * @return the beneficiary of the tokens.
+   */
+  function beneficiary() public view returns(address) {
+    return _beneficiary;
+  }
+
+  /**
+   * @return the cliff time of the token vesting.
+   */
+  function cliff() public view returns(uint256) {
+    return _cliff;
+  }
+
+  /**
+   * @return the start time of the token vesting.
+   */
+  function start() public view returns(uint256) {
+    return _start;
+  }
+
+  /**
+   * @return the duration of the token vesting.
+   */
+  function duration() public view returns(uint256) {
+    return _duration;
+  }
+
+  /**
+   * @return true if the vesting is revocable.
+   */
+  function revocable() public view returns(bool) {
+    return _revocable;
+  }
+
+  /**
+   * @return the amount of the token released.
+   */
+  function released(address token) public view returns(uint256) {
+    return _released[token];
+  }
+
+  /**
+   * @return true if the token is revoked.
+   */
+  function revoked(address token) public view returns(bool) {
+    return _revoked[token];
+  }
+
+  /**
+   * @notice Transfers vested tokens to beneficiary.
+   * @param token ERC20 token which is being vested
+   */
+  function release(IERC20 token) public {
+    uint256 unreleased = _releasableAmount(token);
+
+    require(unreleased > 0);
+
+    _released[token] = _released[token].add(unreleased);
+
+    token.safeTransfer(_beneficiary, unreleased);
+
+    emit TokensReleased(token, unreleased);
+  }
+
+  /**
+   * @notice Allows the owner to revoke the vesting. Tokens already vested
+   * remain in the contract, the rest are returned to the owner.
+   * @param token ERC20 token which is being vested
+   */
+  function revoke(IERC20 token) public onlyOwner {
+    require(_revocable);
+    require(!_revoked[token]);
+
+    uint256 balance = token.balanceOf(address(this));
+
+    uint256 unreleased = _releasableAmount(token);
+    uint256 refund = balance.sub(unreleased);
+
+    _revoked[token] = true;
+
+    token.safeTransfer(owner(), refund);
+
+    emit TokenVestingRevoked(token);
+  }
+
+  /**
+   * @dev Calculates the amount that has already vested but hasn't been released yet.
+   * @param token ERC20 token which is being vested
+   */
+  function _releasableAmount(IERC20 token) private view returns (uint256) {
+    return _vestedAmount(token).sub(_released[token]);
+  }
+
+  /**
+   * @dev Calculates the amount that has already vested.
+   * @param token ERC20 token which is being vested
+   */
+  function _vestedAmount(IERC20 token) private view returns (uint256) {
+    uint256 currentBalance = token.balanceOf(this);
+    uint256 totalBalance = currentBalance.add(_released[token]);
+
+    if (block.timestamp < _cliff) {
+      return 0;
+    } else if (block.timestamp >= _start.add(_duration) || _revoked[token]) {
+      return totalBalance;
+    } else {
+      return totalBalance.mul(block.timestamp.sub(_start)).div(_duration);
+    }
+  }
+}

contracts/examples/SampleCrowdsale.sol

@@ -1,25 +1,20 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
 import "../crowdsale/validation/CappedCrowdsale.sol";
 import "../crowdsale/distribution/RefundableCrowdsale.sol";
 import "../crowdsale/emission/MintedCrowdsale.sol";
-import "../token/ERC20/MintableToken.sol";
-
+import "../token/ERC20/ERC20Mintable.sol";
+import "../token/ERC20/ERC20Detailed.sol";
 
 /**
  * @title SampleCrowdsaleToken
  * @dev Very simple ERC20 Token that can be minted.
  * It is meant to be used in a crowdsale contract.
  */
-contract SampleCrowdsaleToken is MintableToken {
-
-  string public constant name = "Sample Crowdsale Token"; // solium-disable-line uppercase
-  string public constant symbol = "SCT"; // solium-disable-line uppercase
-  uint8 public constant decimals = 18; // solium-disable-line uppercase
-
+contract SampleCrowdsaleToken is ERC20Mintable, ERC20Detailed {
+  constructor() public ERC20Detailed("Sample Crowdsale Token", "SCT", 18) {}
 }
 
-
 /**
  * @title SampleCrowdsale
  * @dev This is an example of a fully fledged crowdsale.
@@ -27,29 +22,36 @@ contract SampleCrowdsaleToken is MintableToken {
  * In this example we are providing following extensions:
  * CappedCrowdsale - sets a max boundary for raised funds
  * RefundableCrowdsale - set a min goal to be reached and returns funds if it's not met
+ * MintedCrowdsale - assumes the token can be minted by the crowdsale, which does so
+ * when receiving purchases.
  *
  * After adding multiple features it's good practice to run integration tests
  * to ensure that subcontracts works together as intended.
  */
+// XXX There doesn't seem to be a way to split this line that keeps solium
+// happy. See:
+// https://github.com/duaraghav8/Solium/issues/205
+// --elopio - 2018-05-10
+// solium-disable-next-line max-len
 contract SampleCrowdsale is CappedCrowdsale, RefundableCrowdsale, MintedCrowdsale {
 
-  function SampleCrowdsale(
-    uint256 _openingTime,
-    uint256 _closingTime,
-    uint256 _rate,
-    address _wallet,
-    uint256 _cap,
-    MintableToken _token,
-    uint256 _goal
+  constructor(
+    uint256 openingTime,
+    uint256 closingTime,
+    uint256 rate,
+    address wallet,
+    uint256 cap,
+    ERC20Mintable token,
+    uint256 goal
   )
     public
-    Crowdsale(_rate, _wallet, _token)
-    CappedCrowdsale(_cap)
-    TimedCrowdsale(_openingTime, _closingTime)
-    RefundableCrowdsale(_goal)
+    Crowdsale(rate, wallet, token)
+    CappedCrowdsale(cap)
+    TimedCrowdsale(openingTime, closingTime)
+    RefundableCrowdsale(goal)
   {
     //As goal needs to be met for a successful crowdsale
     //the value needs to less or equal than a cap which is limit for accepted funds
-    require(_goal <= _cap);
+    require(goal <= cap);
   }
 }

contracts/examples/SimpleSavingsWallet.sol

@@ -1,40 +0,0 @@
-pragma solidity ^0.4.21;
-
-import "../ownership/Heritable.sol";
-
-
-/**
- * @title SimpleSavingsWallet
- * @dev Simplest form of savings wallet whose ownership can be claimed by a heir
- * if owner dies.
- * In this example, we take a very simple savings wallet providing two operations
- * (to send and receive funds) and extend its capabilities by making it Heritable.
- * The account that creates the contract is set as owner, who has the authority to
- * choose an heir account. Heir account can reclaim the contract ownership in the
- * case that the owner dies.
- */
-contract SimpleSavingsWallet is Heritable {
-
-  event Sent(address indexed payee, uint256 amount, uint256 balance);
-  event Received(address indexed payer, uint256 amount, uint256 balance);
-
-
-  function SimpleSavingsWallet(uint256 _heartbeatTimeout) Heritable(_heartbeatTimeout) public {}
-
-  /**
-   * @dev wallet can receive funds.
-   */
-  function () public payable {
-    emit Received(msg.sender, msg.value, address(this).balance);
-  }
-
-  /**
-   * @dev wallet can send funds
-   */
-  function sendTo(address payee, uint256 amount) public onlyOwner {
-    require(payee != 0 && payee != address(this));
-    require(amount > 0);
-    payee.transfer(amount);
-    emit Sent(payee, amount, address(this).balance);
-  }
-}

contracts/examples/SimpleToken.sol

@@ -1,30 +1,26 @@
-pragma solidity ^0.4.21;
-
-
-import "../token/ERC20/StandardToken.sol";
+pragma solidity ^0.4.24;
 
+import "../token/ERC20/ERC20.sol";
 
 /**
  * @title SimpleToken
  * @dev Very simple ERC20 Token example, where all tokens are pre-assigned to the creator.
  * Note they can later distribute these tokens as they wish using `transfer` and other
- * `StandardToken` functions.
+ * `ERC20` functions.
  */
-contract SimpleToken is StandardToken {
+contract SimpleToken is ERC20 {
 
-  string public constant name = "SimpleToken"; // solium-disable-line uppercase
-  string public constant symbol = "SIM"; // solium-disable-line uppercase
-  uint8 public constant decimals = 18; // solium-disable-line uppercase
+  string public constant name = "SimpleToken";
+  string public constant symbol = "SIM";
+  uint8 public constant decimals = 18;
 
   uint256 public constant INITIAL_SUPPLY = 10000 * (10 ** uint256(decimals));
 
   /**
    * @dev Constructor that gives msg.sender all of existing tokens.
    */
-  function SimpleToken() public {
-    totalSupply_ = INITIAL_SUPPLY;
-    balances[msg.sender] = INITIAL_SUPPLY;
-    emit Transfer(0x0, msg.sender, INITIAL_SUPPLY);
+  constructor() public {
+    _mint(msg.sender, INITIAL_SUPPLY);
   }
 
 }

contracts/introspection/ERC165.sol

@@ -0,0 +1,53 @@
+pragma solidity ^0.4.24;
+
+import "./IERC165.sol";
+
+/**
+ * @title ERC165
+ * @author Matt Condon (@shrugs)
+ * @dev Implements ERC165 using a lookup table.
+ */
+contract ERC165 is IERC165 {
+
+  bytes4 private constant _InterfaceId_ERC165 = 0x01ffc9a7;
+  /**
+   * 0x01ffc9a7 ===
+   *   bytes4(keccak256('supportsInterface(bytes4)'))
+   */
+
+  /**
+   * @dev a mapping of interface id to whether or not it's supported
+   */
+  mapping(bytes4 => bool) private _supportedInterfaces;
+
+  /**
+   * @dev A contract implementing SupportsInterfaceWithLookup
+   * implement ERC165 itself
+   */
+  constructor()
+    internal
+  {
+    _registerInterface(_InterfaceId_ERC165);
+  }
+
+  /**
+   * @dev implement supportsInterface(bytes4) using a lookup table
+   */
+  function supportsInterface(bytes4 interfaceId)
+    external
+    view
+    returns (bool)
+  {
+    return _supportedInterfaces[interfaceId];
+  }
+
+  /**
+   * @dev internal method for registering an interface
+   */
+  function _registerInterface(bytes4 interfaceId)
+    internal
+  {
+    require(interfaceId != 0xffffffff);
+    _supportedInterfaces[interfaceId] = true;
+  }
+}

contracts/introspection/ERC165Checker.sol

@@ -0,0 +1,146 @@
+pragma solidity ^0.4.24;
+
+/**
+ * @title ERC165Checker
+ * @dev Use `using ERC165Checker for address`; to include this library
+ * https://github.com/ethereum/EIPs/blob/master/EIPS/eip-165.md
+ */
+library ERC165Checker {
+  // As per the EIP-165 spec, no interface should ever match 0xffffffff
+  bytes4 private constant _InterfaceId_Invalid = 0xffffffff;
+
+  bytes4 private constant _InterfaceId_ERC165 = 0x01ffc9a7;
+  /**
+   * 0x01ffc9a7 ===
+   *   bytes4(keccak256('supportsInterface(bytes4)'))
+   */
+
+  /**
+   * @notice Query if a contract supports ERC165
+   * @param account The address of the contract to query for support of ERC165
+   * @return true if the contract at account implements ERC165
+   */
+  function _supportsERC165(address account)
+    internal
+    view
+    returns (bool)
+  {
+    // Any contract that implements ERC165 must explicitly indicate support of
+    // InterfaceId_ERC165 and explicitly indicate non-support of InterfaceId_Invalid
+    return _supportsERC165Interface(account, _InterfaceId_ERC165) &&
+      !_supportsERC165Interface(account, _InterfaceId_Invalid);
+  }
+
+  /**
+   * @notice Query if a contract implements an interface, also checks support of ERC165
+   * @param account The address of the contract to query for support of an interface
+   * @param interfaceId The interface identifier, as specified in ERC-165
+   * @return true if the contract at account indicates support of the interface with
+   * identifier interfaceId, false otherwise
+   * @dev Interface identification is specified in ERC-165.
+   */
+  function _supportsInterface(address account, bytes4 interfaceId)
+    internal
+    view
+    returns (bool)
+  {
+    // query support of both ERC165 as per the spec and support of _interfaceId
+    return _supportsERC165(account) &&
+      _supportsERC165Interface(account, interfaceId);
+  }
+
+  /**
+   * @notice Query if a contract implements interfaces, also checks support of ERC165
+   * @param account The address of the contract to query for support of an interface
+   * @param interfaceIds A list of interface identifiers, as specified in ERC-165
+   * @return true if the contract at account indicates support all interfaces in the
+   * interfaceIds list, false otherwise
+   * @dev Interface identification is specified in ERC-165.
+   */
+  function _supportsAllInterfaces(address account, bytes4[] interfaceIds)
+    internal
+    view
+    returns (bool)
+  {
+    // query support of ERC165 itself
+    if (!_supportsERC165(account)) {
+      return false;
+    }
+
+    // query support of each interface in _interfaceIds
+    for (uint256 i = 0; i < interfaceIds.length; i++) {
+      if (!_supportsERC165Interface(account, interfaceIds[i])) {
+        return false;
+      }
+    }
+
+    // all interfaces supported
+    return true;
+  }
+
+  /**
+   * @notice Query if a contract implements an interface, does not check ERC165 support
+   * @param account The address of the contract to query for support of an interface
+   * @param interfaceId The interface identifier, as specified in ERC-165
+   * @return true if the contract at account indicates support of the interface with
+   * identifier interfaceId, false otherwise
+   * @dev Assumes that account contains a contract that supports ERC165, otherwise
+   * the behavior of this method is undefined. This precondition can be checked
+   * with the `supportsERC165` method in this library.
+   * Interface identification is specified in ERC-165.
+   */
+  function _supportsERC165Interface(address account, bytes4 interfaceId)
+    private
+    view
+    returns (bool)
+  {
+    // success determines whether the staticcall succeeded and result determines
+    // whether the contract at account indicates support of _interfaceId
+    (bool success, bool result) = _callERC165SupportsInterface(
+      account, interfaceId);
+
+    return (success && result);
+  }
+
+  /**
+   * @notice Calls the function with selector 0x01ffc9a7 (ERC165) and suppresses throw
+   * @param account The address of the contract to query for support of an interface
+   * @param interfaceId The interface identifier, as specified in ERC-165
+   * @return success true if the STATICCALL succeeded, false otherwise
+   * @return result true if the STATICCALL succeeded and the contract at account
+   * indicates support of the interface with identifier interfaceId, false otherwise
+   */
+  function _callERC165SupportsInterface(
+    address account,
+    bytes4 interfaceId
+  )
+    private
+    view
+    returns (bool success, bool result)
+  {
+    bytes memory encodedParams = abi.encodeWithSelector(
+      _InterfaceId_ERC165,
+      interfaceId
+    );
+
+    // solium-disable-next-line security/no-inline-assembly
+    assembly {
+      let encodedParams_data := add(0x20, encodedParams)
+      let encodedParams_size := mload(encodedParams)
+
+      let output := mload(0x40)  // Find empty storage location using "free memory pointer"
+      mstore(output, 0x0)
+
+      success := staticcall(
+        30000,                 // 30k gas
+        account,              // To addr
+        encodedParams_data,
+        encodedParams_size,
+        output,
+        0x20                   // Outputs are 32 bytes long
+      )
+
+      result := mload(output)  // Load the result
+    }
+  }
+}

contracts/introspection/IERC165.sol

@@ -0,0 +1,19 @@
+pragma solidity ^0.4.24;
+
+/**
+ * @title IERC165
+ * @dev https://github.com/ethereum/EIPs/blob/master/EIPS/eip-165.md
+ */
+interface IERC165 {
+
+  /**
+   * @notice Query if a contract implements an interface
+   * @param interfaceId The interface identifier, as specified in ERC-165
+   * @dev Interface identification is specified in ERC-165. This function
+   * uses less than 30,000 gas.
+   */
+  function supportsInterface(bytes4 interfaceId)
+    external
+    view
+    returns (bool);
+}

contracts/lifecycle/Destructible.sol

@@ -1,25 +0,0 @@
-pragma solidity ^0.4.21;
-
-
-import "../ownership/Ownable.sol";
-
-
-/**
- * @title Destructible
- * @dev Base contract that can be destroyed by owner. All funds in contract will be sent to the owner.
- */
-contract Destructible is Ownable {
-
-  function Destructible() public payable { }
-
-  /**
-   * @dev Transfers the current balance to the owner and terminates the contract.
-   */
-  function destroy() onlyOwner public {
-    selfdestruct(owner);
-  }
-
-  function destroyAndSend(address _recipient) onlyOwner public {
-    selfdestruct(_recipient);
-  }
-}

contracts/lifecycle/Pausable.sol

@@ -1,25 +1,33 @@
-pragma solidity ^0.4.21;
-
-
-import "../ownership/Ownable.sol";
+pragma solidity ^0.4.24;
 
+import "../access/roles/PauserRole.sol";
 
 /**
  * @title Pausable
  * @dev Base contract which allows children to implement an emergency stop mechanism.
  */
-contract Pausable is Ownable {
-  event Pause();
-  event Unpause();
+contract Pausable is PauserRole {
+  event Paused(address account);
+  event Unpaused(address account);
 
-  bool public paused = false;
+  bool private _paused;
 
+  constructor() internal {
+    _paused = false;
+  }
+
+  /**
+   * @return true if the contract is paused, false otherwise.
+   */
+  function paused() public view returns(bool) {
+    return _paused;
+  }
 
   /**
    * @dev Modifier to make a function callable only when the contract is not paused.
    */
   modifier whenNotPaused() {
-    require(!paused);
+    require(!_paused);
     _;
   }
 
@@ -27,23 +35,23 @@ contract Pausable is Ownable {
    * @dev Modifier to make a function callable only when the contract is paused.
    */
   modifier whenPaused() {
-    require(paused);
+    require(_paused);
     _;
   }
 
   /**
    * @dev called by the owner to pause, triggers stopped state
    */
-  function pause() onlyOwner whenNotPaused public {
-    paused = true;
-    emit Pause();
+  function pause() public onlyPauser whenNotPaused {
+    _paused = true;
+    emit Paused(msg.sender);
   }
 
   /**
    * @dev called by the owner to unpause, returns to normal state
    */
-  function unpause() onlyOwner whenPaused public {
-    paused = false;
-    emit Unpause();
+  function unpause() public onlyPauser whenPaused {
+    _paused = false;
+    emit Unpaused(msg.sender);
   }
 }

contracts/lifecycle/TokenDestructible.sol

@@ -1,36 +0,0 @@
-pragma solidity ^0.4.21;
-
-import "../ownership/Ownable.sol";
-import "../token/ERC20/ERC20Basic.sol";
-
-
-/**
- * @title TokenDestructible:
- * @author Remco Bloemen <remco@2π.com>
- * @dev Base contract that can be destroyed by owner. All funds in contract including
- * listed tokens will be sent to the owner.
- */
-contract TokenDestructible is Ownable {
-
-  function TokenDestructible() public payable { }
-
-  /**
-   * @notice Terminate contract and refund to owner
-   * @param tokens List of addresses of ERC20 or ERC20Basic token contracts to
-   refund.
-   * @notice The called token contracts could try to re-enter this contract. Only
-   supply token contracts you trust.
-   */
-  function destroy(address[] tokens) onlyOwner public {
-
-    // Transfer tokens to owner
-    for (uint256 i = 0; i < tokens.length; i++) {
-      ERC20Basic token = ERC20Basic(tokens[i]);
-      uint256 balance = token.balanceOf(this);
-      token.transfer(owner, balance);
-    }
-
-    // Transfer Eth to owner and terminate contract
-    selfdestruct(owner);
-  }
-}

contracts/math/Math.sol

@@ -1,24 +1,31 @@
-pragma solidity ^0.4.21;
-
+pragma solidity ^0.4.24;
 
 /**
  * @title Math
  * @dev Assorted math operations
  */
 library Math {
-  function max64(uint64 a, uint64 b) internal pure returns (uint64) {
+  /**
+  * @dev Returns the largest of two numbers.
+  */
+  function max(uint256 a, uint256 b) internal pure returns (uint256) {
     return a >= b ? a : b;
   }
 
-  function min64(uint64 a, uint64 b) internal pure returns (uint64) {
+  /**
+  * @dev Returns the smallest of two numbers.
+  */
+  function min(uint256 a, uint256 b) internal pure returns (uint256) {
     return a < b ? a : b;
   }
 
-  function max256(uint256 a, uint256 b) internal pure returns (uint256) {
-    return a >= b ? a : b;
-  }
-
-  function min256(uint256 a, uint256 b) internal pure returns (uint256) {
-    return a < b ? a : b;
+  /**
+  * @dev Calculates the average of two numbers. Since these are integers,
+  * averages of an even and odd number cannot be represented, and will be
+  * rounded down.
+  */
+  function average(uint256 a, uint256 b) internal pure returns (uint256) {
+    // (a + b) / 2 can overflow, so we distribute
+    return (a / 2) + (b / 2) + ((a % 2 + b % 2) / 2);
   }
 }

contracts/math/SafeMath.sol

@@ -1,48 +1,65 @@
-pragma solidity ^0.4.21;
-
+pragma solidity ^0.4.24;
 
 /**
  * @title SafeMath
- * @dev Math operations with safety checks that throw on error
+ * @dev Math operations with safety checks that revert on error
  */
 library SafeMath {
 
   /**
-  * @dev Multiplies two numbers, throws on overflow.
+  * @dev Multiplies two numbers, reverts on overflow.
   */
-  function mul(uint256 a, uint256 b) internal pure returns (uint256 c) {
+  function mul(uint256 a, uint256 b) internal pure returns (uint256) {
+    // Gas optimization: this is cheaper than requiring 'a' not being zero, but the
+    // benefit is lost if 'b' is also tested.
+    // See: https://github.com/OpenZeppelin/openzeppelin-solidity/pull/522
     if (a == 0) {
       return 0;
     }
-    c = a * b;
-    assert(c / a == b);
+
+    uint256 c = a * b;
+    require(c / a == b);
+
     return c;
   }
 
   /**
-  * @dev Integer division of two numbers, truncating the quotient.
+  * @dev Integer division of two numbers truncating the quotient, reverts on division by zero.
   */
   function div(uint256 a, uint256 b) internal pure returns (uint256) {
-    // assert(b > 0); // Solidity automatically throws when dividing by 0
-    // uint256 c = a / b;
+    require(b > 0); // Solidity only automatically asserts when dividing by 0
+    uint256 c = a / b;
     // assert(a == b * c + a % b); // There is no case in which this doesn't hold
-    return a / b;
-  }
 
-  /**
-  * @dev Subtracts two numbers, throws on overflow (i.e. if subtrahend is greater than minuend).
-  */
-  function sub(uint256 a, uint256 b) internal pure returns (uint256) {
-    assert(b <= a);
-    return a - b;
-  }
-
-  /**
-  * @dev Adds two numbers, throws on overflow.
-  */
-  function add(uint256 a, uint256 b) internal pure returns (uint256 c) {
-    c = a + b;
-    assert(c >= a);
     return c;
   }
+
+  /**
+  * @dev Subtracts two numbers, reverts on overflow (i.e. if subtrahend is greater than minuend).
+  */
+  function sub(uint256 a, uint256 b) internal pure returns (uint256) {
+    require(b <= a);
+    uint256 c = a - b;
+
+    return c;
+  }
+
+  /**
+  * @dev Adds two numbers, reverts on overflow.
+  */
+  function add(uint256 a, uint256 b) internal pure returns (uint256) {
+    uint256 c = a + b;
+    require(c >= a);
+
+    return c;
+  }
+
+  /**
+  * @dev Divides two numbers and returns the remainder (unsigned integer modulo),
+  * reverts when dividing by zero.
+  */
+  function mod(uint256 a, uint256 b) internal pure returns (uint256) {
+    require(b != 0);
+    return a % b;
+  }
 }

contracts/mocks/AddressImpl.sol

@@ -0,0 +1,14 @@
+pragma solidity ^0.4.24;
+
+import "../utils/Address.sol";
+
+contract AddressImpl {
+  function isContract(address account)
+    external
+    view
+    returns (bool)
+  {
+    return Address.isContract(account); 
+  }
+  
+}

contracts/mocks/AllowanceCrowdsaleImpl.sol

@@ -1,20 +1,19 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
-import "../token/ERC20/ERC20.sol";
+import "../token/ERC20/IERC20.sol";
 import "../crowdsale/emission/AllowanceCrowdsale.sol";
 
-
 contract AllowanceCrowdsaleImpl is AllowanceCrowdsale {
 
-  function AllowanceCrowdsaleImpl (
-    uint256 _rate,
-    address _wallet,
-    ERC20 _token,
-    address _tokenWallet
-  ) 
+  constructor (
+    uint256 rate,
+    address wallet,
+    IERC20 token,
+    address tokenWallet
+  )
     public
-    Crowdsale(_rate, _wallet, _token)
-    AllowanceCrowdsale(_tokenWallet)
+    Crowdsale(rate, wallet, token)
+    AllowanceCrowdsale(tokenWallet)
   {
   }
 

contracts/mocks/ArraysImpl.sol

@@ -0,0 +1,18 @@
+pragma solidity ^0.4.24;
+
+import "../utils/Arrays.sol";
+
+contract ArraysImpl {
+
+  using Arrays for uint256[];
+
+  uint256[] private array;
+
+  constructor(uint256[] _array) public {
+    array = _array;
+  }
+
+  function findUpperBound(uint256 _element) external view returns (uint256) {
+    return array.findUpperBound(_element);
+  }
+}

contracts/mocks/BasicTokenMock.sol

@@ -1,15 +0,0 @@
-pragma solidity ^0.4.21;
-
-
-import "../token/ERC20/BasicToken.sol";
-
-
-// mock class using BasicToken
-contract BasicTokenMock is BasicToken {
-
-  function BasicTokenMock(address initialAccount, uint256 initialBalance) public {
-    balances[initialAccount] = initialBalance;
-    totalSupply_ = initialBalance;
-  }
-
-}

contracts/mocks/BouncerMock.sol

@@ -1,22 +0,0 @@
-pragma solidity ^0.4.18;
-
-import "../access/SignatureBouncer.sol";
-
-
-contract SignatureBouncerMock is SignatureBouncer {
-  function checkValidSignature(address _address, bytes _sig)
-    public
-    view
-    returns (bool)
-  {
-    return isValidSignature(_address, _sig);
-  }
-
-  function onlyWithValidSignature(bytes _sig)
-    onlyValidSignature(_sig)
-    public
-    view
-  {
-
-  }
-}

contracts/mocks/BurnableTokenMock.sol

@@ -1,13 +0,0 @@
-pragma solidity ^0.4.21;
-
-import "../token/ERC20/BurnableToken.sol";
-
-
-contract BurnableTokenMock is BurnableToken {
-
-  function BurnableTokenMock(address initialAccount, uint initialBalance) public {
-    balances[initialAccount] = initialBalance;
-    totalSupply_ = initialBalance;
-  }
-
-}

contracts/mocks/CappedCrowdsaleImpl.sol

@@ -1,20 +1,19 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
-import "../token/ERC20/ERC20.sol";
+import "../token/ERC20/IERC20.sol";
 import "../crowdsale/validation/CappedCrowdsale.sol";
 
-
 contract CappedCrowdsaleImpl is CappedCrowdsale {
 
-  function CappedCrowdsaleImpl (
-    uint256 _rate,
-    address _wallet,
-    ERC20 _token,
-    uint256 _cap
-  ) 
+  constructor (
+    uint256 rate,
+    address wallet,
+    IERC20 token,
+    uint256 cap
+  )
     public
-    Crowdsale(_rate, _wallet, _token)
-    CappedCrowdsale(_cap)
+    Crowdsale(rate, wallet, token)
+    CappedCrowdsale(cap)
   {
   }
 

contracts/mocks/CapperRoleMock.sol

@@ -0,0 +1,17 @@
+pragma solidity ^0.4.24;
+
+import "../access/roles/CapperRole.sol";
+
+contract CapperRoleMock is CapperRole {
+  function removeCapper(address account) public {
+    _removeCapper(account);
+  }
+
+  function onlyCapperMock() public view onlyCapper {
+  }
+
+  // Causes a compilation error if super._removeCapper is not internal
+  function _removeCapper(address account) internal {
+    super._removeCapper(account);
+  }
+}

contracts/mocks/ConditionalEscrowMock.sol

@@ -0,0 +1,16 @@
+pragma solidity ^0.4.24;
+
+import "../payment/escrow/ConditionalEscrow.sol";
+
+// mock class using ConditionalEscrow
+contract ConditionalEscrowMock is ConditionalEscrow {
+  mapping(address => bool) private _allowed;
+
+  function setAllowed(address payee, bool allowed) public {
+    _allowed[payee] = allowed;
+  }
+
+  function withdrawalAllowed(address payee) public view returns (bool) {
+    return _allowed[payee];
+  }
+}

contracts/mocks/CounterImpl.sol

@@ -0,0 +1,20 @@
+pragma solidity ^0.4.24;
+
+import "../drafts/Counter.sol";
+
+contract CounterImpl {
+  using Counter for Counter.Counter;
+
+  uint256 public theId;
+
+  // use whatever key you want to track your counters
+  mapping(string => Counter.Counter) private _counters;
+
+  function doThing(string key)
+    public
+    returns (uint256)
+  {
+    theId = _counters[key].next();
+    return theId;
+  }
+}

contracts/mocks/CrowdsaleMock.sol

@@ -0,0 +1,9 @@
+pragma solidity ^0.4.24;
+
+import "../crowdsale/Crowdsale.sol";
+
+contract CrowdsaleMock is Crowdsale {
+  constructor(uint256 rate, address wallet, IERC20 token) public
+    Crowdsale(rate, wallet, token) {
+  }
+}

contracts/mocks/DayLimitMock.sol

@@ -1,25 +0,0 @@
-pragma solidity ^0.4.21;
-
-import "../../contracts/DayLimit.sol";
-
-
-contract DayLimitMock is DayLimit {
-  uint256 public totalSpending;
-
-  function DayLimitMock(uint256 _value) public DayLimit(_value) {
-    totalSpending = 0;
-  }
-
-  function attemptSpend(uint256 _value) external limitedDaily(_value) {
-    totalSpending += _value;
-  }
-
-  function setDailyLimit(uint256 _newLimit) external {
-    _setDailyLimit(_newLimit);
-  }
-
-  function resetSpentToday() external {
-    _resetSpentToday();
-  }
-
-}

contracts/mocks/DetailedERC20Mock.sol

@@ -1,9 +1,15 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
-import "../token/ERC20/StandardToken.sol";
-import "../token/ERC20/DetailedERC20.sol";
+import "../token/ERC20/ERC20.sol";
+import "../token/ERC20/ERC20Detailed.sol";
 
-
-contract DetailedERC20Mock is StandardToken, DetailedERC20 {
-  function DetailedERC20Mock(string _name, string _symbol, uint8 _decimals) DetailedERC20(_name, _symbol, _decimals) public {}
+contract ERC20DetailedMock is ERC20, ERC20Detailed {
+  constructor(
+    string name,
+    string symbol,
+    uint8 decimals
+  )
+    ERC20Detailed(name, symbol, decimals)
+    public
+  {}
 }

contracts/mocks/ECDSAMock.sol

@@ -1,18 +1,16 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
+import "../cryptography/ECDSA.sol";
 
-import "../ECRecovery.sol";
+contract ECDSAMock {
+  using ECDSA for bytes32;
 
-
-contract ECRecoveryMock {
-  using ECRecovery for bytes32;
-
-  function recover(bytes32 hash, bytes sig)
+  function recover(bytes32 hash, bytes signature)
     public
     pure
     returns (address)
   {
-    return hash.recover(sig);
+    return hash.recover(signature);
   }
 
   function toEthSignedMessageHash(bytes32 hash)

contracts/mocks/ERC165/ERC165InterfacesSupported.sol

@@ -0,0 +1,66 @@
+pragma solidity ^0.4.24;
+
+import "../../introspection/IERC165.sol";
+
+/**
+ * https://github.com/ethereum/EIPs/blob/master/EIPS/eip-214.md#specification
+ * > Any attempts to make state-changing operations inside an execution instance with STATIC set to true will instead throw an exception.
+ * > These operations include [...], LOG0, LOG1, LOG2, [...]
+ *
+ * therefore, because this contract is staticcall'd we need to not emit events (which is how solidity-coverage works)
+ * solidity-coverage ignores the /mocks folder, so we duplicate its implementation here to avoid instrumenting it
+ */
+contract SupportsInterfaceWithLookupMock is IERC165 {
+
+  bytes4 public constant InterfaceId_ERC165 = 0x01ffc9a7;
+  /**
+   * 0x01ffc9a7 ===
+   *   bytes4(keccak256('supportsInterface(bytes4)'))
+   */
+
+  /**
+   * @dev a mapping of interface id to whether or not it's supported
+   */
+  mapping(bytes4 => bool) private _supportedInterfaces;
+
+  /**
+   * @dev A contract implementing SupportsInterfaceWithLookup
+   * implement ERC165 itself
+   */
+  constructor()
+    public
+  {
+    _registerInterface(InterfaceId_ERC165);
+  }
+
+  /**
+   * @dev implement supportsInterface(bytes4) using a lookup table
+   */
+  function supportsInterface(bytes4 interfaceId)
+    external
+    view
+    returns (bool)
+  {
+    return _supportedInterfaces[interfaceId];
+  }
+
+  /**
+   * @dev private method for registering an interface
+   */
+  function _registerInterface(bytes4 interfaceId)
+    internal
+  {
+    require(interfaceId != 0xffffffff);
+    _supportedInterfaces[interfaceId] = true;
+  }
+}
+
+contract ERC165InterfacesSupported is SupportsInterfaceWithLookupMock {
+  constructor (bytes4[] interfaceIds)
+    public
+  {
+    for (uint256 i = 0; i < interfaceIds.length; i++) {
+      _registerInterface(interfaceIds[i]);
+    }
+  }
+}

contracts/mocks/ERC165/ERC165NotSupported.sol

@@ -0,0 +1,5 @@
+pragma solidity ^0.4.24;
+
+contract ERC165NotSupported {
+
+}

contracts/mocks/ERC165CheckerMock.sol

@@ -0,0 +1,31 @@
+pragma solidity ^0.4.24;
+
+import "../introspection/ERC165Checker.sol";
+
+contract ERC165CheckerMock {
+  using ERC165Checker for address;
+
+  function supportsERC165(address account)
+    public
+    view
+    returns (bool)
+  {
+    return account._supportsERC165();
+  }
+
+  function supportsInterface(address account, bytes4 interfaceId)
+    public
+    view
+    returns (bool)
+  {
+    return account._supportsInterface(interfaceId);
+  }
+
+  function supportsAllInterfaces(address account, bytes4[] interfaceIds)
+    public
+    view
+    returns (bool)
+  {
+    return account._supportsAllInterfaces(interfaceIds);
+  }
+}

contracts/mocks/ERC165Mock.sol

@@ -0,0 +1,11 @@
+pragma solidity ^0.4.24;
+
+import "../introspection/ERC165.sol";
+
+contract ERC165Mock is ERC165 {
+  function registerInterface(bytes4 interfaceId)
+    public
+  {
+    _registerInterface(interfaceId);
+  }
+}

contracts/mocks/ERC20BurnableMock.sol

@@ -0,0 +1,11 @@
+pragma solidity ^0.4.24;
+
+import "../token/ERC20/ERC20Burnable.sol";
+
+contract ERC20BurnableMock is ERC20Burnable {
+
+  constructor(address initialAccount, uint256 initialBalance) public {
+    _mint(initialAccount, initialBalance);
+  }
+
+}

contracts/mocks/ERC20MintableMock.sol

@@ -0,0 +1,7 @@
+pragma solidity ^0.4.24;
+
+import "../token/ERC20/ERC20Mintable.sol";
+import "./MinterRoleMock.sol";
+
+contract ERC20MintableMock is ERC20Mintable, MinterRoleMock {
+}

contracts/mocks/ERC20Mock.sol

@@ -0,0 +1,24 @@
+pragma solidity ^0.4.24;
+
+import "../token/ERC20/ERC20.sol";
+
+// mock class using ERC20
+contract ERC20Mock is ERC20 {
+
+  constructor(address initialAccount, uint256 initialBalance) public {
+    _mint(initialAccount, initialBalance);
+  }
+
+  function mint(address account, uint256 amount) public {
+    _mint(account, amount);
+  }
+
+  function burn(address account, uint256 amount) public {
+    _burn(account, amount);
+  }
+
+  function burnFrom(address account, uint256 amount) public {
+    _burnFrom(account, amount);
+  }
+
+}

contracts/mocks/ERC20PausableMock.sol

@@ -0,0 +1,13 @@
+pragma solidity ^0.4.24;
+
+import "../token/ERC20/ERC20Pausable.sol";
+import "./PauserRoleMock.sol";
+
+// mock class using ERC20Pausable
+contract ERC20PausableMock is ERC20Pausable, PauserRoleMock {
+
+  constructor(address initialAccount, uint initialBalance) public {
+    _mint(initialAccount, initialBalance);
+  }
+
+}

contracts/mocks/ERC20WithMetadataMock.sol

@@ -0,0 +1,11 @@
+pragma solidity ^0.4.24;
+
+import "../token/ERC20/ERC20.sol";
+import "../drafts/ERC1046/TokenMetadata.sol";
+
+contract ERC20WithMetadataMock is ERC20, ERC20WithMetadata {
+  constructor(string tokenURI) public
+    ERC20WithMetadata(tokenURI)
+  {
+  }
+}

contracts/mocks/ERC223TokenMock.sol

@@ -1,34 +0,0 @@
-pragma solidity ^0.4.21;
-
-import "../token/ERC20/BasicToken.sol";
-
-
-contract ERC223ContractInterface {
-  function tokenFallback(address _from, uint256 _value, bytes _data) external;
-}
-
-
-contract ERC223TokenMock is BasicToken {
-
-  function ERC223TokenMock(address initialAccount, uint256 initialBalance) public {
-    balances[initialAccount] = initialBalance;
-    totalSupply_ = initialBalance;
-  }
-
-  // ERC223 compatible transfer function (except the name)
-  function transferERC223(address _to, uint256 _value, bytes _data) public
-    returns (bool success)
-  {
-    transfer(_to, _value);
-    bool isContract = false;
-    // solium-disable-next-line security/no-inline-assembly
-    assembly {
-      isContract := not(iszero(extcodesize(_to)))
-    }
-    if (isContract) {
-      ERC223ContractInterface receiver = ERC223ContractInterface(_to);
-      receiver.tokenFallback(msg.sender, _value, _data);
-    }
-    return true;
-  }
-}

contracts/mocks/ERC721BasicTokenMock.sol

@@ -1,18 +0,0 @@
-pragma solidity ^0.4.21;
-
-import "../token/ERC721/ERC721BasicToken.sol";
-
-
-/**
- * @title ERC721BasicTokenMock
- * This mock just provides a public mint and burn functions for testing purposes
- */
-contract ERC721BasicTokenMock is ERC721BasicToken {
-  function mint(address _to, uint256 _tokenId) public {
-    super._mint(_to, _tokenId);
-  }
-
-  function burn(uint256 _tokenId) public {
-    super._burn(ownerOf(_tokenId), _tokenId);
-  }
-}

contracts/mocks/ERC721FullMock.sol

@@ -0,0 +1,32 @@
+pragma solidity ^0.4.24;
+
+import "../token/ERC721/ERC721Full.sol";
+import "../token/ERC721/ERC721Mintable.sol";
+import "../token/ERC721/ERC721MetadataMintable.sol";
+import "../token/ERC721/ERC721Burnable.sol";
+
+/**
+ * @title ERC721FullMock
+ * This mock just provides a public mint and burn functions for testing purposes,
+ * and a public setter for metadata URI
+ */
+contract ERC721FullMock
+  is ERC721Full, ERC721Mintable, ERC721MetadataMintable, ERC721Burnable {
+
+  constructor(string name, string symbol) public
+    ERC721Mintable()
+    ERC721Full(name, symbol)
+  {}
+
+  function exists(uint256 tokenId) public view returns (bool) {
+    return _exists(tokenId);
+  }
+
+  function setTokenURI(uint256 tokenId, string uri) public {
+    _setTokenURI(tokenId, uri);
+  }
+
+  function removeTokenFrom(address from, uint256 tokenId) public {
+    _removeTokenFrom(from, tokenId);
+  }
+}

contracts/mocks/ERC721MintableBurnableImpl.sol

@@ -0,0 +1,20 @@
+pragma solidity ^0.4.24;
+
+import "../token/ERC721/ERC721Full.sol";
+import "../token/ERC721/ERC721Mintable.sol";
+import "../token/ERC721/ERC721MetadataMintable.sol";
+import "../token/ERC721/ERC721Burnable.sol";
+
+/**
+ * @title ERC721MintableBurnableImpl
+ */
+contract ERC721MintableBurnableImpl
+  is ERC721Full, ERC721Mintable, ERC721MetadataMintable, ERC721Burnable {
+
+  constructor()
+    ERC721Mintable()
+    ERC721Full("Test", "TEST")
+    public
+  {
+  }
+}

contracts/mocks/ERC721Mock.sol

@@ -0,0 +1,17 @@
+pragma solidity ^0.4.24;
+
+import "../token/ERC721/ERC721.sol";
+
+/**
+ * @title ERC721Mock
+ * This mock just provides a public mint and burn functions for testing purposes
+ */
+contract ERC721Mock is ERC721 {
+  function mint(address to, uint256 tokenId) public {
+    _mint(to, tokenId);
+  }
+
+  function burn(uint256 tokenId) public {
+    _burn(ownerOf(tokenId), tokenId);
+  }
+}

contracts/mocks/ERC721PausableMock.sol

@@ -0,0 +1,22 @@
+pragma solidity ^0.4.24;
+
+import "../token/ERC721/ERC721Pausable.sol";
+import "./PauserRoleMock.sol";
+
+/**
+ * @title ERC721PausableMock
+ * This mock just provides a public mint, burn and exists functions for testing purposes
+ */
+contract ERC721PausableMock is ERC721Pausable, PauserRoleMock {
+  function mint(address to, uint256 tokenId) public {
+    super._mint(to, tokenId);
+  }
+
+  function burn(uint256 tokenId) public {
+    super._burn(ownerOf(tokenId), tokenId);
+  }
+
+  function exists(uint256 tokenId) public view returns (bool) {
+    return super._exists(tokenId);
+  }
+}

contracts/mocks/ERC721ReceiverMock.sol

@@ -1,34 +1,41 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
-import "../token/ERC721/ERC721Receiver.sol";
+import "../token/ERC721/IERC721Receiver.sol";
 
+contract ERC721ReceiverMock is IERC721Receiver {
+  bytes4 private _retval;
+  bool private _reverts;
 
-contract ERC721ReceiverMock is ERC721Receiver {
-  bytes4 retval;
-  bool reverts;
+  event Received(
+    address operator,
+    address from,
+    uint256 tokenId,
+    bytes data,
+    uint256 gas
+  );
 
-  event Received(address _address, uint256 _tokenId, bytes _data, uint256 _gas);
-
-  function ERC721ReceiverMock(bytes4 _retval, bool _reverts) public {
-    retval = _retval;
-    reverts = _reverts;
+  constructor(bytes4 retval, bool reverts) public {
+    _retval = retval;
+    _reverts = reverts;
   }
 
   function onERC721Received(
-    address _address,
-    uint256 _tokenId,
-    bytes _data
+    address operator,
+    address from,
+    uint256 tokenId,
+    bytes data
   )
     public
     returns(bytes4)
   {
-    require(!reverts);
+    require(!_reverts);
     emit Received(
-      _address,
-      _tokenId,
-      _data,
+      operator,
+      from,
+      tokenId,
+      data,
       gasleft() // msg.gas was deprecated in solidityv0.4.21
     );
-    return retval;
+    return _retval;
   }
 }

contracts/mocks/ERC721TokenMock.sol

@@ -1,27 +0,0 @@
-pragma solidity ^0.4.21;
-
-import "../token/ERC721/ERC721Token.sol";
-
-
-/**
- * @title ERC721TokenMock
- * This mock just provides a public mint and burn functions for testing purposes,
- * and a public setter for metadata URI
- */
-contract ERC721TokenMock is ERC721Token {
-  function ERC721TokenMock(string name, string symbol) public
-    ERC721Token(name, symbol)
-  { }
-
-  function mint(address _to, uint256 _tokenId) public {
-    super._mint(_to, _tokenId);
-  }
-
-  function burn(uint256 _tokenId) public {
-    super._burn(ownerOf(_tokenId), _tokenId);
-  }
-
-  function setTokenURI(uint256 _tokenId, string _uri) public {
-    super._setTokenURI(_tokenId, _uri);
-  }
-}

contracts/mocks/ERC827TokenMock.sol

@@ -1,15 +0,0 @@
-pragma solidity ^0.4.21;
-
-
-import "../token/ERC827/ERC827Token.sol";
-
-
-// mock class using ERC827 Token
-contract ERC827TokenMock is ERC827Token {
-
-  function ERC827TokenMock(address initialAccount, uint256 initialBalance) public {
-    balances[initialAccount] = initialBalance;
-    totalSupply_ = initialBalance;
-  }
-
-}

contracts/mocks/EventEmitter.sol

@@ -0,0 +1,62 @@
+pragma solidity ^0.4.24;
+
+contract EventEmitter {
+  event Argumentless();
+  event ShortUint(uint8 value);
+  event ShortInt(int8 value);
+  event LongUint(uint256 value);
+  event LongInt(int256 value);
+  event Address(address value);
+  event Boolean(bool value);
+  event String(string value);
+  event LongUintBooleanString(
+    uint256 uintValue,
+    bool booleanValue,
+    string stringValue
+  );
+
+  function emitArgumentless() public {
+    emit Argumentless();
+  }
+
+  function emitShortUint(uint8 value) public {
+    emit ShortUint(value);
+  }
+
+  function emitShortInt(int8 value) public {
+    emit ShortInt(value);
+  }
+
+  function emitLongUint(uint256 value) public {
+    emit LongUint(value);
+  }
+
+  function emitLongInt(int256 value) public {
+    emit LongInt(value);
+  }
+
+  function emitAddress(address value) public {
+    emit Address(value);
+  }
+
+  function emitBoolean(bool value) public {
+    emit Boolean(value);
+  }
+
+  function emitString(string value) public {
+    emit String(value);
+  }
+
+  function emitLongUintBooleanString(
+    uint256 uintValue,
+    bool booleanValue,
+    string stringValue)
+  public {
+    emit LongUintBooleanString(uintValue, booleanValue, stringValue);
+  }
+
+  function emitLongUintAndBoolean(uint256 uintValue, bool boolValue) public {
+    emit LongUint(uintValue);
+    emit Boolean(boolValue);
+  }
+}

contracts/mocks/FinalizableCrowdsaleImpl.sol

@@ -1,21 +1,20 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
-import "../token/ERC20/MintableToken.sol";
+import "../token/ERC20/IERC20.sol";
 import "../crowdsale/distribution/FinalizableCrowdsale.sol";
 
-
 contract FinalizableCrowdsaleImpl is FinalizableCrowdsale {
 
-  function FinalizableCrowdsaleImpl (
-    uint256 _openingTime,
-    uint256 _closingTime,
-    uint256 _rate,
-    address _wallet,
-    MintableToken _token
-  ) 
+  constructor (
+    uint256 openingTime,
+    uint256 closingTime,
+    uint256 rate,
+    address wallet,
+    IERC20 token
+  )
     public
-    Crowdsale(_rate, _wallet, _token)
-    TimedCrowdsale(_openingTime, _closingTime)
+    Crowdsale(rate, wallet, token)
+    TimedCrowdsale(openingTime, closingTime)
   {
   }
 

contracts/mocks/ForceEther.sol

@@ -1,16 +0,0 @@
-pragma solidity ^0.4.21;
-
-
-// @title Force Ether into a contract.
-// @notice  even
-// if the contract is not payable.
-// @notice To use, construct the contract with the target as argument.
-// @author Remco Bloemen <remco@neufund.org>
-contract ForceEther {
-
-  function ForceEther() public payable { }
-
-  function destroyAndSend(address _recipient) public {
-    selfdestruct(_recipient);
-  }
-}

contracts/mocks/HasNoEtherTest.sol

@@ -1,12 +0,0 @@
-pragma solidity ^0.4.21;
-
-import "../../contracts/ownership/HasNoEther.sol";
-
-
-contract HasNoEtherTest is HasNoEther {
-
-  // Constructor with explicit payable — should still fail
-  function HasNoEtherTest() public payable {
-  }
-
-}

contracts/mocks/IncreasingPriceCrowdsaleImpl.sol

@@ -1,23 +1,22 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
 import "../crowdsale/price/IncreasingPriceCrowdsale.sol";
 import "../math/SafeMath.sol";
 
-
 contract IncreasingPriceCrowdsaleImpl is IncreasingPriceCrowdsale {
 
-  function IncreasingPriceCrowdsaleImpl (
-    uint256 _openingTime,
-    uint256 _closingTime,
-    address _wallet,
-    ERC20 _token,
-    uint256 _initialRate,
-    uint256 _finalRate
-  ) 
+  constructor (
+    uint256 openingTime,
+    uint256 closingTime,
+    address wallet,
+    IERC20 token,
+    uint256 initialRate,
+    uint256 finalRate
+  )
     public
-    Crowdsale(_initialRate, _wallet, _token)
-    TimedCrowdsale(_openingTime, _closingTime)
-    IncreasingPriceCrowdsale(_initialRate, _finalRate)
+    Crowdsale(initialRate, wallet, token)
+    TimedCrowdsale(openingTime, closingTime)
+    IncreasingPriceCrowdsale(initialRate, finalRate)
   {
   }
 

contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol

@@ -1,19 +1,19 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
-import "../token/ERC20/ERC20.sol";
+import "../token/ERC20/IERC20.sol";
 import "../crowdsale/validation/IndividuallyCappedCrowdsale.sol";
+import "./CapperRoleMock.sol";
 
+contract IndividuallyCappedCrowdsaleImpl
+  is IndividuallyCappedCrowdsale, CapperRoleMock {
 
-contract IndividuallyCappedCrowdsaleImpl is IndividuallyCappedCrowdsale {
-  
-  function IndividuallyCappedCrowdsaleImpl (
-    uint256 _rate,
-    address _wallet,
-    ERC20 _token
-  ) 
+  constructor(
+    uint256 rate,
+    address wallet,
+    IERC20 token
+  )
     public
-    Crowdsale(_rate, _wallet, _token)
+    Crowdsale(rate, wallet, token)
   {
   }
-
 }

contracts/mocks/InsecureTargetBounty.sol

@@ -1,17 +0,0 @@
-pragma solidity ^0.4.21;
-
-import {Bounty, Target} from "../../contracts/Bounty.sol";
-
-
-contract InsecureTargetMock is Target {
-  function checkInvariant() public returns(bool) {
-    return false;
-  }
-}
-
-
-contract InsecureTargetBounty is Bounty {
-  function deployContract() internal returns (address) {
-    return new InsecureTargetMock();
-  }
-}

contracts/mocks/LimitBalanceMock.sol

@@ -1,13 +0,0 @@
-pragma solidity ^0.4.21;
-
-
-import "../LimitBalance.sol";
-
-
-// mock class using LimitBalance
-contract LimitBalanceMock is LimitBalance(1000) {
-
-  function limitedDeposit() public payable limitedPayable {
-  }
-
-}

contracts/mocks/MathMock.sol

@@ -1,26 +1,17 @@
-pragma solidity ^0.4.21;
-
-
-import "../../contracts/math/Math.sol";
+pragma solidity ^0.4.24;
 
+import "../math/Math.sol";
 
 contract MathMock {
-  uint64 public result64;
-  uint256 public result256;
-
-  function max64(uint64 a, uint64 b) public {
-    result64 = Math.max64(a, b);
+  function max(uint256 a, uint256 b) public pure returns (uint256) {
+    return Math.max(a, b);
   }
 
-  function min64(uint64 a, uint64 b) public {
-    result64 = Math.min64(a, b);
+  function min(uint256 a, uint256 b) public pure returns (uint256) {
+    return Math.min(a, b);
   }
 
-  function max256(uint256 a, uint256 b) public {
-    result256 = Math.max256(a, b);
-  }
-
-  function min256(uint256 a, uint256 b) public {
-    result256 = Math.min256(a, b);
+  function average(uint256 a, uint256 b) public pure returns (uint256) {
+    return Math.average(a, b);
   }
 }

contracts/mocks/MerkleProofWrapper.sol

@@ -1,11 +1,18 @@
-pragma solidity ^0.4.21;
-
-import { MerkleProof } from "../MerkleProof.sol";
+pragma solidity ^0.4.24;
 
+import { MerkleProof } from "../cryptography/MerkleProof.sol";
 
 contract MerkleProofWrapper {
 
-  function verifyProof(bytes32[] _proof, bytes32 _root, bytes32 _leaf) public pure returns (bool) {
-    return MerkleProof.verifyProof(_proof, _root, _leaf);
+  function verify(
+    bytes32[] proof,
+    bytes32 root,
+    bytes32 leaf
+  )
+    public
+    pure
+    returns (bool)
+  {
+    return MerkleProof.verify(proof, root, leaf);
   }
 }

contracts/mocks/MessageHelper.sol

@@ -1,35 +0,0 @@
-pragma solidity ^0.4.21;
-
-
-contract MessageHelper {
-
-  event Show(bytes32 b32, uint256 number, string text);
-  event Buy(bytes32 b32, uint256 number, string text, uint256 value);
-
-  function showMessage( bytes32 message, uint256 number, string text ) public returns (bool) {
-    emit Show(message, number, text);
-    return true;
-  }
-
-  function buyMessage( bytes32 message, uint256 number, string text ) public payable returns (bool) {
-    emit Buy(
-      message,
-      number,
-      text,
-      msg.value);
-    return true;
-  }
-
-  function fail() public {
-    require(false);
-  }
-
-  function call(address to, bytes data) public returns (bool) {
-    // solium-disable-next-line security/no-low-level-calls
-    if (to.call(data))
-      return true;
-    else
-      return false;
-  }
-
-}

contracts/mocks/MintedCrowdsaleImpl.sol

@@ -1,18 +1,17 @@
-pragma solidity ^0.4.21;
+pragma solidity ^0.4.24;
 
-import "../token/ERC20/MintableToken.sol";
+import "../token/ERC20/ERC20Mintable.sol";
 import "../crowdsale/emission/MintedCrowdsale.sol";
 
-
 contract MintedCrowdsaleImpl is MintedCrowdsale {
 
-  function MintedCrowdsaleImpl (
-    uint256 _rate,
-    address _wallet,
-    MintableToken _token
-  ) 
+  constructor (
+    uint256 rate,
+    address wallet,
+    ERC20Mintable token
+  )
     public
-    Crowdsale(_rate, _wallet, _token)
+    Crowdsale(rate, wallet, token)
   {
   }