Merge branch 'master' into less-helpers

Author: nventuro

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,21 @@
+---
+name: Bug report
+about: Report a bug in OpenZeppelin
+
+---
+
+<!-- Briefly describe the issue you're experiencing. Tell us what you were trying to do and what happened instead. -->
+
+<!-- Remember, this is not a place to ask for help debugging code. For that, we welcome you in the OpenZeppelin Slack channel: https://slack.openzeppelin.org/. -->
+
+**💻 Environment**
+
+<!-- Tell us what version of OpenZeppelin you're using, and how you're using it: Truffle, Remix, etc. -->
+
+**📝 Details**
+
+<!-- Describe the problem you have been experiencing in more detail. Include as much information as you think is relevant. Keep in mind that transactions can fail for many reasons; context is key here. -->
+
+**🔢 Code to reproduce bug**
+
+<!-- We will be able to better help if you provide a minimal example that triggers the bug. -->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,14 @@
+---
+name: Feature request
+about: Suggest an idea for OpenZeppelin
+
+---
+
+**🧐 Motivation**
+<!-- Is your feature request related to a specific problem? Is it just a crazy idea? Tell us about it! -->
+
+**📝 Details**
+<!-- Please describe your feature request in detail. -->
+
+<!-- Make sure that you have reviewed the OpenZeppelin Contributor Guidelines. -->
+<!-- https://github.com/OpenZeppelin/openzeppelin-solidity/blob/master/CONTRIBUTING.md -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,17 +1,20 @@
 <!-- 0. 🎉 Thank you for submitting a PR! -->
 
-<!-- 1. **Does this close any open issues?** If so, list them here. If not, remove the `Fixes #` line. -->
+<!-- 1. Does this close any open issues? Please list them below. -->
 
-Fixes #
+<!-- Keep in mind that new features have a better chance of being merged fast if
+they were first discussed and designed with the maintainers. If there is no
+corresponding issue, please consider opening one for discussion first! -->
 
-# 🚀 Description
+Fixes #
 
-<!-- 2. Describe the changes introduced in this pull request -->
+<!-- 2. Describe the changes introduced in this pull request. -->
 <!--    Include any context necessary for understanding the PR's purpose. -->
 
-<!-- 3. Before submitting, please review the following checklist: -->
-
-- [ ] 📘 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:fix`).
+<!-- 3. Before submitting, please make sure that you have:
+  - reviewed the OpenZeppelin Contributor Guidelines
+    (https://github.com/OpenZeppelin/openzeppelin-solidity/blob/master/CONTRIBUTING.md),
+  - added tests where applicable to test new functionality,
+  - made sure that your contracts are well-documented, and
+  - run the JS/Solidity linters and fixed any issues (`npm run lint:fix`).
+-->

.github/PULL_REQUEST_TEMPLATE.md

@@ -34,6 +34,12 @@ 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.
 
+Before publishing on npm you need to generate the build artifacts. This is not done automatically at the moment because of a bug in Truffle. Since some of the contracts should not be included in the package, this is a _hairy_ process that you need to do with care.
+
+1. Delete the `contracts/mocks` and `contracts/examples` directories.
+2. Run `truffle compile`. (Note that the Truffle process may never exit and you will have to interrupt it.)
+3. Recover the directories using `git checkout`. It doesn't matter if you do this now or later.
+
 Once the CI run for the new tag is green, publish on npm under the `next` tag.
 
 ```
@@ -62,6 +68,12 @@ 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.
 
