status-im
/
open-bounty
mirror of https://github.com/status-im/open-bounty.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #162 from 3esmit/warning-fix 

fix warnings in contracts
This commit is contained in:
Teemu Patja 2017-11-10 08:56:41 +02:00 committed by GitHub
parent 2b4d2d7308 a76a8ee402
commit dca9b39bdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contracts/DelegatedCall.sol
View File

@ -41,6 +41,7 @@ contract DelegatedCall {
*/ */
function _malloc(uint size) function _malloc(uint size)
internal internal
pure
returns(bytes32 ptr) returns(bytes32 ptr)
{ {
assembly { assembly {

6
contracts/MultiSigTokenWalletV1.sol
View File

@ -52,6 +52,7 @@ contract MultiSigTokenWalletV1 is MultiSigWallet {
* @param _tokenAddr the token contract address * @param _tokenAddr the token contract address
**/ **/
function watch(address _tokenAddr) function watch(address _tokenAddr)
public
ownerExists(msg.sender) ownerExists(msg.sender)
{ {
uint oldBal = tokenBalances[_tokenAddr]; uint oldBal = tokenBalances[_tokenAddr];
@ -68,6 +69,7 @@ contract MultiSigTokenWalletV1 is MultiSigWallet {
} }
function setTokenList(address[] _tokenList) function setTokenList(address[] _tokenList)
public
onlyWallet onlyWallet
{ {
tokens = _tokenList; tokens = _tokenList;
@ -91,7 +93,9 @@ contract MultiSigTokenWalletV1 is MultiSigWallet {
* @param _token the token contract address * @param _token the token contract address
* @param _data (might be used by child classes) * @param _data (might be used by child classes)
*/ */
function receiveApproval(address _from, uint256 _amount, address _token, bytes _data) { function receiveApproval(address _from, uint256 _amount, address _token, bytes _data)
public
{
deposit(_from, _amount, _token, _data); deposit(_from, _amount, _token, _data);
} }

29
contracts/TokenReg.sol
View File

@ -2,7 +2,7 @@
//! By Gav Wood (Ethcore), 2016. //! By Gav Wood (Ethcore), 2016.
//! Released under the Apache Licence 2. //! Released under the Apache Licence 2.
pragma solidity ^0.4.0; pragma solidity ^0.4.18;
// From Owned.sol // From Owned.sol
contract Owned { contract Owned {
@ -10,7 +10,7 @@ contract Owned {
event NewOwner(address indexed old, address indexed current); event NewOwner(address indexed old, address indexed current);
function setOwner(address _new) only_owner { NewOwner(owner, _new); owner = _new; } function setOwner(address _new) public only_owner { NewOwner(owner, _new); owner = _new; }
address public owner = msg.sender; address public owner = msg.sender;
} }
@ -36,11 +36,11 @@ contract TokenReg is Owned {
event Unregistered(string indexed tla, uint indexed id); event Unregistered(string indexed tla, uint indexed id);
event MetaChanged(uint indexed id, bytes32 indexed key, bytes32 value); event MetaChanged(uint indexed id, bytes32 indexed key, bytes32 value);
function register(address _addr, string _tla, uint _base, string _name) payable returns (bool) { function register(address _addr, string _tla, uint _base, string _name) public payable returns (bool) {
return registerAs(_addr, _tla, _base, _name, msg.sender); return registerAs(_addr, _tla, _base, _name, msg.sender);
} }
function registerAs(address _addr, string _tla, uint _base, string _name, address _owner) payable when_fee_paid when_address_free(_addr) when_is_tla(_tla) when_tla_free(_tla) returns (bool) { function registerAs(address _addr, string _tla, uint _base, string _name, address _owner) public payable when_fee_paid when_address_free(_addr) when_is_tla(_tla) when_tla_free(_tla) returns (bool) {
tokens.push(Token(_addr, _tla, _base, _name, _owner)); tokens.push(Token(_addr, _tla, _base, _name, _owner));
mapFromAddress[_addr] = tokens.length; mapFromAddress[_addr] = tokens.length;
mapFromTLA[_tla] = tokens.length; mapFromTLA[_tla] = tokens.length;
@ -48,19 +48,19 @@ contract TokenReg is Owned {
return true; return true;
} }
function unregister(uint _id) only_owner { function unregister(uint _id) public only_owner {
Unregistered(tokens[_id].tla, _id); Unregistered(tokens[_id].tla, _id);
delete mapFromAddress[tokens[_id].addr]; delete mapFromAddress[tokens[_id].addr];
delete mapFromTLA[tokens[_id].tla]; delete mapFromTLA[tokens[_id].tla];
delete tokens[_id]; delete tokens[_id];
} }
function setFee(uint _fee) only_owner { function setFee(uint _fee) public only_owner {
fee = _fee; fee = _fee;
} }
function tokenCount() constant returns (uint) { return tokens.length; } function tokenCount() public constant returns (uint) { return tokens.length; }
function token(uint _id) constant returns (address addr, string tla, uint base, string name, address owner) { function token(uint _id) public constant returns (address addr, string tla, uint base, string name, address owner) {
var t = tokens[_id]; var t = tokens[_id];
addr = t.addr; addr = t.addr;
tla = t.tla; tla = t.tla;
@ -69,7 +69,7 @@ contract TokenReg is Owned {
owner = t.owner; owner = t.owner;
} }
function fromAddress(address _addr) constant returns (uint id, string tla, uint base, string name, address owner) { function fromAddress(address _addr) public constant returns (uint id, string tla, uint base, string name, address owner) {
id = mapFromAddress[_addr] - 1; id = mapFromAddress[_addr] - 1;
var t = tokens[id]; var t = tokens[id];
tla = t.tla; tla = t.tla;
@ -78,7 +78,7 @@ contract TokenReg is Owned {
owner = t.owner; owner = t.owner;
} }
function fromTLA(string _tla) constant returns (uint id, address addr, uint base, string name, address owner) { function fromTLA(string _tla) public constant returns (uint id, address addr, uint base, string name, address owner) {
id = mapFromTLA[_tla] - 1; id = mapFromTLA[_tla] - 1;
var t = tokens[id]; var t = tokens[id];
addr = t.addr; addr = t.addr;
@ -87,18 +87,17 @@ contract TokenReg is Owned {
owner = t.owner; owner = t.owner;
} }
function meta(uint _id, bytes32 _key) constant returns (bytes32) { function meta(uint _id, bytes32 _key) public constant returns (bytes32) {
return tokens[_id].meta[_key]; return tokens[_id].meta[_key];
} }
function setMeta(uint _id, bytes32 _key, bytes32 _value) only_token_owner(_id) { function setMeta(uint _id, bytes32 _key, bytes32 _value) public only_token_owner(_id) {
tokens[_id].meta[_key] = _value; tokens[_id].meta[_key] = _value;
MetaChanged(_id, _key, _value); MetaChanged(_id, _key, _value);
} }
function drain() only_owner { function drain() public only_owner {
if (!msg.sender.send(this.balance)) require (msg.sender.send(this.balance));
throw;
} }
mapping (address => uint) mapFromAddress; mapping (address => uint) mapFromAddress;