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
f3635e15
Commit
f3635e15
authored
Jan 23, 2019
by
Francisco Giordano
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add missing gaps and Initializables
parent
04186e2c
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
28 additions
and
2 deletions
+28
-2
WhitelistAdminRole.sol
contracts/access/roles/WhitelistAdminRole.sol
+2
-0
WhitelistedRole.sol
contracts/access/roles/WhitelistedRole.sol
+3
-0
RefundablePostDeliveryCrowdsale.sol
...rowdsale/distribution/RefundablePostDeliveryCrowdsale.sol
+5
-2
PausableCrowdsale.sol
contracts/crowdsale/validation/PausableCrowdsale.sol
+2
-0
WhitelistCrowdsale.sol
contracts/crowdsale/validation/WhitelistCrowdsale.sol
+4
-0
PaymentSplitter.sol
contracts/payment/PaymentSplitter.sol
+2
-0
ConditionalEscrow.sol
contracts/payment/escrow/ConditionalEscrow.sol
+2
-0
Escrow.sol
contracts/payment/escrow/Escrow.sol
+2
-0
RefundEscrow.sol
contracts/payment/escrow/RefundEscrow.sol
+2
-0
ERC20Pausable.sol
contracts/token/ERC20/ERC20Pausable.sol
+2
-0
StandaloneERC20.sol
contracts/token/ERC20/StandaloneERC20.sol
+2
-0
No files found.
contracts/access/roles/WhitelistAdminRole.sol
View file @
f3635e15
...
@@ -48,4 +48,6 @@ contract WhitelistAdminRole is Initializable {
...
@@ -48,4 +48,6 @@ contract WhitelistAdminRole is Initializable {
_whitelistAdmins.remove(account);
_whitelistAdmins.remove(account);
emit WhitelistAdminRemoved(account);
emit WhitelistAdminRemoved(account);
}
}
uint256[50] private ______gap;
}
}
contracts/access/roles/WhitelistedRole.sol
View file @
f3635e15
...
@@ -53,4 +53,7 @@ contract WhitelistedRole is Initializable, WhitelistAdminRole {
...
@@ -53,4 +53,7 @@ contract WhitelistedRole is Initializable, WhitelistAdminRole {
_whitelisteds.remove(account);
_whitelisteds.remove(account);
emit WhitelistedRemoved(account);
emit WhitelistedRemoved(account);
}
}
uint256[50] private ______gap;
}
}
}
contracts/crowdsale/distribution/RefundablePostDeliveryCrowdsale.sol
View file @
f3635e15
pragma solidity ^0.5.0;
pragma solidity ^0.5.0;
import "zos-lib/contracts/Initializable.sol";
import "./RefundableCrowdsale.sol";
import "./RefundableCrowdsale.sol";
import "./PostDeliveryCrowdsale.sol";
import "./PostDeliveryCrowdsale.sol";
/**
/**
* @title RefundablePostDeliveryCrowdsale
* @title RefundablePostDeliveryCrowdsale
* @dev Extension of RefundableCrowdsale contract that only delivers the tokens
* @dev Extension of RefundableCrowdsale contract that only delivers the tokens
* once the crowdsale has closed and the goal met, preventing refunds to be issued
* once the crowdsale has closed and the goal met, preventing refunds to be issued
* to token holders.
* to token holders.
*/
*/
contract RefundablePostDeliveryCrowdsale is RefundableCrowdsale, PostDeliveryCrowdsale {
contract RefundablePostDeliveryCrowdsale is
Initializable,
RefundableCrowdsale, PostDeliveryCrowdsale {
function withdrawTokens(address beneficiary) public {
function withdrawTokens(address beneficiary) public {
require(finalized());
require(finalized());
require(goalReached());
require(goalReached());
super.withdrawTokens(beneficiary);
super.withdrawTokens(beneficiary);
}
}
uint256[50] private ______gap;
}
}
contracts/crowdsale/validation/PausableCrowdsale.sol
View file @
f3635e15
...
@@ -26,4 +26,6 @@ contract PausableCrowdsale is Initializable, Crowdsale, Pausable {
...
@@ -26,4 +26,6 @@ contract PausableCrowdsale is Initializable, Crowdsale, Pausable {
function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal view whenNotPaused {
function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal view whenNotPaused {
return super._preValidatePurchase(_beneficiary, _weiAmount);
return super._preValidatePurchase(_beneficiary, _weiAmount);
}
}
uint256[50] private ______gap;
}
}
contracts/crowdsale/validation/WhitelistCrowdsale.sol
View file @
f3635e15
...
@@ -10,6 +10,8 @@ import "../../access/roles/WhitelistedRole.sol";
...
@@ -10,6 +10,8 @@ import "../../access/roles/WhitelistedRole.sol";
contract WhitelistCrowdsale is Initializable, WhitelistedRole, Crowdsale {
contract WhitelistCrowdsale is Initializable, WhitelistedRole, Crowdsale {
function initialize(address sender) public initializer {
function initialize(address sender) public initializer {
WhitelistedRole._initialize(sender);
WhitelistedRole._initialize(sender);
assert(Crowdsale._hasBeenInitialized());
}
}
/**
/**
...
@@ -22,4 +24,6 @@ contract WhitelistCrowdsale is Initializable, WhitelistedRole, Crowdsale {
...
@@ -22,4 +24,6 @@ contract WhitelistCrowdsale is Initializable, WhitelistedRole, Crowdsale {
require(isWhitelisted(_beneficiary));
require(isWhitelisted(_beneficiary));
super._preValidatePurchase(_beneficiary, _weiAmount);
super._preValidatePurchase(_beneficiary, _weiAmount);
}
}
uint256[50] private ______gap;
}
}
contracts/payment/PaymentSplitter.sol
View file @
f3635e15
...
@@ -111,4 +111,6 @@ contract PaymentSplitter is Initializable {
...
@@ -111,4 +111,6 @@ contract PaymentSplitter is Initializable {
_totalShares = _totalShares.add(shares_);
_totalShares = _totalShares.add(shares_);
emit PayeeAdded(account, shares_);
emit PayeeAdded(account, shares_);
}
}
uint256[50] private ______gap;
}
}
contracts/payment/escrow/ConditionalEscrow.sol
View file @
f3635e15
...
@@ -23,4 +23,6 @@ contract ConditionalEscrow is Initializable, Escrow {
...
@@ -23,4 +23,6 @@ contract ConditionalEscrow is Initializable, Escrow {
require(withdrawalAllowed(payee));
require(withdrawalAllowed(payee));
super.withdraw(payee);
super.withdraw(payee);
}
}
uint256[50] private ______gap;
}
}
contracts/payment/escrow/Escrow.sol
View file @
f3635e15
...
@@ -55,4 +55,6 @@ contract Escrow is Initializable, Secondary {
...
@@ -55,4 +55,6 @@ contract Escrow is Initializable, Secondary {
emit Withdrawn(payee, payment);
emit Withdrawn(payee, payment);
}
}
uint256[50] private ______gap;
}
}
contracts/payment/escrow/RefundEscrow.sol
View file @
f3635e15
...
@@ -93,4 +93,6 @@ contract RefundEscrow is Initializable, ConditionalEscrow {
...
@@ -93,4 +93,6 @@ contract RefundEscrow is Initializable, ConditionalEscrow {
function withdrawalAllowed(address) public view returns (bool) {
function withdrawalAllowed(address) public view returns (bool) {
return _state == State.Refunding;
return _state == State.Refunding;
}
}
uint256[50] private ______gap;
}
}
contracts/token/ERC20/ERC20Pausable.sol
View file @
f3635e15
...
@@ -32,4 +32,6 @@ contract ERC20Pausable is Initializable, ERC20, Pausable {
...
@@ -32,4 +32,6 @@ contract ERC20Pausable is Initializable, ERC20, Pausable {
function decreaseAllowance(address spender, uint subtractedValue) public whenNotPaused returns (bool success) {
function decreaseAllowance(address spender, uint subtractedValue) public whenNotPaused returns (bool success) {
return super.decreaseAllowance(spender, subtractedValue);
return super.decreaseAllowance(spender, subtractedValue);
}
}
uint256[50] private ______gap;
}
}
contracts/token/ERC20/StandaloneERC20.sol
View file @
f3635e15
...
@@ -60,4 +60,6 @@ contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pa
...
@@ -60,4 +60,6 @@ contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pa
_addPauser(pausers[i]);
_addPauser(pausers[i]);
}
}
}
}
uint256[50] private ______gap;
}
}
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