+Before publishing on npm you need to generate the build artifacts. This is not done automatically at the moment because of a bug in Truffle. Since some of the contracts should not be included in the package, this is a _hairy_ process that you need to do with care.
+
+1. Delete the `contracts/mocks` and `contracts/examples` directories.
+2. Run `truffle compile`. (Note that the Truffle process may never exit and you will have to interrupt it.)
+3. Recover the directories using `git checkout`. It doesn't matter if you do this now or later.
+
 Once the CI run for the new tag is green, publish on npm.
 
 ```

RELEASING.md

@@ -8,24 +8,25 @@ import "../ownership/Ownable.sol";
  * @dev This bounty will pay out to a researcher if they break invariant logic of the contract.
  */
 contract BreakInvariantBounty is PullPayment, Ownable {
-  bool private _claimed;
+  bool private _claimable = true;
   mapping(address => address) private _researchers;
 
   event TargetCreated(address createdAddress);
+  event BountyCanceled();
 
   /**
    * @dev Fallback function allowing the contract to receive funds, if they haven't already been claimed.
    */
   function() external payable {
-    require(!_claimed);
+    require(_claimable);
   }
 
   /**
-   * @dev Determine if the bounty was claimed.
-   * @return true if the bounty was claimed, false otherwise.
+   * @dev Determine if the bounty is claimable.
+   * @return false if the bounty was claimed, true otherwise.
    */
-  function claimed() public view returns(bool) {
-    return _claimed;
+  function claimable() public view returns(bool) {
+    return _claimable;
   }
 
   /**
@@ -45,19 +46,23 @@ contract BreakInvariantBounty is PullPayment, Ownable {
    * @param target contract
    */
   function claim(Target target) public {
+    require(_claimable);
     address researcher = _researchers[target];
     require(researcher != address(0));
     // Check Target contract invariants
     require(!target.checkInvariant());
     _asyncTransfer(researcher, address(this).balance);
-    _claimed = true;
+    _claimable = false;
   }
 
   /**
-   * @dev Transfers the current balance to the owner and terminates the contract.
+   * @dev Cancels the bounty and transfers all funds to the owner
    */
-  function destroy() public onlyOwner {
-    selfdestruct(owner());
+  function cancelBounty() public onlyOwner{
+    require(_claimable);
+    _asyncTransfer(owner(), address(this).balance);
+    _claimable = false;
+    emit BountyCanceled();
   }
 
   /**

contracts/bounties/BreakInvariantBounty.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/ArraysImpl.sol

@@ -2,14 +2,17 @@ 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 ERC721Mock
+ * @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, ERC721Burnable {
+contract ERC721FullMock
+  is ERC721Full, ERC721Mintable, ERC721MetadataMintable, ERC721Burnable {
+
   constructor(string name, string symbol) public
     ERC721Mintable()
     ERC721Full(name, symbol)

contracts/mocks/ERC721FullMock.sol

@@ -2,13 +2,14 @@ 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, ERC721Burnable {
+  is ERC721Full, ERC721Mintable, ERC721MetadataMintable, ERC721Burnable {
 
   constructor()
     ERC721Mintable()

contracts/mocks/ERC721MintableBurnableImpl.sol

@@ -1,15 +1,14 @@
 pragma solidity ^0.4.24;
 
 import "./ConditionalEscrow.sol";
-import "../ownership/Secondary.sol";
 
 /**
  * @title RefundEscrow
  * @dev Escrow that holds funds for a beneficiary, deposited from multiple parties.
  * The primary account may close the deposit period, and allow for either withdrawal
  * by the beneficiary, or refunds to the depositors.
  */
-contract RefundEscrow is Secondary, ConditionalEscrow {
+contract RefundEscrow is ConditionalEscrow {
   enum State { Active, Refunding, Closed }
 
   event Closed();

contracts/mocks/ForceEther.sol

@@ -168,44 +168,44 @@ contract ERC20 is IERC20 {
    * an account. This encapsulates the modification of balances such that the
    * proper events are emitted.
    * @param account The account that will receive the created tokens.
-   * @param amount The amount that will be created.
+   * @param value The amount that will be created.
    */
-  function _mint(address account, uint256 amount) internal {
+  function _mint(address account, uint256 value) internal {
     require(account != 0);
-    _totalSupply = _totalSupply.add(amount);
-    _balances[account] = _balances[account].add(amount);
-    emit Transfer(address(0), account, amount);
+    _totalSupply = _totalSupply.add(value);
+    _balances[account] = _balances[account].add(value);
+    emit Transfer(address(0), account, value);
   }
 
   /**
    * @dev Internal function that burns an amount of the token of a given
    * account.
    * @param account The account whose tokens will be burnt.
-   * @param amount The amount that will be burnt.
+   * @param value The amount that will be burnt.
    */
-  function _burn(address account, uint256 amount) internal {
+  function _burn(address account, uint256 value) internal {
     require(account != 0);
-    require(amount <= _balances[account]);
+    require(value <= _balances[account]);
 
-    _totalSupply = _totalSupply.sub(amount);
-    _balances[account] = _balances[account].sub(amount);
-    emit Transfer(account, address(0), amount);
+    _totalSupply = _totalSupply.sub(value);
+    _balances[account] = _balances[account].sub(value);
+    emit Transfer(account, address(0), value);
   }
 
   /**
    * @dev Internal function that burns an amount of the token of a given
    * account, deducting from the sender's allowance for said account. Uses the
    * internal burn function.
    * @param account The account whose tokens will be burnt.
-   * @param amount The amount that will be burnt.
+   * @param value The amount that will be burnt.
    */
-  function _burnFrom(address account, uint256 amount) internal {
-    require(amount <= _allowed[account][msg.sender]);
+  function _burnFrom(address account, uint256 value) internal {
+    require(value <= _allowed[account][msg.sender]);
 
     // Should https://github.com/OpenZeppelin/zeppelin-solidity/issues/707 be accepted,
     // this function needs to emit an event with the updated approval.
     _allowed[account][msg.sender] = _allowed[account][msg.sender].sub(
-      amount);
-    _burn(account, amount);
+      value);
+    _burn(account, value);
   }
 }