Commit bc7ba69f by Nicolás Venturo

Removed Initializable, now using zos-lib's.

parent 423c6523
pragma solidity ^0.4.24;
/**
* @title Initializable
*
* @dev Helper contract to support initializer functions. To use it, replace
* the constructor with a function that has the `initializer` modifier.
* WARNING: Unlike constructors, initializer functions must be manually
* invoked. This applies both to deploying an Initializable contract, as well
* as extending an Initializable contract via inheritance.
* WARNING: When used with inheritance, manual care must be taken to not invoke
* a parent initializer twice, because this is not dealt with automatically as
* with constructors.
*/
contract Initializable {
/**
* @dev Indicates that the contract has been initialized.
*/
bool private initialized;
/**
* @dev Indicates that the contract is in the process of being initialized.
*/
bool private initializing;
/**
* @dev Modifier to use in the initializer function of a contract.
*/
modifier initializer() {
require(initializing || isConstructor() || !initialized, "Contract instance has already been initialized");
bool wasInitializing = initializing;
initializing = true;
initialized = true;
_;
initializing = wasInitializing;
}
/// @dev Returns true if and only if the function is running in the constructor
function isConstructor() private view returns (bool) {
uint cs;
assembly { cs := extcodesize(address) }
return cs == 0;
}
}
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../Roles.sol"; import "../Roles.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../Roles.sol"; import "../Roles.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../Roles.sol"; import "../Roles.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../Roles.sol"; import "../Roles.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../token/ERC20/IERC20.sol"; import "../token/ERC20/IERC20.sol";
import "../math/SafeMath.sol"; import "../math/SafeMath.sol";
import "../token/ERC20/SafeERC20.sol"; import "../token/ERC20/SafeERC20.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
import "../validation/TimedCrowdsale.sol"; import "../validation/TimedCrowdsale.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../validation/TimedCrowdsale.sol"; import "../validation/TimedCrowdsale.sol";
import "../../token/ERC20/IERC20.sol"; import "../../token/ERC20/IERC20.sol";
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
import "./FinalizableCrowdsale.sol"; import "./FinalizableCrowdsale.sol";
import "../../payment/RefundEscrow.sol"; import "../../payment/RefundEscrow.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../Crowdsale.sol"; import "../Crowdsale.sol";
import "../../token/ERC20/IERC20.sol"; import "../../token/ERC20/IERC20.sol";
import "../../token/ERC20/SafeERC20.sol"; import "../../token/ERC20/SafeERC20.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../Crowdsale.sol"; import "../Crowdsale.sol";
import "../../token/ERC20/ERC20Mintable.sol"; import "../../token/ERC20/ERC20Mintable.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../validation/TimedCrowdsale.sol"; import "../validation/TimedCrowdsale.sol";
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
import "../Crowdsale.sol"; import "../Crowdsale.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
import "../Crowdsale.sol"; import "../Crowdsale.sol";
import "../../access/roles/CapperRole.sol"; import "../../access/roles/CapperRole.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
import "../Crowdsale.sol"; import "../Crowdsale.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../../token/ERC20/IERC20.sol"; import "../../token/ERC20/IERC20.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../token/ERC20/IERC20.sol"; import "../token/ERC20/IERC20.sol";
import "../token/ERC20/ERC20Mintable.sol"; import "../token/ERC20/ERC20Mintable.sol";
import "../token/ERC20/SafeERC20.sol"; import "../token/ERC20/SafeERC20.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../access/roles/SignerRole.sol"; import "../access/roles/SignerRole.sol";
import "../cryptography/ECDSA.sol"; import "../cryptography/ECDSA.sol";
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../token/ERC20/SafeERC20.sol"; import "../token/ERC20/SafeERC20.sol";
import "../ownership/Ownable.sol"; import "../ownership/Ownable.sol";
import "../math/SafeMath.sol"; import "../math/SafeMath.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../crowdsale/validation/CappedCrowdsale.sol"; import "../crowdsale/validation/CappedCrowdsale.sol";
import "../crowdsale/distribution/RefundableCrowdsale.sol"; import "../crowdsale/distribution/RefundableCrowdsale.sol";
import "../crowdsale/emission/MintedCrowdsale.sol"; import "../crowdsale/emission/MintedCrowdsale.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../token/ERC20/ERC20.sol"; import "../token/ERC20/ERC20.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./IERC165.sol"; import "./IERC165.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../access/roles/PauserRole.sol"; import "../access/roles/PauserRole.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
/** /**
* @title Ownable * @title Ownable
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
/** /**
* @title Secondary * @title Secondary
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./Escrow.sol"; import "./Escrow.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../math/SafeMath.sol"; import "../math/SafeMath.sol";
import "../ownership/Secondary.sol"; import "../ownership/Secondary.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./Escrow.sol"; import "./Escrow.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./ConditionalEscrow.sol"; import "./ConditionalEscrow.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../math/SafeMath.sol"; import "../math/SafeMath.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./IERC20.sol"; import "./IERC20.sol";
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./ERC20.sol"; import "./ERC20.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./ERC20Mintable.sol"; import "./ERC20Mintable.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./IERC20.sol"; import "./IERC20.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./ERC20.sol"; import "./ERC20.sol";
import "../../access/roles/MinterRole.sol"; import "../../access/roles/MinterRole.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./ERC20.sol"; import "./ERC20.sol";
import "../../lifecycle/Pausable.sol"; import "../../lifecycle/Pausable.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./SafeERC20.sol"; import "./SafeERC20.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./IERC721.sol"; import "./IERC721.sol";
import "./IERC721Receiver.sol"; import "./IERC721Receiver.sol";
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./ERC721.sol"; import "./ERC721.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./IERC721Enumerable.sol"; import "./IERC721Enumerable.sol";
import "./ERC721.sol"; import "./ERC721.sol";
import "../../introspection/ERC165.sol"; import "../../introspection/ERC165.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./ERC721.sol"; import "./ERC721.sol";
import "./ERC721Enumerable.sol"; import "./ERC721Enumerable.sol";
import "./ERC721Metadata.sol"; import "./ERC721Metadata.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./IERC721Receiver.sol"; import "./IERC721Receiver.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./ERC721.sol"; import "./ERC721.sol";
import "./IERC721Metadata.sol"; import "./IERC721Metadata.sol";
import "../../introspection/ERC165.sol"; import "../../introspection/ERC165.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./ERC721Metadata.sol"; import "./ERC721Metadata.sol";
import "../../access/roles/MinterRole.sol"; import "../../access/roles/MinterRole.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./ERC721.sol"; import "./ERC721.sol";
import "../../access/roles/MinterRole.sol"; import "../../access/roles/MinterRole.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./ERC721.sol"; import "./ERC721.sol";
import "../../lifecycle/Pausable.sol"; import "../../lifecycle/Pausable.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "../../introspection/IERC165.sol"; import "../../introspection/IERC165.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./IERC721.sol"; import "./IERC721.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./IERC721.sol"; import "./IERC721.sol";
import "./IERC721Enumerable.sol"; import "./IERC721Enumerable.sol";
import "./IERC721Metadata.sol"; import "./IERC721Metadata.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
import "./IERC721.sol"; import "./IERC721.sol";
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol"; import "zos-lib/contracts/Initializable.sol";
/** /**
* @title Helps contracts guard against reentrancy attacks. * @title Helps contracts guard against reentrancy attacks.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment