Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
openzeppelin-contracts-upgradeable
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
俞永鹏
openzeppelin-contracts-upgradeable
Commits
bc7ba69f
Commit
bc7ba69f
authored
Oct 09, 2018
by
Nicolás Venturo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed Initializable, now using zos-lib's.
parent
423c6523
Hide whitespace changes
Inline
Side-by-side
Showing
51 changed files
with
50 additions
and
99 deletions
+50
-99
Initializable.sol
contracts/Initializable.sol
+0
-49
CapperRole.sol
contracts/access/roles/CapperRole.sol
+1
-1
MinterRole.sol
contracts/access/roles/MinterRole.sol
+1
-1
PauserRole.sol
contracts/access/roles/PauserRole.sol
+1
-1
SignerRole.sol
contracts/access/roles/SignerRole.sol
+1
-1
Crowdsale.sol
contracts/crowdsale/Crowdsale.sol
+1
-1
FinalizableCrowdsale.sol
contracts/crowdsale/distribution/FinalizableCrowdsale.sol
+1
-1
PostDeliveryCrowdsale.sol
contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol
+1
-1
RefundableCrowdsale.sol
contracts/crowdsale/distribution/RefundableCrowdsale.sol
+1
-1
AllowanceCrowdsale.sol
contracts/crowdsale/emission/AllowanceCrowdsale.sol
+1
-1
MintedCrowdsale.sol
contracts/crowdsale/emission/MintedCrowdsale.sol
+1
-1
IncreasingPriceCrowdsale.sol
contracts/crowdsale/price/IncreasingPriceCrowdsale.sol
+1
-1
CappedCrowdsale.sol
contracts/crowdsale/validation/CappedCrowdsale.sol
+1
-1
IndividuallyCappedCrowdsale.sol
...acts/crowdsale/validation/IndividuallyCappedCrowdsale.sol
+1
-1
TimedCrowdsale.sol
contracts/crowdsale/validation/TimedCrowdsale.sol
+1
-1
TokenMetadata.sol
contracts/drafts/ERC1046/TokenMetadata.sol
+1
-1
ERC20Migrator.sol
contracts/drafts/ERC20Migrator.sol
+1
-1
SignatureBouncer.sol
contracts/drafts/SignatureBouncer.sol
+1
-1
TokenVesting.sol
contracts/drafts/TokenVesting.sol
+1
-1
SampleCrowdsale.sol
contracts/examples/SampleCrowdsale.sol
+1
-1
SimpleToken.sol
contracts/examples/SimpleToken.sol
+1
-1
ERC165.sol
contracts/introspection/ERC165.sol
+1
-1
Pausable.sol
contracts/lifecycle/Pausable.sol
+1
-1
Ownable.sol
contracts/ownership/Ownable.sol
+1
-1
Secondary.sol
contracts/ownership/Secondary.sol
+1
-1
ConditionalEscrow.sol
contracts/payment/ConditionalEscrow.sol
+1
-1
Escrow.sol
contracts/payment/Escrow.sol
+1
-1
PullPayment.sol
contracts/payment/PullPayment.sol
+1
-1
RefundEscrow.sol
contracts/payment/RefundEscrow.sol
+1
-1
SplitPayment.sol
contracts/payment/SplitPayment.sol
+1
-1
ERC20.sol
contracts/token/ERC20/ERC20.sol
+1
-1
ERC20Burnable.sol
contracts/token/ERC20/ERC20Burnable.sol
+1
-1
ERC20Capped.sol
contracts/token/ERC20/ERC20Capped.sol
+1
-1
ERC20Detailed.sol
contracts/token/ERC20/ERC20Detailed.sol
+1
-1
ERC20Mintable.sol
contracts/token/ERC20/ERC20Mintable.sol
+1
-1
ERC20Pausable.sol
contracts/token/ERC20/ERC20Pausable.sol
+1
-1
TokenTimelock.sol
contracts/token/ERC20/TokenTimelock.sol
+1
-1
ERC721.sol
contracts/token/ERC721/ERC721.sol
+1
-1
ERC721Burnable.sol
contracts/token/ERC721/ERC721Burnable.sol
+1
-1
ERC721Enumerable.sol
contracts/token/ERC721/ERC721Enumerable.sol
+1
-1
ERC721Full.sol
contracts/token/ERC721/ERC721Full.sol
+1
-1
ERC721Holder.sol
contracts/token/ERC721/ERC721Holder.sol
+1
-1
ERC721Metadata.sol
contracts/token/ERC721/ERC721Metadata.sol
+1
-1
ERC721MetadataMintable.sol
contracts/token/ERC721/ERC721MetadataMintable.sol
+1
-1
ERC721Mintable.sol
contracts/token/ERC721/ERC721Mintable.sol
+1
-1
ERC721Pausable.sol
contracts/token/ERC721/ERC721Pausable.sol
+1
-1
IERC721.sol
contracts/token/ERC721/IERC721.sol
+1
-1
IERC721Enumerable.sol
contracts/token/ERC721/IERC721Enumerable.sol
+1
-1
IERC721Full.sol
contracts/token/ERC721/IERC721Full.sol
+1
-1
IERC721Metadata.sol
contracts/token/ERC721/IERC721Metadata.sol
+1
-1
ReentrancyGuard.sol
contracts/utils/ReentrancyGuard.sol
+1
-1
No files found.
contracts/Initializable.sol
deleted
100644 → 0
View file @
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;
}
}
contracts/access/roles/CapperRole.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "../Roles.sol";
...
...
contracts/access/roles/MinterRole.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "../Roles.sol";
...
...
contracts/access/roles/PauserRole.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "../Roles.sol";
...
...
contracts/access/roles/SignerRole.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "../Roles.sol";
...
...
contracts/crowdsale/Crowdsale.sol
View file @
bc7ba69f
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";
...
...
contracts/crowdsale/distribution/FinalizableCrowdsale.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "../../math/SafeMath.sol";
import "../validation/TimedCrowdsale.sol";
...
...
contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol
View file @
bc7ba69f
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";
...
...
contracts/crowdsale/distribution/RefundableCrowdsale.sol
View file @
bc7ba69f
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";
...
...
contracts/crowdsale/emission/AllowanceCrowdsale.sol
View file @
bc7ba69f
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";
...
...
contracts/crowdsale/emission/MintedCrowdsale.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "../Crowdsale.sol";
import "../../token/ERC20/ERC20Mintable.sol";
...
...
contracts/crowdsale/price/IncreasingPriceCrowdsale.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "../validation/TimedCrowdsale.sol";
import "../../math/SafeMath.sol";
...
...
contracts/crowdsale/validation/CappedCrowdsale.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "../../math/SafeMath.sol";
import "../Crowdsale.sol";
...
...
contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol
View file @
bc7ba69f
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";
...
...
contracts/crowdsale/validation/TimedCrowdsale.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "../../math/SafeMath.sol";
import "../Crowdsale.sol";
...
...
contracts/drafts/ERC1046/TokenMetadata.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "../../token/ERC20/IERC20.sol";
...
...
contracts/drafts/ERC20Migrator.sol
View file @
bc7ba69f
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";
...
...
contracts/drafts/SignatureBouncer.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "../access/roles/SignerRole.sol";
import "../cryptography/ECDSA.sol";
...
...
contracts/drafts/TokenVesting.sol
View file @
bc7ba69f
...
...
@@ -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";
...
...
contracts/examples/SampleCrowdsale.sol
View file @
bc7ba69f
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";
...
...
contracts/examples/SimpleToken.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "../token/ERC20/ERC20.sol";
...
...
contracts/introspection/ERC165.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./IERC165.sol";
...
...
contracts/lifecycle/Pausable.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "../access/roles/PauserRole.sol";
...
...
contracts/ownership/Ownable.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
/**
* @title Ownable
...
...
contracts/ownership/Secondary.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
/**
* @title Secondary
...
...
contracts/payment/ConditionalEscrow.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./Escrow.sol";
...
...
contracts/payment/Escrow.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "../math/SafeMath.sol";
import "../ownership/Secondary.sol";
...
...
contracts/payment/PullPayment.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./Escrow.sol";
...
...
contracts/payment/RefundEscrow.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./ConditionalEscrow.sol";
...
...
contracts/payment/SplitPayment.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "../math/SafeMath.sol";
...
...
contracts/token/ERC20/ERC20.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./IERC20.sol";
import "../../math/SafeMath.sol";
...
...
contracts/token/ERC20/ERC20Burnable.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./ERC20.sol";
...
...
contracts/token/ERC20/ERC20Capped.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./ERC20Mintable.sol";
...
...
contracts/token/ERC20/ERC20Detailed.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./IERC20.sol";
...
...
contracts/token/ERC20/ERC20Mintable.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./ERC20.sol";
import "../../access/roles/MinterRole.sol";
...
...
contracts/token/ERC20/ERC20Pausable.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./ERC20.sol";
import "../../lifecycle/Pausable.sol";
...
...
contracts/token/ERC20/TokenTimelock.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./SafeERC20.sol";
...
...
contracts/token/ERC721/ERC721.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./IERC721.sol";
import "./IERC721Receiver.sol";
import "../../math/SafeMath.sol";
...
...
contracts/token/ERC721/ERC721Burnable.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./ERC721.sol";
...
...
contracts/token/ERC721/ERC721Enumerable.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./IERC721Enumerable.sol";
import "./ERC721.sol";
import "../../introspection/ERC165.sol";
...
...
contracts/token/ERC721/ERC721Full.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./ERC721.sol";
import "./ERC721Enumerable.sol";
import "./ERC721Metadata.sol";
...
...
contracts/token/ERC721/ERC721Holder.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./IERC721Receiver.sol";
...
...
contracts/token/ERC721/ERC721Metadata.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./ERC721.sol";
import "./IERC721Metadata.sol";
import "../../introspection/ERC165.sol";
...
...
contracts/token/ERC721/ERC721MetadataMintable.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./ERC721Metadata.sol";
import "../../access/roles/MinterRole.sol";
...
...
contracts/token/ERC721/ERC721Mintable.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./ERC721.sol";
import "../../access/roles/MinterRole.sol";
...
...
contracts/token/ERC721/ERC721Pausable.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./ERC721.sol";
import "../../lifecycle/Pausable.sol";
...
...
contracts/token/ERC721/IERC721.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "../../introspection/IERC165.sol";
...
...
contracts/token/ERC721/IERC721Enumerable.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./IERC721.sol";
...
...
contracts/token/ERC721/IERC721Full.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./IERC721.sol";
import "./IERC721Enumerable.sol";
import "./IERC721Metadata.sol";
...
...
contracts/token/ERC721/IERC721Metadata.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
../..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
import "./IERC721.sol";
...
...
contracts/utils/ReentrancyGuard.sol
View file @
bc7ba69f
pragma solidity ^0.4.24;
import "
..
/Initializable.sol";
import "
zos-lib/contracts
/Initializable.sol";
/**
* @title Helps contracts guard against reentrancy attacks.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment