diff --git a/contracts/Initializable.sol b/contracts/Initializable.sol deleted file mode 100644 index df1aa1e7b..000000000 --- a/contracts/Initializable.sol +++ /dev/null @@ -1,49 +0,0 @@ -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; - } -} diff --git a/contracts/access/roles/CapperRole.sol b/contracts/access/roles/CapperRole.sol index 47cb7f6fe..414accacd 100644 --- a/contracts/access/roles/CapperRole.sol +++ b/contracts/access/roles/CapperRole.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../Roles.sol"; diff --git a/contracts/access/roles/MinterRole.sol b/contracts/access/roles/MinterRole.sol index ad84d6457..fa365601c 100644 --- a/contracts/access/roles/MinterRole.sol +++ b/contracts/access/roles/MinterRole.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../Roles.sol"; diff --git a/contracts/access/roles/PauserRole.sol b/contracts/access/roles/PauserRole.sol index 68487a082..b78165d48 100644 --- a/contracts/access/roles/PauserRole.sol +++ b/contracts/access/roles/PauserRole.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../Roles.sol"; diff --git a/contracts/access/roles/SignerRole.sol b/contracts/access/roles/SignerRole.sol index ce67158ff..7ecb3f839 100644 --- a/contracts/access/roles/SignerRole.sol +++ b/contracts/access/roles/SignerRole.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../Roles.sol"; diff --git a/contracts/crowdsale/Crowdsale.sol b/contracts/crowdsale/Crowdsale.sol index 76d9e4c22..9e70125c7 100644 --- a/contracts/crowdsale/Crowdsale.sol +++ b/contracts/crowdsale/Crowdsale.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../token/ERC20/IERC20.sol"; import "../math/SafeMath.sol"; import "../token/ERC20/SafeERC20.sol"; diff --git a/contracts/crowdsale/distribution/FinalizableCrowdsale.sol b/contracts/crowdsale/distribution/FinalizableCrowdsale.sol index 8771c439b..05dc02501 100644 --- a/contracts/crowdsale/distribution/FinalizableCrowdsale.sol +++ b/contracts/crowdsale/distribution/FinalizableCrowdsale.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../../math/SafeMath.sol"; import "../validation/TimedCrowdsale.sol"; diff --git a/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol b/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol index b890e8af0..c1f9d9084 100644 --- a/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol +++ b/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../validation/TimedCrowdsale.sol"; import "../../token/ERC20/IERC20.sol"; import "../../math/SafeMath.sol"; diff --git a/contracts/crowdsale/distribution/RefundableCrowdsale.sol b/contracts/crowdsale/distribution/RefundableCrowdsale.sol index c55252347..1c811c537 100644 --- a/contracts/crowdsale/distribution/RefundableCrowdsale.sol +++ b/contracts/crowdsale/distribution/RefundableCrowdsale.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../../math/SafeMath.sol"; import "./FinalizableCrowdsale.sol"; import "../../payment/RefundEscrow.sol"; diff --git a/contracts/crowdsale/emission/AllowanceCrowdsale.sol b/contracts/crowdsale/emission/AllowanceCrowdsale.sol index abe9604f7..6f42d0373 100644 --- a/contracts/crowdsale/emission/AllowanceCrowdsale.sol +++ b/contracts/crowdsale/emission/AllowanceCrowdsale.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../Crowdsale.sol"; import "../../token/ERC20/IERC20.sol"; import "../../token/ERC20/SafeERC20.sol"; diff --git a/contracts/crowdsale/emission/MintedCrowdsale.sol b/contracts/crowdsale/emission/MintedCrowdsale.sol index 1c7d8eb0c..3d1b29052 100644 --- a/contracts/crowdsale/emission/MintedCrowdsale.sol +++ b/contracts/crowdsale/emission/MintedCrowdsale.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../Crowdsale.sol"; import "../../token/ERC20/ERC20Mintable.sol"; diff --git a/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol b/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol index 119f47d02..a7a2be829 100644 --- a/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol +++ b/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../validation/TimedCrowdsale.sol"; import "../../math/SafeMath.sol"; diff --git a/contracts/crowdsale/validation/CappedCrowdsale.sol b/contracts/crowdsale/validation/CappedCrowdsale.sol index 0e6f4edfb..2a13dc4eb 100644 --- a/contracts/crowdsale/validation/CappedCrowdsale.sol +++ b/contracts/crowdsale/validation/CappedCrowdsale.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../../math/SafeMath.sol"; import "../Crowdsale.sol"; diff --git a/contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol b/contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol index 5b7938213..3320a94d5 100644 --- a/contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol +++ b/contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../../math/SafeMath.sol"; import "../Crowdsale.sol"; import "../../access/roles/CapperRole.sol"; diff --git a/contracts/crowdsale/validation/TimedCrowdsale.sol b/contracts/crowdsale/validation/TimedCrowdsale.sol index 7e1012d35..c4ac709f5 100644 --- a/contracts/crowdsale/validation/TimedCrowdsale.sol +++ b/contracts/crowdsale/validation/TimedCrowdsale.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../../math/SafeMath.sol"; import "../Crowdsale.sol"; diff --git a/contracts/drafts/ERC1046/TokenMetadata.sol b/contracts/drafts/ERC1046/TokenMetadata.sol index a87e81a1f..1cec2a9e8 100644 --- a/contracts/drafts/ERC1046/TokenMetadata.sol +++ b/contracts/drafts/ERC1046/TokenMetadata.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../../token/ERC20/IERC20.sol"; diff --git a/contracts/drafts/ERC20Migrator.sol b/contracts/drafts/ERC20Migrator.sol index f7d45f3a8..d644fe5df 100644 --- a/contracts/drafts/ERC20Migrator.sol +++ b/contracts/drafts/ERC20Migrator.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../token/ERC20/IERC20.sol"; import "../token/ERC20/ERC20Mintable.sol"; import "../token/ERC20/SafeERC20.sol"; diff --git a/contracts/drafts/SignatureBouncer.sol b/contracts/drafts/SignatureBouncer.sol index 1981590ec..b3882ae6e 100644 --- a/contracts/drafts/SignatureBouncer.sol +++ b/contracts/drafts/SignatureBouncer.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../access/roles/SignerRole.sol"; import "../cryptography/ECDSA.sol"; diff --git a/contracts/drafts/TokenVesting.sol b/contracts/drafts/TokenVesting.sol index b3a784144..924787f11 100644 --- a/contracts/drafts/TokenVesting.sol +++ b/contracts/drafts/TokenVesting.sol @@ -2,7 +2,7 @@ pragma solidity ^0.4.24; -import "../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../token/ERC20/SafeERC20.sol"; import "../ownership/Ownable.sol"; import "../math/SafeMath.sol"; diff --git a/contracts/examples/SampleCrowdsale.sol b/contracts/examples/SampleCrowdsale.sol index 0a1bfc047..17d260c3c 100644 --- a/contracts/examples/SampleCrowdsale.sol +++ b/contracts/examples/SampleCrowdsale.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../crowdsale/validation/CappedCrowdsale.sol"; import "../crowdsale/distribution/RefundableCrowdsale.sol"; import "../crowdsale/emission/MintedCrowdsale.sol"; diff --git a/contracts/examples/SimpleToken.sol b/contracts/examples/SimpleToken.sol index 1229e6715..4621451ef 100644 --- a/contracts/examples/SimpleToken.sol +++ b/contracts/examples/SimpleToken.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.24; -import "../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../token/ERC20/ERC20.sol"; diff --git a/contracts/introspection/ERC165.sol b/contracts/introspection/ERC165.sol index 6d6db5556..b631b0d3d 100644 --- a/contracts/introspection/ERC165.sol +++ b/contracts/introspection/ERC165.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./IERC165.sol"; diff --git a/contracts/lifecycle/Pausable.sol b/contracts/lifecycle/Pausable.sol index 74a14896b..43ac0981d 100644 --- a/contracts/lifecycle/Pausable.sol +++ b/contracts/lifecycle/Pausable.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../access/roles/PauserRole.sol"; diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol index f3b2115a0..42e5a7ce8 100644 --- a/contracts/ownership/Ownable.sol +++ b/contracts/ownership/Ownable.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; /** * @title Ownable diff --git a/contracts/ownership/Secondary.sol b/contracts/ownership/Secondary.sol index 2cadbd4b7..c3bee9300 100644 --- a/contracts/ownership/Secondary.sol +++ b/contracts/ownership/Secondary.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; /** * @title Secondary diff --git a/contracts/payment/ConditionalEscrow.sol b/contracts/payment/ConditionalEscrow.sol index 8f5ca6b4a..6ce1bdfcf 100644 --- a/contracts/payment/ConditionalEscrow.sol +++ b/contracts/payment/ConditionalEscrow.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./Escrow.sol"; diff --git a/contracts/payment/Escrow.sol b/contracts/payment/Escrow.sol index 522ff99f2..f4af4bfa1 100644 --- a/contracts/payment/Escrow.sol +++ b/contracts/payment/Escrow.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../math/SafeMath.sol"; import "../ownership/Secondary.sol"; diff --git a/contracts/payment/PullPayment.sol b/contracts/payment/PullPayment.sol index 368b29cad..b82017418 100644 --- a/contracts/payment/PullPayment.sol +++ b/contracts/payment/PullPayment.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./Escrow.sol"; diff --git a/contracts/payment/RefundEscrow.sol b/contracts/payment/RefundEscrow.sol index f708898a7..813a703cc 100644 --- a/contracts/payment/RefundEscrow.sol +++ b/contracts/payment/RefundEscrow.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./ConditionalEscrow.sol"; diff --git a/contracts/payment/SplitPayment.sol b/contracts/payment/SplitPayment.sol index 2c72c8072..38e7242d6 100644 --- a/contracts/payment/SplitPayment.sol +++ b/contracts/payment/SplitPayment.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../math/SafeMath.sol"; diff --git a/contracts/token/ERC20/ERC20.sol b/contracts/token/ERC20/ERC20.sol index 86a67df69..3a9246db0 100644 --- a/contracts/token/ERC20/ERC20.sol +++ b/contracts/token/ERC20/ERC20.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./IERC20.sol"; import "../../math/SafeMath.sol"; diff --git a/contracts/token/ERC20/ERC20Burnable.sol b/contracts/token/ERC20/ERC20Burnable.sol index ed8fda3b1..fa46b02a6 100644 --- a/contracts/token/ERC20/ERC20Burnable.sol +++ b/contracts/token/ERC20/ERC20Burnable.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./ERC20.sol"; diff --git a/contracts/token/ERC20/ERC20Capped.sol b/contracts/token/ERC20/ERC20Capped.sol index 95560a00b..7828030d7 100644 --- a/contracts/token/ERC20/ERC20Capped.sol +++ b/contracts/token/ERC20/ERC20Capped.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./ERC20Mintable.sol"; diff --git a/contracts/token/ERC20/ERC20Detailed.sol b/contracts/token/ERC20/ERC20Detailed.sol index 72b431676..f12cde0e6 100644 --- a/contracts/token/ERC20/ERC20Detailed.sol +++ b/contracts/token/ERC20/ERC20Detailed.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./IERC20.sol"; diff --git a/contracts/token/ERC20/ERC20Mintable.sol b/contracts/token/ERC20/ERC20Mintable.sol index eb24b36d5..5f5c21db5 100644 --- a/contracts/token/ERC20/ERC20Mintable.sol +++ b/contracts/token/ERC20/ERC20Mintable.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./ERC20.sol"; import "../../access/roles/MinterRole.sol"; diff --git a/contracts/token/ERC20/ERC20Pausable.sol b/contracts/token/ERC20/ERC20Pausable.sol index f83a79551..7346c98fe 100644 --- a/contracts/token/ERC20/ERC20Pausable.sol +++ b/contracts/token/ERC20/ERC20Pausable.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./ERC20.sol"; import "../../lifecycle/Pausable.sol"; diff --git a/contracts/token/ERC20/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol index d98cb0b02..6769d86b2 100644 --- a/contracts/token/ERC20/TokenTimelock.sol +++ b/contracts/token/ERC20/TokenTimelock.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./SafeERC20.sol"; diff --git a/contracts/token/ERC721/ERC721.sol b/contracts/token/ERC721/ERC721.sol index fad2a9605..85908a3b7 100644 --- a/contracts/token/ERC721/ERC721.sol +++ b/contracts/token/ERC721/ERC721.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./IERC721.sol"; import "./IERC721Receiver.sol"; import "../../math/SafeMath.sol"; diff --git a/contracts/token/ERC721/ERC721Burnable.sol b/contracts/token/ERC721/ERC721Burnable.sol index 2b11d0261..0c9c987c7 100644 --- a/contracts/token/ERC721/ERC721Burnable.sol +++ b/contracts/token/ERC721/ERC721Burnable.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./ERC721.sol"; diff --git a/contracts/token/ERC721/ERC721Enumerable.sol b/contracts/token/ERC721/ERC721Enumerable.sol index 429b785c5..0f42eceda 100644 --- a/contracts/token/ERC721/ERC721Enumerable.sol +++ b/contracts/token/ERC721/ERC721Enumerable.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./IERC721Enumerable.sol"; import "./ERC721.sol"; import "../../introspection/ERC165.sol"; diff --git a/contracts/token/ERC721/ERC721Full.sol b/contracts/token/ERC721/ERC721Full.sol index 8fdce51e9..73a2efd6a 100644 --- a/contracts/token/ERC721/ERC721Full.sol +++ b/contracts/token/ERC721/ERC721Full.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./ERC721.sol"; import "./ERC721Enumerable.sol"; import "./ERC721Metadata.sol"; diff --git a/contracts/token/ERC721/ERC721Holder.sol b/contracts/token/ERC721/ERC721Holder.sol index 0847857f6..2daf7558b 100644 --- a/contracts/token/ERC721/ERC721Holder.sol +++ b/contracts/token/ERC721/ERC721Holder.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./IERC721Receiver.sol"; diff --git a/contracts/token/ERC721/ERC721Metadata.sol b/contracts/token/ERC721/ERC721Metadata.sol index a1a9fd1ef..a76c197f2 100644 --- a/contracts/token/ERC721/ERC721Metadata.sol +++ b/contracts/token/ERC721/ERC721Metadata.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./ERC721.sol"; import "./IERC721Metadata.sol"; import "../../introspection/ERC165.sol"; diff --git a/contracts/token/ERC721/ERC721MetadataMintable.sol b/contracts/token/ERC721/ERC721MetadataMintable.sol index 9fd7b08f5..409995ab9 100644 --- a/contracts/token/ERC721/ERC721MetadataMintable.sol +++ b/contracts/token/ERC721/ERC721MetadataMintable.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./ERC721Metadata.sol"; import "../../access/roles/MinterRole.sol"; diff --git a/contracts/token/ERC721/ERC721Mintable.sol b/contracts/token/ERC721/ERC721Mintable.sol index 5399547a5..ccbff5d82 100644 --- a/contracts/token/ERC721/ERC721Mintable.sol +++ b/contracts/token/ERC721/ERC721Mintable.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./ERC721.sol"; import "../../access/roles/MinterRole.sol"; diff --git a/contracts/token/ERC721/ERC721Pausable.sol b/contracts/token/ERC721/ERC721Pausable.sol index 3180ca570..6487fdd67 100644 --- a/contracts/token/ERC721/ERC721Pausable.sol +++ b/contracts/token/ERC721/ERC721Pausable.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./ERC721.sol"; import "../../lifecycle/Pausable.sol"; diff --git a/contracts/token/ERC721/IERC721.sol b/contracts/token/ERC721/IERC721.sol index c9f6dbf86..521406773 100644 --- a/contracts/token/ERC721/IERC721.sol +++ b/contracts/token/ERC721/IERC721.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "../../introspection/IERC165.sol"; diff --git a/contracts/token/ERC721/IERC721Enumerable.sol b/contracts/token/ERC721/IERC721Enumerable.sol index 89bb4e3b0..9290e21af 100644 --- a/contracts/token/ERC721/IERC721Enumerable.sol +++ b/contracts/token/ERC721/IERC721Enumerable.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./IERC721.sol"; diff --git a/contracts/token/ERC721/IERC721Full.sol b/contracts/token/ERC721/IERC721Full.sol index f891f3ff0..fc1c29bc1 100644 --- a/contracts/token/ERC721/IERC721Full.sol +++ b/contracts/token/ERC721/IERC721Full.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./IERC721.sol"; import "./IERC721Enumerable.sol"; import "./IERC721Metadata.sol"; diff --git a/contracts/token/ERC721/IERC721Metadata.sol b/contracts/token/ERC721/IERC721Metadata.sol index ccce7d75e..37938f0a8 100644 --- a/contracts/token/ERC721/IERC721Metadata.sol +++ b/contracts/token/ERC721/IERC721Metadata.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; import "./IERC721.sol"; diff --git a/contracts/utils/ReentrancyGuard.sol b/contracts/utils/ReentrancyGuard.sol index c12cbccca..499d9b271 100644 --- a/contracts/utils/ReentrancyGuard.sol +++ b/contracts/utils/ReentrancyGuard.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.24; -import "../Initializable.sol"; +import "zos-lib/contracts/Initializable.sol"; /** * @title Helps contracts guard against reentrancy attacks.