Make contracts 4.24 compatible (#951)

* Make contracts 4.24 compatible
This commit is contained in:
artiebits
2018-06-13 20:34:32 +02:00
committed by Matt Condon
parent e1dc1411fc
commit 5daaf60d11
112 changed files with 1767 additions and 1854 deletions

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
/**

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./payment/PullPayment.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
/**
@ -69,8 +69,7 @@ library ECRecovery {
// 32 is the length in bytes of hash,
// enforced by the type signature above
return keccak256(
"\x19Ethereum Signed Message:\n32",
hash
abi.encodePacked("\x19Ethereum Signed Message:\n32", hash)
);
}
}

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
/**

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
/*
@ -30,10 +30,10 @@ library MerkleProof {
if (computedHash < proofElement) {
// Hash(current computed hash + current element of the proof)
computedHash = keccak256(computedHash, proofElement);
computedHash = keccak256(abi.encodePacked(computedHash, proofElement));
} else {
// Hash(current element of the proof + current computed hash)
computedHash = keccak256(proofElement, computedHash);
computedHash = keccak256(abi.encodePacked(proofElement, computedHash));
}
}

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
/**

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../ownership/Ownable.sol";
import "../ownership/rbac/RBAC.sol";
@ -16,7 +16,7 @@ import "../ECRecovery.sol";
* @dev
* @dev This technique is useful for whitelists and airdrops; instead of putting all
* @dev valid addresses on-chain, simply sign a grant of the form
* @dev keccak256(`:contractAddress` + `:granteeAddress`) using a valid bouncer address.
* @dev keccak256(abi.encodePacked(`:contractAddress` + `:granteeAddress`)) using a valid bouncer address.
* @dev Then restrict access to your crowdsale/whitelist/airdrop using the
* @dev `onlyValidSignature` modifier (or implement your own using isValidSignature).
* @dev
@ -99,7 +99,7 @@ contract SignatureBouncer is Ownable, RBAC {
returns (bool)
{
return isValidDataHash(
keccak256(address(this), _address),
keccak256(abi.encodePacked(address(this), _address)),
_sig
);
}
@ -118,7 +118,7 @@ contract SignatureBouncer is Ownable, RBAC {
data[i] = msg.data[i];
}
return isValidDataHash(
keccak256(address(this), _address, data),
keccak256(abi.encodePacked(address(this), _address, data)),
_sig
);
}
@ -139,7 +139,7 @@ contract SignatureBouncer is Ownable, RBAC {
data[i] = msg.data[i];
}
return isValidDataHash(
keccak256(address(this), _address, data),
keccak256(abi.encodePacked(address(this), _address, data)),
_sig
);
}

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../ownership/Ownable.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/ERC20.sol";
import "../math/SafeMath.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../../math/SafeMath.sol";
import "../../ownership/Ownable.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../validation/TimedCrowdsale.sol";
import "../../token/ERC20/ERC20.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../../math/SafeMath.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../../../math/SafeMath.sol";
import "../../../ownership/Ownable.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../Crowdsale.sol";
import "../../token/ERC20/ERC20.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../Crowdsale.sol";
import "../../token/ERC20/MintableToken.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../validation/TimedCrowdsale.sol";
import "../../math/SafeMath.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../../math/SafeMath.sol";
import "../Crowdsale.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../../math/SafeMath.sol";
import "../Crowdsale.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../../math/SafeMath.sol";
import "../Crowdsale.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../Crowdsale.sol";
import "../../ownership/Ownable.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../ownership/rbac/RBAC.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../crowdsale/validation/CappedCrowdsale.sol";
import "../crowdsale/distribution/RefundableCrowdsale.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../ownership/Heritable.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/StandardToken.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
/**

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./ERC165.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../ownership/Ownable.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../ownership/Ownable.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../ownership/Ownable.sol";
import "../token/ERC20/ERC20Basic.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
/**

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
/**

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/ERC20.sol";
import "../crowdsale/emission/AllowanceCrowdsale.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/BasicToken.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../access/SignatureBouncer.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/BurnableToken.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/ERC20.sol";
import "../crowdsale/validation/CappedCrowdsale.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/StandardToken.sol";
import "../token/ERC20/DetailedERC20.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../ECRecovery.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/BasicToken.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC721/ERC721BasicToken.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC721/ERC721Receiver.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC721/ERC721Token.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC827/ERC827Token.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/MintableToken.sol";
import "../crowdsale/distribution/FinalizableCrowdsale.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
// @title Force Ether into a contract.

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../../contracts/ownership/HasNoEther.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../crowdsale/price/IncreasingPriceCrowdsale.sol";
import "../math/SafeMath.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/ERC20.sol";
import "../crowdsale/validation/IndividuallyCappedCrowdsale.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import {Bounty, Target} from "../../contracts/Bounty.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../LimitBalance.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../../contracts/math/Math.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import { MerkleProof } from "../MerkleProof.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
contract MessageHelper {

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/MintableToken.sol";
import "../crowdsale/emission/MintedCrowdsale.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../lifecycle/Pausable.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/PausableToken.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/ERC20.sol";
import "../crowdsale/distribution/PostDeliveryCrowdsale.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../payment/PullPayment.sol";

View File

@ -1,13 +1,13 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/RBACMintableToken.sol";
import "../token/ERC20/CappedToken.sol";
contract RBACCappedTokenMock is CappedToken, RBACMintableToken {
constructor(
constructor(
uint256 _cap
)
)
CappedToken(_cap)
public
{}
}
}

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../examples/RBACWithAdmin.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
contract ReentrancyAttack {

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../ReentrancyGuard.sol";
import "./ReentrancyAttack.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/MintableToken.sol";
import "../crowdsale/distribution/RefundableCrowdsale.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/ERC20.sol";
import "../token/ERC20/SafeERC20.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../math/SafeMath.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import {Bounty, Target} from "../../contracts/Bounty.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/StandardBurnableToken.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/StandardToken.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../introspection/SupportsInterfaceWithLookup.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/ERC20.sol";
import "../crowdsale/validation/TimedCrowdsale.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../access/Whitelist.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../token/ERC20/ERC20.sol";
import "../crowdsale/validation/WhitelistedCrowdsale.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./Ownable.sol";
import "../token/ERC20/ERC20Basic.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./Ownable.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./Ownable.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./Claimable.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./Ownable.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./Ownable.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./CanReclaimToken.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./Ownable.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./HasNoEther.sol";
import "./HasNoTokens.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
/**

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./Ownable.sol";
@ -7,9 +7,9 @@ import "./rbac/RBAC.sol";
/**
* @title Superuser
* @dev The Superuser contract defines a single superuser who can transfer the ownership
* @dev of a contract to a new address, even if he is not the owner.
* @dev A superuser can transfer his role to a new address.
* @dev The Superuser contract defines a single superuser who can transfer the ownership
* @dev of a contract to a new address, even if he is not the owner.
* @dev A superuser can transfer his role to a new address.
*/
contract Superuser is Ownable, RBAC {
string public constant ROLE_SUPERUSER = "superuser";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./Roles.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
/**

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../math/SafeMath.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "../math/SafeMath.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./ERC20Basic.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./BasicToken.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./MintableToken.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./ERC20.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./ERC20Basic.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
/**

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./StandardToken.sol";
import "../../ownership/Ownable.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./StandardToken.sol";
import "../../lifecycle/Pausable.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./MintableToken.sol";
import "../../ownership/rbac/RBAC.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./ERC20Basic.sol";
import "./ERC20.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./BurnableToken.sol";
import "./StandardToken.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./BasicToken.sol";
import "./ERC20.sol";

View File

@ -1,4 +1,4 @@
pragma solidity ^0.4.23;
pragma solidity ^0.4.24;
import "./SafeERC20.sol";

Some files were not shown because too many files have changed in this diff Show More