ERC777 Update to solc 0.5.2 (OpenZeppelin#1159)

catageek · Mar 17, 2019 · 2582a2a · 2582a2a
1 parent 9965393
commit 2582a2a
Show file tree

Hide file tree

Showing 13 changed files with 98 additions and 94 deletions.
diff --git a/contracts/drafts/ERC777/ERC777.sol b/contracts/drafts/ERC777/ERC777.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.2;
 
 import "./ERC777Base.sol";
 
@@ -21,13 +21,13 @@ contract ERC777 is ERC777Base {
      * @param operatorData bytes extra information provided by the operator (if any)
      */
     constructor(
-        string name,
-        string symbol,
+        string memory name,
+        string memory symbol,
         uint256 granularity,
-        address[] defaultOperators,
+        address[] memory defaultOperators,
         uint256 initialSupply,
-        bytes data,
-        bytes operatorData
+        bytes memory data,
+        bytes memory operatorData
     )
     ERC777Base(
         name,

diff --git a/contracts/drafts/ERC777/ERC777Base.sol b/contracts/drafts/ERC777/ERC777Base.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.2;
 
 import "./IERC777.sol";
 import "./IERC777TokensRecipient.sol";
@@ -37,10 +37,10 @@ contract ERC777Base is IERC777, ERC1820Client {
     mapping(address => mapping(address => bool)) private _ops;
 
     constructor(
-        string name,
-        string symbol,
+        string memory name,
+        string memory symbol,
         uint256 granularity,
-        address[] defaultOperators
+        address[] memory defaultOperators
     ) internal {
         require(granularity > 0);
         _name = name;
@@ -67,7 +67,7 @@ contract ERC777Base is IERC777, ERC1820Client {
     function send(
         address to,
         uint256 amount,
-        bytes data
+        bytes calldata data
     ) external {
         _send(
             msg.sender,
@@ -91,8 +91,8 @@ contract ERC777Base is IERC777, ERC1820Client {
         address from,
         address to,
         uint256 amount,
-        bytes data,
-        bytes operatorData
+        bytes calldata data,
+        bytes calldata operatorData
     )
     external
     {
@@ -112,7 +112,7 @@ contract ERC777Base is IERC777, ERC1820Client {
     * @param amount uint256 amount of tokens to transfer
     * @param data bytes extra information provided by the token holder
      */
-    function burn(uint256 amount, bytes data) external {
+    function burn(uint256 amount, bytes calldata data) external {
         _burn(
             msg.sender, 
             msg.sender,
@@ -132,8 +132,8 @@ contract ERC777Base is IERC777, ERC1820Client {
     function operatorBurn(
         address from,
         uint256 amount,
-        bytes data,
-        bytes operatorData
+        bytes calldata data,
+        bytes calldata operatorData
     )
     external
     {
@@ -150,14 +150,14 @@ contract ERC777Base is IERC777, ERC1820Client {
     /**
     * @return the name of the token.
     */
-    function name() public view returns (string) {
+    function name() public view returns (string memory) {
         return _name;
     }
 
     /**
     * @return the symbol of the token.
     */
-    function symbol() public view returns (string) {
+    function symbol() public view returns (string memory) {
         return _symbol;
     }
 
@@ -191,7 +191,7 @@ contract ERC777Base is IERC777, ERC1820Client {
     * @dev Get the list of default operators as defined by the token contract.
     * @return address[] default operators
     */
-    function defaultOperators() public view returns (address[]) {
+    function defaultOperators() public view returns (address[] memory) {
         return _defaultOpsArray;
     }
 
@@ -246,8 +246,8 @@ contract ERC777Base is IERC777, ERC1820Client {
         address operator,
         address from,
         uint256 amount,
-        bytes data,
-        bytes operatorData
+        bytes memory data,
+        bytes memory operatorData
     )
     internal
     {
@@ -290,8 +290,8 @@ contract ERC777Base is IERC777, ERC1820Client {
         address operator,
         address to,
         uint256 amount,
-        bytes userData,
-        bytes operatorData
+        bytes memory userData,
+        bytes memory operatorData
     )
     internal
     {
@@ -373,8 +373,8 @@ contract ERC777Base is IERC777, ERC1820Client {
         address from,
         address to,
         uint256 amount,
-        bytes userData,
-        bytes operatorData
+        bytes memory userData,
+        bytes memory operatorData
     )
     private
     {
@@ -430,8 +430,8 @@ contract ERC777Base is IERC777, ERC1820Client {
         address from,
         address to,
         uint256 amount,
-        bytes userData,
-        bytes operatorData
+        bytes memory userData,
+        bytes memory operatorData
     )
     private
     {
@@ -464,8 +464,8 @@ contract ERC777Base is IERC777, ERC1820Client {
         address from,
         address to,
         uint256 amount,
-        bytes userData,
-        bytes operatorData
+        bytes memory userData,
+        bytes memory operatorData
     )
     private
     returns(bool)

diff --git a/contracts/drafts/ERC777/ERC777Burnable.sol b/contracts/drafts/ERC777/ERC777Burnable.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.2;
 
 import "./ERC777Base.sol";
 
@@ -15,7 +15,7 @@ contract ERC777Burnable is ERC777Base {
      * @param amount uint256 amount of tokens to transfer
      * @param data bytes data provided by the token holder
      */
-    function burn(uint256 amount, bytes data) external {
+    function burn(uint256 amount, bytes calldata data) external {
         _burn(
             msg.sender,
             msg.sender,
@@ -35,8 +35,8 @@ contract ERC777Burnable is ERC777Base {
     function operatorBurn(
         address from,
         uint256 amount,
-        bytes data,
-        bytes operatorData
+        bytes calldata data,
+        bytes calldata operatorData
     ) external {
         address holder = from == address(0) ? msg.sender : from;
         _burn(

diff --git a/contracts/drafts/ERC777/IERC777.sol b/contracts/drafts/ERC777/IERC777.sol
@@ -1,21 +1,21 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.2;
 
 /**
  * @title ERC777 interface
  * @dev see https://github.com/ethereum/EIPs/blob/master/EIPS/eip-777.md
  */
 interface IERC777 {
-    function name() external view returns (string);
+    function name() external view returns (string memory);
 
-    function symbol() external view returns (string);
+    function symbol() external view returns (string memory);
 
     function totalSupply() external view returns (uint256);
 
     function balanceOf(address owner) external view returns (uint256);
 
     function granularity() external view returns (uint256);
 
-    function defaultOperators() external view returns (address[]);
+    function defaultOperators() external view returns (address[] memory);
 
     function authorizeOperator(address operator) external;
 
@@ -26,23 +26,23 @@ interface IERC777 {
         address tokenHolder
     ) external view returns (bool);
 
-    function send(address to, uint256 amount, bytes data) external;
+    function send(address to, uint256 amount, bytes calldata data) external;
 
     function operatorSend(
         address from,
         address to,
         uint256 amount,
-        bytes data,
-        bytes operatorData
+        bytes calldata data,
+        bytes calldata operatorData
     ) external;
 
-    function burn(uint256 amount, bytes data) external;
+    function burn(uint256 amount, bytes calldata data) external;
 
     function operatorBurn(
         address from,
         uint256 amount,
-        bytes data,
-        bytes operatorData
+        bytes calldata data,
+        bytes calldata operatorData
     ) external;
 
     event Sent(

diff --git a/contracts/drafts/ERC777/IERC777TokensRecipient.sol b/contracts/drafts/ERC777/IERC777TokensRecipient.sol
@@ -1,16 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-// solhint-disable-next-line compiler-fixed
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.2;
 
 interface IERC777TokensRecipient {
     function tokensReceived(
         address operator,
         address from,
         address to,
         uint amount,
-        bytes userData,
-        bytes operatorData
+        bytes calldata userData,
+        bytes calldata operatorData
     ) external;
 }
diff --git a/contracts/drafts/ERC777/IERC777TokensSender.sol b/contracts/drafts/ERC777/IERC777TokensSender.sol
@@ -1,16 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-// solhint-disable-next-line compiler-fixed
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.2;
 
 interface IERC777TokensSender {
     function tokensToSend(
         address operator,
         address from,
         address to,
         uint amount,
-        bytes userData,
-        bytes operatorData
+        bytes calldata userData,
+        bytes calldata operatorData
     ) external;
 }
diff --git a/contracts/introspection/ERC1820Client.sol b/contracts/introspection/ERC1820Client.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.2;
 
 import "./IERC1820.sol";
 

diff --git a/contracts/introspection/IERC1820.sol b/contracts/introspection/IERC1820.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.2;
 
 /**
  * @title IERC1820
@@ -24,7 +24,7 @@ interface IERC1820 {
     function getManager(address _addr) external view returns(address);
 
     function interfaceHash(
-        string _interfaceName
+        string calldata _interfaceName
     ) external pure returns(bytes32);
 
     function updateERC165Cache(

diff --git a/contracts/mocks/ERC777ReceiverMock.sol b/contracts/mocks/ERC777ReceiverMock.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.2;
 
 import "../drafts/ERC777/IERC777TokensRecipient.sol";
 import "../introspection/ERC1820Client.sol";
@@ -44,8 +44,8 @@ contract ERC777ReceiverMock is IERC777TokensRecipient, ERC1820Client {
         address from,
         address to,
         uint256 amount,
-        bytes userData,
-        bytes operatorData
+        bytes calldata userData,
+        bytes calldata operatorData
     )
     external
     {

diff --git a/contracts/mocks/ERC777SenderMock.sol b/contracts/mocks/ERC777SenderMock.sol
@@ -1,4 +1,4 @@
-pragma solidity ^0.4.24;
+pragma solidity ^0.5.2;
 
 import "../drafts/ERC777/IERC777.sol";
 import "../drafts/ERC777/IERC777TokensSender.sol";
@@ -26,7 +26,11 @@ contract ERC777SenderMock is IERC777TokensSender, ERC1820Client {
         _erc777 = erc777;
         // register interface
         if (setInterface) {
-            setInterfaceImplementer(address(this), keccak256("ERC777TokensSender"), address(this));
+            setInterfaceImplementer(
+                address(this),
+                keccak256("ERC777TokensSender"),
+                address(this)
+            );
         }
     }
 
@@ -36,7 +40,11 @@ contract ERC777SenderMock is IERC777TokensSender, ERC1820Client {
      * @param amount uint256 amount of tokens to transfer
      * @param data bytes extra information provided by the token holder (if any)
      */
-    function sendTokens(address to, uint amount, bytes data) external {
+    function sendTokens(
+        address to,
+        uint amount,
+        bytes calldata data
+    ) external {
         IERC777(_erc777).send(to, amount, data);
     }
 
@@ -45,7 +53,7 @@ contract ERC777SenderMock is IERC777TokensSender, ERC1820Client {
      * @param amount uint256 amount of tokens to transfer
      * @param data bytes extra information provided by the token holder (if any)
      */
-    function burnTokens(uint amount, bytes data) external {
+    function burnTokens(uint amount, bytes calldata data) external {
         IERC777(_erc777).burn(amount, data);
     }
 
@@ -71,8 +79,8 @@ contract ERC777SenderMock is IERC777TokensSender, ERC1820Client {
         address from,
         address to,
         uint256 amount,
-        bytes userData,
-        bytes operatorData
+        bytes calldata userData,
+        bytes calldata operatorData
     )
     external
     {