add missing gaps and Initializables
This commit is contained in:
@ -48,4 +48,6 @@ contract WhitelistAdminRole is Initializable {
|
||||
_whitelistAdmins.remove(account);
|
||||
emit WhitelistAdminRemoved(account);
|
||||
}
|
||||
|
||||
uint256[50] private ______gap;
|
||||
}
|
||||
|
||||
@ -53,4 +53,7 @@ contract WhitelistedRole is Initializable, WhitelistAdminRole {
|
||||
_whitelisteds.remove(account);
|
||||
emit WhitelistedRemoved(account);
|
||||
}
|
||||
|
||||
uint256[50] private ______gap;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,20 +1,23 @@
|
||||
pragma solidity ^0.5.0;
|
||||
|
||||
import "zos-lib/contracts/Initializable.sol";
|
||||
|
||||
import "./RefundableCrowdsale.sol";
|
||||
import "./PostDeliveryCrowdsale.sol";
|
||||
|
||||
|
||||
/**
|
||||
* @title RefundablePostDeliveryCrowdsale
|
||||
* @dev Extension of RefundableCrowdsale contract that only delivers the tokens
|
||||
* once the crowdsale has closed and the goal met, preventing refunds to be issued
|
||||
* to token holders.
|
||||
*/
|
||||
contract RefundablePostDeliveryCrowdsale is RefundableCrowdsale, PostDeliveryCrowdsale {
|
||||
contract RefundablePostDeliveryCrowdsale is Initializable, RefundableCrowdsale, PostDeliveryCrowdsale {
|
||||
function withdrawTokens(address beneficiary) public {
|
||||
require(finalized());
|
||||
require(goalReached());
|
||||
|
||||
super.withdrawTokens(beneficiary);
|
||||
}
|
||||
|
||||
uint256[50] private ______gap;
|
||||
}
|
||||
|
||||
@ -26,4 +26,6 @@ contract PausableCrowdsale is Initializable, Crowdsale, Pausable {
|
||||
function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal view whenNotPaused {
|
||||
return super._preValidatePurchase(_beneficiary, _weiAmount);
|
||||
}
|
||||
|
||||
uint256[50] private ______gap;
|
||||
}
|
||||
|
||||
@ -10,6 +10,8 @@ import "../../access/roles/WhitelistedRole.sol";
|
||||
contract WhitelistCrowdsale is Initializable, WhitelistedRole, Crowdsale {
|
||||
function initialize(address sender) public initializer {
|
||||
WhitelistedRole._initialize(sender);
|
||||
|
||||
assert(Crowdsale._hasBeenInitialized());
|
||||
}
|
||||
|
||||
/**
|
||||
@ -22,4 +24,6 @@ contract WhitelistCrowdsale is Initializable, WhitelistedRole, Crowdsale {
|
||||
require(isWhitelisted(_beneficiary));
|
||||
super._preValidatePurchase(_beneficiary, _weiAmount);
|
||||
}
|
||||
|
||||
uint256[50] private ______gap;
|
||||
}
|
||||
|
||||
@ -111,4 +111,6 @@ contract PaymentSplitter is Initializable {
|
||||
_totalShares = _totalShares.add(shares_);
|
||||
emit PayeeAdded(account, shares_);
|
||||
}
|
||||
|
||||
uint256[50] private ______gap;
|
||||
}
|
||||
|
||||
@ -23,4 +23,6 @@ contract ConditionalEscrow is Initializable, Escrow {
|
||||
require(withdrawalAllowed(payee));
|
||||
super.withdraw(payee);
|
||||
}
|
||||
|
||||
uint256[50] private ______gap;
|
||||
}
|
||||
|
||||
@ -55,4 +55,6 @@ contract Escrow is Initializable, Secondary {
|
||||
|
||||
emit Withdrawn(payee, payment);
|
||||
}
|
||||
|
||||
uint256[50] private ______gap;
|
||||
}
|
||||
|
||||
@ -93,4 +93,6 @@ contract RefundEscrow is Initializable, ConditionalEscrow {
|
||||
function withdrawalAllowed(address) public view returns (bool) {
|
||||
return _state == State.Refunding;
|
||||
}
|
||||
|
||||
uint256[50] private ______gap;
|
||||
}
|
||||
|
||||
@ -32,4 +32,6 @@ contract ERC20Pausable is Initializable, ERC20, Pausable {
|
||||
function decreaseAllowance(address spender, uint subtractedValue) public whenNotPaused returns (bool success) {
|
||||
return super.decreaseAllowance(spender, subtractedValue);
|
||||
}
|
||||
|
||||
uint256[50] private ______gap;
|
||||
}
|
||||
|
||||
@ -60,4 +60,6 @@ contract StandaloneERC20 is Initializable, ERC20Detailed, ERC20Mintable, ERC20Pa
|
||||
_addPauser(pausers[i]);
|
||||
}
|
||||
}
|
||||
|
||||
uint256[50] private ______gap;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user