Merge branch 'release-v2.3.0'

Author: nventuro

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## 2.3.0 (unreleased)
+## 2.3.0 (2019-05-27)
 
 ### New features:
  * `ERC1820`: added support for interacting with the [ERC1820](https://eips.ethereum.org/EIPS/eip-1820) registry contract (`IERC1820Registry`), as well as base contracts that can be registered as implementers there. ([#1677](https://github.com/OpenZeppelin/openzeppelin-solidity/pull/1677))

contracts/token/ERC777/ERC777.sol

@@ -122,7 +122,7 @@ contract ERC777 is IERC777, IERC20 {
     }
 
     /**
-     * @dev Returns the amount of tokens owned by an account (`owner`).
+     * @dev Returns the amount of tokens owned by an account (`tokenHolder`).
      */
     function balanceOf(address tokenHolder) public view returns (uint256) {
         return _balances[tokenHolder];
@@ -252,8 +252,8 @@ contract ERC777 is IERC777, IERC20 {
      * not have allowance, and accounts with allowance may not be operators
      * themselves.
      */
-    function allowance(address owner, address spender) public view returns (uint256) {
-        return _allowances[owner][spender];
+    function allowance(address holder, address spender) public view returns (uint256) {
+        return _allowances[holder][spender];
     }
 
     /**
@@ -262,7 +262,8 @@ contract ERC777 is IERC777, IERC20 {
      * Note that accounts cannot have allowance issued by their operators.
      */
     function approve(address spender, uint256 value) external returns (bool) {
-        _approve(msg.sender, spender, value);
+        address holder = msg.sender;
+        _approve(holder, spender, value);
         return true;
     }
 
@@ -275,18 +276,18 @@ contract ERC777 is IERC777, IERC20 {
     *
     * Emits `Sent` and `Transfer` events.
     */
-    function transferFrom(address sender, address recipient, uint256 amount) external returns (bool) {
+    function transferFrom(address holder, address recipient, uint256 amount) external returns (bool) {
         require(recipient != address(0), "ERC777: transfer to the zero address");
-        require(sender != address(0), "ERC777: transfer from the zero address");
+        require(holder != address(0), "ERC777: transfer from the zero address");
 
-        address operator = msg.sender;
+        address spender = msg.sender;
 
-        _callTokensToSend(operator, sender, recipient, amount, "", "");
+        _callTokensToSend(spender, holder, recipient, amount, "", "");
 
-        _move(operator, sender, recipient, amount, "", "");
-        _approve(sender, operator, _allowances[sender][operator].sub(amount));
+        _move(spender, holder, recipient, amount, "", "");
+        _approve(holder, spender, _allowances[holder][spender].sub(amount));
 
-        _callTokensReceived(operator, sender, recipient, amount, "", "", false);
+        _callTokensReceived(spender, holder, recipient, amount, "", "", false);
 
         return true;
     }
@@ -406,14 +407,14 @@ contract ERC777 is IERC777, IERC20 {
         emit Transfer(from, to, amount);
     }
 
-    function _approve(address owner, address spender, uint256 value) private {
+    function _approve(address holder, address spender, uint256 value) private {
         // TODO: restore this require statement if this function becomes internal, or is called at a new callsite. It is
         // currently unnecessary.
-        //require(owner != address(0), "ERC777: approve from the zero address");
+        //require(holder != address(0), "ERC777: approve from the zero address");
         require(spender != address(0), "ERC777: approve to the zero address");
 
-        _allowances[owner][spender] = value;
-        emit Approval(owner, spender, value);
+        _allowances[holder][spender] = value;
+        emit Approval(holder, spender, value);
     }
 
     /**

contracts/token/ERC777/IERC777.sol

@@ -59,7 +59,7 @@ interface IERC777 {
     function send(address recipient, uint256 amount, bytes calldata data) external;
 
     /**
-     * @dev Destoys `amount` tokens from the caller's account, reducing the
+     * @dev Destroys `amount` tokens from the caller's account, reducing the
      * total supply.
      *
      * If a send hook is registered for the caller, the corresponding function
@@ -114,7 +114,7 @@ interface IERC777 {
      * them.
      *
      * This list is immutable, but individual holders may revoke these via
-     *`revokeOperator`, in which case `isOperatorFor` will return false.
+     * `revokeOperator`, in which case `isOperatorFor` will return false.
      */
     function defaultOperators() external view returns (address[] memory);
 

ethpm.json

@@ -1,6 +1,6 @@
 {
   "package_name": "zeppelin",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Secure Smart Contract library for Solidity",
   "authors": [
     "OpenZeppelin Community <[email protected]>"

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "openzeppelin-solidity",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Secure Smart Contract library for Solidity",
   "files": [
     "build",
@@ -59,7 +59,7 @@
     "ganache-cli-coverage": "https://github.com/frangio/ganache-cli/releases/download/v6.4.1-coverage/ganache-cli-coverage-6.4.1.tgz",
     "micromatch": "^4.0.2",
     "nodemon": "^1.19.0",
-    "openzeppelin-docsite": "github:OpenZeppelin/openzeppelin-docsite#22388b7a891a6fcdd333efef9e4f7f584ae5b826",
+    "openzeppelin-docsite": "github:OpenZeppelin/openzeppelin-docsite#ee1df82d52ad3df4337b20392627975091f8d5b3",
     "openzeppelin-test-helpers": "^0.4",
     "solhint": "^1.5.0",
     "solidity-coverage": "github:rotcivegaf/solidity-coverage#5875f5b7bc74d447f3312c9c0e9fc7814b482477",

package.json

@@ -88,7 +88,7 @@ elif [[ "$*" == "rc" ]]; then
   assert_current_branch "$(current_release_branch)"
 
   # Bumps rc number, commits and tags
-  npm version prelease
+  npm version prerelease
 
   push_and_publish next