From e43f8e522878e7a6901bd56edadf8dc8c206066d Mon Sep 17 00:00:00 2001 From: Ricardo Guilherme Schmidt <3esmit@gmail.com> Date: Wed, 5 Sep 2018 22:05:38 -0300 Subject: [PATCH] Contracts maintaince --- contracts/common/Controlled.sol | 2 +- contracts/common/MessageSigned.sol | 4 ++-- contracts/common/Owned.sol | 2 +- contracts/common/SafeMath.sol | 2 +- contracts/ens/ENS.sol | 2 +- contracts/ens/ENSRegistry.sol | 6 +++--- contracts/ens/PublicResolver.sol | 20 ++++++++++---------- contracts/ens/ResolverInterface.sol | 2 +- contracts/token/ApproveAndCallFallBack.sol | 2 +- contracts/token/ERC20Receiver.sol | 2 +- contracts/token/ERC20Token.sol | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/contracts/common/Controlled.sol b/contracts/common/Controlled.sol index 7b615b6..1080223 100644 --- a/contracts/common/Controlled.sol +++ b/contracts/common/Controlled.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.23; +pragma solidity ^0.4.24; contract Controlled { /// @notice The address of the controller is the only address that can call diff --git a/contracts/common/MessageSigned.sol b/contracts/common/MessageSigned.sol index 95d2f14..ba112f1 100644 --- a/contracts/common/MessageSigned.sol +++ b/contracts/common/MessageSigned.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.21; +pragma solidity ^0.4.24; /** * @notice Uses ethereum signed messages @@ -18,8 +18,8 @@ contract MessageSigned { bytes32 _signHash, bytes _messageSignature ) - pure internal + pure returns(address) { uint8 v; diff --git a/contracts/common/Owned.sol b/contracts/common/Owned.sol index 18f03e7..2e78af6 100644 --- a/contracts/common/Owned.sol +++ b/contracts/common/Owned.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.23; +pragma solidity ^0.4.24; /// @dev `Owned` is a base level contract that assigns an `owner` that can be /// later changed diff --git a/contracts/common/SafeMath.sol b/contracts/common/SafeMath.sol index 0b5602d..06a62d9 100644 --- a/contracts/common/SafeMath.sol +++ b/contracts/common/SafeMath.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.23; +pragma solidity ^0.4.24; /** * Math operations with safety checks diff --git a/contracts/ens/ENS.sol b/contracts/ens/ENS.sol index 52db24e..1785f56 100644 --- a/contracts/ens/ENS.sol +++ b/contracts/ens/ENS.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.21; +pragma solidity ^0.4.24; interface ENS { diff --git a/contracts/ens/ENSRegistry.sol b/contracts/ens/ENSRegistry.sol index d70d225..d849b41 100644 --- a/contracts/ens/ENSRegistry.sol +++ b/contracts/ens/ENSRegistry.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.18; +pragma solidity ^0.4.24; import "./ENS.sol"; @@ -44,7 +44,7 @@ contract ENSRegistry is ENS { * @param owner The address of the new owner. */ function setSubnodeOwner(bytes32 node, bytes32 label, address owner) public only_owner(node) { - bytes32 subnode = keccak256(node, label); + bytes32 subnode = keccak256(abi.encodePacked(node, label)); emit NewOwner(node, label, owner); records[subnode].owner = owner; } @@ -55,7 +55,7 @@ contract ENSRegistry is ENS { * @param resolver The address of the resolver. */ function setResolver(bytes32 node, address resolver) public only_owner(node) { - emit NewResolver(node, resolver); + emit NewResolver(node, resolver); records[node].resolver = resolver; } diff --git a/contracts/ens/PublicResolver.sol b/contracts/ens/PublicResolver.sol index 1d02357..b89b555 100644 --- a/contracts/ens/PublicResolver.sol +++ b/contracts/ens/PublicResolver.sol @@ -1,6 +1,6 @@ -pragma solidity ^0.4.18; +pragma solidity ^0.4.24; -import './ENS.sol'; +import "./ENS.sol"; /** * A simple resolver anyone can use; only allows the owner of a node to set its @@ -53,7 +53,7 @@ contract PublicResolver { * Constructor. * @param ensAddr The ENS registrar contract. */ - function PublicResolver(ENS ensAddr) public { + constructor(ENS ensAddr) public { ens = ensAddr; } @@ -65,7 +65,7 @@ contract PublicResolver { */ function setAddr(bytes32 node, address addr) public only_owner(node) { records[node].addr = addr; - AddrChanged(node, addr); + emit AddrChanged(node, addr); } /** @@ -78,7 +78,7 @@ contract PublicResolver { */ function setContent(bytes32 node, bytes32 hash) public only_owner(node) { records[node].content = hash; - ContentChanged(node, hash); + emit ContentChanged(node, hash); } /** @@ -89,7 +89,7 @@ contract PublicResolver { */ function setMultihash(bytes32 node, bytes hash) public only_owner(node) { records[node].multihash = hash; - MultihashChanged(node, hash); + emit MultihashChanged(node, hash); } /** @@ -100,7 +100,7 @@ contract PublicResolver { */ function setName(bytes32 node, string name) public only_owner(node) { records[node].name = name; - NameChanged(node, name); + emit NameChanged(node, name); } /** @@ -116,7 +116,7 @@ contract PublicResolver { require(((contentType - 1) & contentType) == 0); records[node].abis[contentType] = data; - ABIChanged(node, contentType); + emit ABIChanged(node, contentType); } /** @@ -127,7 +127,7 @@ contract PublicResolver { */ function setPubkey(bytes32 node, bytes32 x, bytes32 y) public only_owner(node) { records[node].pubkey = PublicKey(x, y); - PubkeyChanged(node, x, y); + emit PubkeyChanged(node, x, y); } /** @@ -139,7 +139,7 @@ contract PublicResolver { */ function setText(bytes32 node, string key, string value) public only_owner(node) { records[node].text[key] = value; - TextChanged(node, key, key); + emit TextChanged(node, key, key); } /** diff --git a/contracts/ens/ResolverInterface.sol b/contracts/ens/ResolverInterface.sol index 006bf20..2139672 100644 --- a/contracts/ens/ResolverInterface.sol +++ b/contracts/ens/ResolverInterface.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.18; +pragma solidity ^0.4.24; contract ResolverInterface { function PublicResolver(address ensAddr) public; diff --git a/contracts/token/ApproveAndCallFallBack.sol b/contracts/token/ApproveAndCallFallBack.sol index f348786..60f8070 100644 --- a/contracts/token/ApproveAndCallFallBack.sol +++ b/contracts/token/ApproveAndCallFallBack.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.11; +pragma solidity ^0.4.24; contract ApproveAndCallFallBack { function receiveApproval(address from, uint256 _amount, address _token, bytes _data) public; diff --git a/contracts/token/ERC20Receiver.sol b/contracts/token/ERC20Receiver.sol index 9a6af70..3c90f8c 100644 --- a/contracts/token/ERC20Receiver.sol +++ b/contracts/token/ERC20Receiver.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.23; +pragma solidity ^0.4.24; import "./ERC20Token.sol"; diff --git a/contracts/token/ERC20Token.sol b/contracts/token/ERC20Token.sol index ff8de15..ee9d018 100644 --- a/contracts/token/ERC20Token.sol +++ b/contracts/token/ERC20Token.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.23; +pragma solidity ^0.4.24; // Abstract contract for the full ERC 20 Token standard // https://github.com/ethereum/EIPs/issues/20