Skip to content

O
openzeppelin-contracts-upgradeable
Commit ad123815 by John Shutt Committed by Matt Condon
Options

update constructor syntax for solidity 0.4.23 in numerous contracts (#921) 

* update solidity-coverage to ^0.5.0

* update truffle dependency to ^4.1.8

* update solium to ^1.1.7

* update all contracts to solidity ^0.4.23
parent 20b85be6
Showing with 340 additions and 704 deletions
contracts/AddressUtils.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
/**
......
contracts/Bounty.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./payment/PullPayment.sol";
......
contracts/DayLimit.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
/**
......@@ -16,7 +16,7 @@ contract DayLimit {
* @dev Constructor that sets the passed value as a dailyLimit.
* @param _limit uint256 to represent the daily limit.
*/
function DayLimit(uint256 _limit) public {
constructor(uint256 _limit) public {
dailyLimit = _limit;
lastDay = today();
}
......
contracts/ECRecovery.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
/**
......
contracts/LimitBalance.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
/**
......@@ -15,7 +15,7 @@ contract LimitBalance {
* @dev Constructor that sets the passed value as a limit.
* @param _limit uint256 to represent the limit.
*/
function LimitBalance(uint256 _limit) public {
constructor(uint256 _limit) public {
limit = _limit;
}
......
contracts/MerkleProof.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
/*
......
contracts/ReentrancyGuard.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
/**
......
contracts/access/SignatureBouncer.sol
pragma solidity ^0.4.18;
pragma solidity ^0.4.23;
import "../ownership/Ownable.sol";
import "../ownership/rbac/RBAC.sol";
......
contracts/crowdsale/Crowdsale.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/ERC20.sol";
import "../math/SafeMath.sol";
......@@ -45,7 +45,7 @@ contract Crowdsale {
* @param _wallet Address where collected funds will be forwarded to
* @param _token Address of the token being sold
*/
function Crowdsale(uint256 _rate, address _wallet, ERC20 _token) public {
constructor(uint256 _rate, address _wallet, ERC20 _token) public {
require(_rate > 0);
require(_wallet != address(0));
require(_token != address(0));
......
contracts/crowdsale/distribution/FinalizableCrowdsale.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../../math/SafeMath.sol";
import "../../ownership/Ownable.sol";
......
contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../validation/TimedCrowdsale.sol";
import "../../token/ERC20/ERC20.sol";
......
contracts/crowdsale/distribution/RefundableCrowdsale.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../../math/SafeMath.sol";
......@@ -25,7 +25,7 @@ contract RefundableCrowdsale is FinalizableCrowdsale {
* @dev Constructor, creates RefundVault.
* @param _goal Funding goal
*/
function RefundableCrowdsale(uint256 _goal) public {
constructor(uint256 _goal) public {
require(_goal > 0);
vault = new RefundVault(wallet);
goal = _goal;
......
contracts/crowdsale/distribution/utils/RefundVault.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../../../math/SafeMath.sol";
import "../../../ownership/Ownable.sol";
......@@ -26,7 +26,7 @@ contract RefundVault is Ownable {
/**
* @param _wallet Vault address
*/
function RefundVault(address _wallet) public {
constructor(address _wallet) public {
require(_wallet != address(0));
wallet = _wallet;
state = State.Active;
......
contracts/crowdsale/emission/AllowanceCrowdsale.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../Crowdsale.sol";
import "../../token/ERC20/ERC20.sol";
......@@ -18,7 +18,7 @@ contract AllowanceCrowdsale is Crowdsale {
* @dev Constructor, takes token wallet address.
* @param _tokenWallet Address holding the tokens, which has approved allowance to the crowdsale
*/
function AllowanceCrowdsale(address _tokenWallet) public {
constructor(address _tokenWallet) public {
require(_tokenWallet != address(0));
tokenWallet = _tokenWallet;
}
......
contracts/crowdsale/emission/MintedCrowdsale.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../Crowdsale.sol";
import "../../token/ERC20/MintableToken.sol";
......
contracts/crowdsale/price/IncreasingPriceCrowdsale.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../validation/TimedCrowdsale.sol";
import "../../math/SafeMath.sol";
......@@ -21,7 +21,7 @@ contract IncreasingPriceCrowdsale is TimedCrowdsale {
* @param _initialRate Number of tokens a buyer gets per wei at the start of the crowdsale
* @param _finalRate Number of tokens a buyer gets per wei at the end of the crowdsale
*/
function IncreasingPriceCrowdsale(uint256 _initialRate, uint256 _finalRate) public {
constructor(uint256 _initialRate, uint256 _finalRate) public {
require(_initialRate >= _finalRate);
require(_finalRate > 0);
initialRate = _initialRate;
......
contracts/crowdsale/validation/CappedCrowdsale.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../../math/SafeMath.sol";
import "../Crowdsale.sol";
......@@ -17,7 +17,7 @@ contract CappedCrowdsale is Crowdsale {
* @dev Constructor, takes maximum amount of wei accepted in the crowdsale.
* @param _cap Max amount of wei to be contributed
*/
function CappedCrowdsale(uint256 _cap) public {
constructor(uint256 _cap) public {
require(_cap > 0);
cap = _cap;
}
......
contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../../math/SafeMath.sol";
import "../Crowdsale.sol";
......
contracts/crowdsale/validation/TimedCrowdsale.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../../math/SafeMath.sol";
import "../Crowdsale.sol";
......@@ -28,7 +28,7 @@ contract TimedCrowdsale is Crowdsale {
* @param _openingTime Crowdsale opening time
* @param _closingTime Crowdsale closing time
*/
function TimedCrowdsale(uint256 _openingTime, uint256 _closingTime) public {
constructor(uint256 _openingTime, uint256 _closingTime) public {
// solium-disable-next-line security/no-block-members
require(_openingTime >= block.timestamp);
require(_closingTime >= _openingTime);
......
contracts/crowdsale/validation/WhitelistedCrowdsale.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../Crowdsale.sol";
import "../../ownership/Ownable.sol";
......
contracts/examples/SampleCrowdsale.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../crowdsale/validation/CappedCrowdsale.sol";
import "../crowdsale/distribution/RefundableCrowdsale.sol";
......@@ -33,7 +33,7 @@ contract SampleCrowdsaleToken is MintableToken {
*/
contract SampleCrowdsale is CappedCrowdsale, RefundableCrowdsale, MintedCrowdsale {
function SampleCrowdsale(
constructor(
uint256 _openingTime,
uint256 _closingTime,
uint256 _rate,
......
contracts/examples/SimpleSavingsWallet.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../ownership/Heritable.sol";
......@@ -19,7 +19,7 @@ contract SimpleSavingsWallet is Heritable {
event Received(address indexed payer, uint256 amount, uint256 balance);
function SimpleSavingsWallet(uint256 _heartbeatTimeout) Heritable(_heartbeatTimeout) public {}
constructor(uint256 _heartbeatTimeout) Heritable(_heartbeatTimeout) public {}
/**
* @dev wallet can receive funds.
......
contracts/examples/SimpleToken.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/StandardToken.sol";
......@@ -21,7 +21,7 @@ contract SimpleToken is StandardToken {
/**
* @dev Constructor that gives msg.sender all of existing tokens.
*/
function SimpleToken() public {
constructor() public {
totalSupply_ = INITIAL_SUPPLY;
balances[msg.sender] = INITIAL_SUPPLY;
emit Transfer(0x0, msg.sender, INITIAL_SUPPLY);
......
contracts/lifecycle/Destructible.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../ownership/Ownable.sol";
......@@ -10,7 +10,7 @@ import "../ownership/Ownable.sol";
*/
contract Destructible is Ownable {
function Destructible() public payable { }
constructor() public payable { }
/**
* @dev Transfers the current balance to the owner and terminates the contract.
......
contracts/lifecycle/Pausable.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../ownership/Ownable.sol";
......
contracts/lifecycle/TokenDestructible.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../ownership/Ownable.sol";
import "../token/ERC20/ERC20Basic.sol";
......@@ -12,7 +12,7 @@ import "../token/ERC20/ERC20Basic.sol";
*/
contract TokenDestructible is Ownable {
function TokenDestructible() public payable { }
constructor() public payable { }
/**
* @notice Terminate contract and refund to owner
......
contracts/math/Math.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
/**
......
contracts/math/SafeMath.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
/**
......
contracts/mocks/AllowanceCrowdsaleImpl.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/ERC20.sol";
import "../crowdsale/emission/AllowanceCrowdsale.sol";
......@@ -6,7 +6,7 @@ import "../crowdsale/emission/AllowanceCrowdsale.sol";
contract AllowanceCrowdsaleImpl is AllowanceCrowdsale {
function AllowanceCrowdsaleImpl (
constructor (
uint256 _rate,
address _wallet,
ERC20 _token,
......
contracts/mocks/BasicTokenMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/BasicToken.sol";
......@@ -7,7 +7,7 @@ import "../token/ERC20/BasicToken.sol";
// mock class using BasicToken
contract BasicTokenMock is BasicToken {
function BasicTokenMock(address initialAccount, uint256 initialBalance) public {
constructor(address initialAccount, uint256 initialBalance) public {
balances[initialAccount] = initialBalance;
totalSupply_ = initialBalance;
}
......
contracts/mocks/BouncerMock.sol
pragma solidity ^0.4.18;
pragma solidity ^0.4.23;
import "../access/SignatureBouncer.sol";
......
contracts/mocks/BurnableTokenMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/BurnableToken.sol";
contract BurnableTokenMock is BurnableToken {
function BurnableTokenMock(address initialAccount, uint initialBalance) public {
constructor(address initialAccount, uint initialBalance) public {
balances[initialAccount] = initialBalance;
totalSupply_ = initialBalance;
}
......
contracts/mocks/CappedCrowdsaleImpl.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/ERC20.sol";
import "../crowdsale/validation/CappedCrowdsale.sol";
......@@ -6,7 +6,7 @@ import "../crowdsale/validation/CappedCrowdsale.sol";
contract CappedCrowdsaleImpl is CappedCrowdsale {
function CappedCrowdsaleImpl (
constructor (
uint256 _rate,
address _wallet,
ERC20 _token,
......
contracts/mocks/DayLimitMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../../contracts/DayLimit.sol";
......@@ -6,7 +6,7 @@ import "../../contracts/DayLimit.sol";
contract DayLimitMock is DayLimit {
uint256 public totalSpending;
function DayLimitMock(uint256 _value) public DayLimit(_value) {
constructor(uint256 _value) public DayLimit(_value) {
totalSpending = 0;
}
......
contracts/mocks/DetailedERC20Mock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/StandardToken.sol";
import "../token/ERC20/DetailedERC20.sol";
contract DetailedERC20Mock is StandardToken, DetailedERC20 {
function DetailedERC20Mock(string _name, string _symbol, uint8 _decimals) DetailedERC20(_name, _symbol, _decimals) public {}
constructor(string _name, string _symbol, uint8 _decimals) DetailedERC20(_name, _symbol, _decimals) public {}
}
contracts/mocks/ECRecoveryMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../ECRecovery.sol";
......
contracts/mocks/ERC223TokenMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/BasicToken.sol";
......@@ -10,7 +10,7 @@ contract ERC223ContractInterface {
contract ERC223TokenMock is BasicToken {
function ERC223TokenMock(address initialAccount, uint256 initialBalance) public {
constructor(address initialAccount, uint256 initialBalance) public {
balances[initialAccount] = initialBalance;
totalSupply_ = initialBalance;
}
......
contracts/mocks/ERC721BasicTokenMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC721/ERC721BasicToken.sol";
......
contracts/mocks/ERC721ReceiverMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC721/ERC721Receiver.sol";
......@@ -9,7 +9,7 @@ contract ERC721ReceiverMock is ERC721Receiver {
event Received(address _address, uint256 _tokenId, bytes _data, uint256 _gas);
function ERC721ReceiverMock(bytes4 _retval, bool _reverts) public {
constructor(bytes4 _retval, bool _reverts) public {
retval = _retval;
reverts = _reverts;
}
......
contracts/mocks/ERC721TokenMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC721/ERC721Token.sol";
......@@ -9,7 +9,7 @@ import "../token/ERC721/ERC721Token.sol";
* and a public setter for metadata URI
*/
contract ERC721TokenMock is ERC721Token {
function ERC721TokenMock(string name, string symbol) public
constructor(string name, string symbol) public
ERC721Token(name, symbol)
{ }
......
contracts/mocks/ERC827TokenMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC827/ERC827Token.sol";
......@@ -7,7 +7,7 @@ import "../token/ERC827/ERC827Token.sol";
// mock class using ERC827 Token
contract ERC827TokenMock is ERC827Token {
function ERC827TokenMock(address initialAccount, uint256 initialBalance) public {
constructor(address initialAccount, uint256 initialBalance) public {
balances[initialAccount] = initialBalance;
totalSupply_ = initialBalance;
}
......
contracts/mocks/FinalizableCrowdsaleImpl.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/MintableToken.sol";
import "../crowdsale/distribution/FinalizableCrowdsale.sol";
......@@ -6,7 +6,7 @@ import "../crowdsale/distribution/FinalizableCrowdsale.sol";
contract FinalizableCrowdsaleImpl is FinalizableCrowdsale {
function FinalizableCrowdsaleImpl (
constructor (
uint256 _openingTime,
uint256 _closingTime,
uint256 _rate,
......
contracts/mocks/ForceEther.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
// @title Force Ether into a contract.
......@@ -8,7 +8,7 @@ pragma solidity ^0.4.21;
// @author Remco Bloemen <remco@neufund.org>
contract ForceEther {
function ForceEther() public payable { }
constructor() public payable { }
function destroyAndSend(address _recipient) public {
selfdestruct(_recipient);
......
contracts/mocks/HasNoEtherTest.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../../contracts/ownership/HasNoEther.sol";
......@@ -6,7 +6,7 @@ import "../../contracts/ownership/HasNoEther.sol";
contract HasNoEtherTest is HasNoEther {
// Constructor with explicit payable — should still fail
function HasNoEtherTest() public payable {
constructor() public payable {
}
}
contracts/mocks/IncreasingPriceCrowdsaleImpl.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../crowdsale/price/IncreasingPriceCrowdsale.sol";
import "../math/SafeMath.sol";
......@@ -6,7 +6,7 @@ import "../math/SafeMath.sol";
contract IncreasingPriceCrowdsaleImpl is IncreasingPriceCrowdsale {
function IncreasingPriceCrowdsaleImpl (
constructor (
uint256 _openingTime,
uint256 _closingTime,
address _wallet,
......
contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/ERC20.sol";
import "../crowdsale/validation/IndividuallyCappedCrowdsale.sol";
......@@ -6,7 +6,7 @@ import "../crowdsale/validation/IndividuallyCappedCrowdsale.sol";
contract IndividuallyCappedCrowdsaleImpl is IndividuallyCappedCrowdsale {
function IndividuallyCappedCrowdsaleImpl (
constructor (
uint256 _rate,
address _wallet,
ERC20 _token
......
contracts/mocks/InsecureTargetBounty.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import {Bounty, Target} from "../../contracts/Bounty.sol";
......
contracts/mocks/LimitBalanceMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../LimitBalance.sol";
......
contracts/mocks/MathMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../../contracts/math/Math.sol";
......
contracts/mocks/MerkleProofWrapper.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import { MerkleProof } from "../MerkleProof.sol";
......
contracts/mocks/MessageHelper.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
contract MessageHelper {
......
contracts/mocks/MintedCrowdsaleImpl.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/MintableToken.sol";
import "../crowdsale/emission/MintedCrowdsale.sol";
......@@ -6,7 +6,7 @@ import "../crowdsale/emission/MintedCrowdsale.sol";
contract MintedCrowdsaleImpl is MintedCrowdsale {
function MintedCrowdsaleImpl (
constructor (
uint256 _rate,
address _wallet,
MintableToken _token
......
contracts/mocks/PausableMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../lifecycle/Pausable.sol";
......@@ -9,7 +9,7 @@ contract PausableMock is Pausable {
bool public drasticMeasureTaken;
uint256 public count;
function PausableMock() public {
constructor() public {
drasticMeasureTaken = false;
count = 0;
}
......
contracts/mocks/PausableTokenMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/PausableToken.sol";
......@@ -6,7 +6,7 @@ import "../token/ERC20/PausableToken.sol";
// mock class using PausableToken
contract PausableTokenMock is PausableToken {
function PausableTokenMock(address initialAccount, uint initialBalance) public {
constructor(address initialAccount, uint initialBalance) public {
balances[initialAccount] = initialBalance;
}
......
contracts/mocks/PostDeliveryCrowdsaleImpl.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/ERC20.sol";
import "../crowdsale/distribution/PostDeliveryCrowdsale.sol";
......@@ -6,7 +6,7 @@ import "../crowdsale/distribution/PostDeliveryCrowdsale.sol";
contract PostDeliveryCrowdsaleImpl is PostDeliveryCrowdsale {
function PostDeliveryCrowdsaleImpl (
constructor (
uint256 _openingTime,
uint256 _closingTime,
uint256 _rate,
......
contracts/mocks/PullPaymentMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../payment/PullPayment.sol";
......@@ -7,7 +7,7 @@ import "../payment/PullPayment.sol";
// mock class using PullPayment
contract PullPaymentMock is PullPayment {
function PullPaymentMock() public payable { }
constructor() public payable { }
// test helper function to call asyncSend
function callSend(address dest, uint256 amount) public {
......
contracts/mocks/RBACMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../ownership/rbac/RBACWithAdmin.sol";
......@@ -16,7 +16,7 @@ contract RBACMock is RBACWithAdmin {
_;
}
function RBACMock(address[] _advisors)
constructor(address[] _advisors)
public
{
addRole(msg.sender, ROLE_ADVISOR);
......
contracts/mocks/ReentrancyAttack.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
contract ReentrancyAttack {
......
contracts/mocks/ReentrancyMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../ReentrancyGuard.sol";
import "./ReentrancyAttack.sol";
......@@ -8,7 +8,7 @@ contract ReentrancyMock is ReentrancyGuard {
uint256 public counter;
function ReentrancyMock() public {
constructor() public {
counter = 0;
}
......
contracts/mocks/RefundableCrowdsaleImpl.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/MintableToken.sol";
import "../crowdsale/distribution/RefundableCrowdsale.sol";
......@@ -6,7 +6,7 @@ import "../crowdsale/distribution/RefundableCrowdsale.sol";
contract RefundableCrowdsaleImpl is RefundableCrowdsale {
function RefundableCrowdsaleImpl (
constructor (
uint256 _openingTime,
uint256 _closingTime,
uint256 _rate,
......
contracts/mocks/SafeERC20Helper.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/ERC20.sol";
import "../token/ERC20/SafeERC20.sol";
......@@ -64,7 +64,7 @@ contract SafeERC20Helper {
ERC20 failing;
ERC20 succeeding;
function SafeERC20Helper() public {
constructor() public {
failing = new ERC20FailingMock();
succeeding = new ERC20SucceedingMock();
}
......
contracts/mocks/SafeMathMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../math/SafeMath.sol";
......
contracts/mocks/SecureTargetBounty.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import {Bounty, Target} from "../../contracts/Bounty.sol";
......
contracts/mocks/StandardBurnableTokenMock.sol
pragma solidity ^0.4.18;
pragma solidity ^0.4.23;
import "../token/ERC20/StandardBurnableToken.sol";
contract StandardBurnableTokenMock is StandardBurnableToken {
function StandardBurnableTokenMock(address initialAccount, uint initialBalance) public {
constructor(address initialAccount, uint initialBalance) public {
balances[initialAccount] = initialBalance;
totalSupply_ = initialBalance;
}
......
contracts/mocks/StandardTokenMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/StandardToken.sol";
......@@ -6,7 +6,7 @@ import "../token/ERC20/StandardToken.sol";
// mock class using StandardToken
contract StandardTokenMock is StandardToken {
function StandardTokenMock(address initialAccount, uint256 initialBalance) public {
constructor(address initialAccount, uint256 initialBalance) public {
balances[initialAccount] = initialBalance;
totalSupply_ = initialBalance;
}
......
contracts/mocks/TimedCrowdsaleImpl.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/ERC20.sol";
import "../crowdsale/validation/TimedCrowdsale.sol";
......@@ -6,7 +6,7 @@ import "../crowdsale/validation/TimedCrowdsale.sol";
contract TimedCrowdsaleImpl is TimedCrowdsale {
function TimedCrowdsaleImpl (
constructor (
uint256 _openingTime,
uint256 _closingTime,
uint256 _rate,
......
contracts/mocks/WhitelistMock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../ownership/Whitelist.sol";
......
contracts/mocks/WhitelistedCrowdsaleImpl.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../token/ERC20/ERC20.sol";
import "../crowdsale/validation/WhitelistedCrowdsale.sol";
......@@ -6,7 +6,7 @@ import "../crowdsale/validation/WhitelistedCrowdsale.sol";
contract WhitelistedCrowdsaleImpl is WhitelistedCrowdsale {
function WhitelistedCrowdsaleImpl (
constructor (
uint256 _rate,
address _wallet,
ERC20 _token
......
contracts/ownership/CanReclaimToken.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./Ownable.sol";
import "../token/ERC20/ERC20Basic.sol";
......
contracts/ownership/Claimable.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./Ownable.sol";
......
contracts/ownership/Contactable.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./Ownable.sol";
......
contracts/ownership/DelayedClaimable.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./Claimable.sol";
......
contracts/ownership/HasNoContracts.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./Ownable.sol";
......
contracts/ownership/HasNoEther.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./Ownable.sol";
......@@ -22,7 +22,7 @@ contract HasNoEther is Ownable {
* constructor. By doing it this way we prevent a payable constructor from working. Alternatively
* we could use assembly to access msg.value.
*/
function HasNoEther() public payable {
constructor() public payable {
require(msg.value == 0);
}
......
contracts/ownership/HasNoTokens.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./CanReclaimToken.sol";
......
contracts/ownership/Heritable.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./Ownable.sol";
......@@ -39,7 +39,7 @@ contract Heritable is Ownable {
* @param _heartbeatTimeout time available for the owner to notify they are alive,
* before the heir can take ownership.
*/
function Heritable(uint256 _heartbeatTimeout) public {
constructor(uint256 _heartbeatTimeout) public {
setHeartbeatTimeout(_heartbeatTimeout);
}
......
contracts/ownership/NoOwner.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./HasNoEther.sol";
import "./HasNoTokens.sol";
......
contracts/ownership/Ownable.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
/**
......@@ -18,7 +18,7 @@ contract Ownable {
* @dev The Ownable constructor sets the original `owner` of the contract to the sender
* account.
*/
function Ownable() public {
constructor() public {
owner = msg.sender;
}
......
contracts/ownership/Whitelist.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./Ownable.sol";
......
contracts/ownership/rbac/RBAC.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./Roles.sol";
......
contracts/ownership/rbac/RBACWithAdmin.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./RBAC.sol";
......@@ -28,7 +28,7 @@ contract RBACWithAdmin is RBAC {
/**
* @dev constructor. Sets msg.sender as admin by default
*/
function RBACWithAdmin()
constructor()
public
{
addRole(msg.sender, ROLE_ADMIN);
......
contracts/ownership/rbac/Roles.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
/**
......
contracts/payment/PullPayment.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../math/SafeMath.sol";
......
contracts/payment/SplitPayment.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../math/SafeMath.sol";
......@@ -21,7 +21,7 @@ contract SplitPayment {
/**
* @dev Constructor
*/
function SplitPayment(address[] _payees, uint256[] _shares) public payable {
constructor(address[] _payees, uint256[] _shares) public payable {
require(_payees.length == _shares.length);
for (uint256 i = 0; i < _payees.length; i++) {
......
contracts/token/ERC20/BasicToken.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./ERC20Basic.sol";
......
contracts/token/ERC20/BurnableToken.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./BasicToken.sol";
......
contracts/token/ERC20/CappedToken.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./MintableToken.sol";
......@@ -11,7 +11,7 @@ contract CappedToken is MintableToken {
uint256 public cap;
function CappedToken(uint256 _cap) public {
constructor(uint256 _cap) public {
require(_cap > 0);
cap = _cap;
}
......
contracts/token/ERC20/DetailedERC20.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./ERC20.sol";
......@@ -8,7 +8,7 @@ contract DetailedERC20 is ERC20 {
string public symbol;
uint8 public decimals;
function DetailedERC20(string _name, string _symbol, uint8 _decimals) public {
constructor(string _name, string _symbol, uint8 _decimals) public {
name = _name;
symbol = _symbol;
decimals = _decimals;
......
contracts/token/ERC20/ERC20.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./ERC20Basic.sol";
......
contracts/token/ERC20/ERC20Basic.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
/**
......
contracts/token/ERC20/MintableToken.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./StandardToken.sol";
import "../../ownership/Ownable.sol";
......
contracts/token/ERC20/PausableToken.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./StandardToken.sol";
import "../../lifecycle/Pausable.sol";
......
contracts/token/ERC20/SafeERC20.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./ERC20Basic.sol";
import "./ERC20.sol";
......
contracts/token/ERC20/StandardBurnableToken.sol
pragma solidity ^0.4.18;
pragma solidity ^0.4.23;
import "./BurnableToken.sol";
import "./StandardToken.sol";
......
contracts/token/ERC20/StandardToken.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./BasicToken.sol";
import "./ERC20.sol";
......
contracts/token/ERC20/TokenTimelock.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./SafeERC20.sol";
......@@ -20,7 +20,7 @@ contract TokenTimelock {
// timestamp when token release is enabled
uint256 public releaseTime;
function TokenTimelock(ERC20Basic _token, address _beneficiary, uint256 _releaseTime) public {
constructor(ERC20Basic _token, address _beneficiary, uint256 _releaseTime) public {
// solium-disable-next-line security/no-block-members
require(_releaseTime > block.timestamp);
token = _token;
......
contracts/token/ERC20/TokenVesting.sol
/* solium-disable security/no-block-members */
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./ERC20Basic.sol";
import "./SafeERC20.sol";
......@@ -42,7 +42,7 @@ contract TokenVesting is Ownable {
* @param _duration duration in seconds of the period in which the tokens will vest
* @param _revocable whether the vesting is revocable or not
*/
function TokenVesting(
constructor(
address _beneficiary,
uint256 _start,
uint256 _cliff,
......
contracts/token/ERC721/DeprecatedERC721.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./ERC721.sol";
......
contracts/token/ERC721/ERC721.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./ERC721Basic.sol";
......
contracts/token/ERC721/ERC721Basic.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
/**
......
contracts/token/ERC721/ERC721BasicToken.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./ERC721Basic.sol";
import "./ERC721Receiver.sol";
......
contracts/token/ERC721/ERC721Holder.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./ERC721Receiver.sol";
......
contracts/token/ERC721/ERC721Receiver.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
/**
......
contracts/token/ERC721/ERC721Token.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./ERC721.sol";
import "./ERC721BasicToken.sol";
......@@ -35,7 +35,7 @@ contract ERC721Token is ERC721, ERC721BasicToken {
/**
* @dev Constructor function
*/
function ERC721Token(string _name, string _symbol) public {
constructor(string _name, string _symbol) public {
name_ = _name;
symbol_ = _symbol;
}
......
contracts/token/ERC827/ERC827.sol
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "../ERC20/ERC20.sol";
......
contracts/token/ERC827/ERC827Token.sol
/* solium-disable security/no-low-level-calls */
pragma solidity ^0.4.21;
pragma solidity ^0.4.23;
import "./ERC827.sol";
import "../ERC20/StandardToken.sol";
......
package-lock.json
......@@ -1397,7 +1397,7 @@
"requires": {
"anymatch": "1.3.2",
"async-each": "1.0.1",
"fsevents": "1.1.3",
"fsevents": "1.2.3",
"glob-parent": "2.0.0",
"inherits": "2.0.3",
"is-binary-path": "1.0.1",
......@@ -3061,39 +3061,29 @@
"dev": true
},
"fsevents": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
"integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.3.tgz",
"integrity": "sha512-X+57O5YkDTiEQGiw8i7wYc2nQgweIekqkepI8Q3y4wVlurgBt2SuwxTeYUYMZIGpLZH3r/TsMjczCMXE5ZOt7Q==",
"dev": true,
"optional": true,
"requires": {
"nan": "2.6.2",
"node-pre-gyp": "0.6.39"
"nan": "2.10.0",
"node-pre-gyp": "0.9.1"
},
"dependencies": {
"abbrev": {
"version": "1.1.0",
"version": "1.1.1",
"bundled": true,
"dev": true,
"optional": true
},
"ajv": {
"version": "4.11.8",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"co": "4.6.0",
"json-stable-stringify": "1.0.1"
}
},
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
"dev": true
},
"aproba": {
"version": "1.1.1",
"version": "1.2.0",
"bundled": true,
"dev": true,
"optional": true
......@@ -3105,91 +3095,25 @@
"optional": true,
"requires": {
"delegates": "1.0.0",
"readable-stream": "2.2.9"
"readable-stream": "2.3.6"
}
},
"asn1": {
"version": "0.2.3",
"bundled": true,
"dev": true,
"optional": true
},
"assert-plus": {
"version": "0.2.0",
"bundled": true,
"dev": true,
"optional": true
},
"asynckit": {
"version": "0.4.0",
"bundled": true,
"dev": true,
"optional": true
},
"aws-sign2": {
"version": "0.6.0",
"bundled": true,
"dev": true,
"optional": true
},
"aws4": {
"version": "1.6.0",
"bundled": true,
"dev": true,
"optional": true
},
"balanced-match": {
"version": "0.4.2",
"version": "1.0.0",
"bundled": true,
"dev": true
},
"bcrypt-pbkdf": {
"version": "1.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"tweetnacl": "0.14.5"
}
},
"block-stream": {
"version": "0.0.9",
"bundled": true,
"dev": true,
"requires": {
"inherits": "2.0.3"
}
},
"boom": {
"version": "2.10.1",
"bundled": true,
"dev": true,
"requires": {
"hoek": "2.16.3"
}
},
"brace-expansion": {
"version": "1.1.7",
"version": "1.1.11",
"bundled": true,
"dev": true,
"requires": {
"balanced-match": "0.4.2",
"balanced-match": "1.0.0",
"concat-map": "0.0.1"
}
},
"buffer-shims": {
"version": "1.0.0",
"bundled": true,
"dev": true
},
"caseless": {
"version": "0.12.0",
"bundled": true,
"dev": true,
"optional": true
},
"co": {
"version": "4.6.0",
"chownr": {
"version": "1.0.1",
"bundled": true,
"dev": true,
"optional": true
......@@ -3199,14 +3123,6 @@
"bundled": true,
"dev": true
},
"combined-stream": {
"version": "1.0.5",
"bundled": true,
"dev": true,
"requires": {
"delayed-stream": "1.0.0"
}
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
......@@ -3220,35 +3136,11 @@
"core-util-is": {
"version": "1.0.2",
"bundled": true,
"dev": true
},
"cryptiles": {
"version": "2.0.5",
"bundled": true,
"dev": true,
"requires": {
"boom": "2.10.1"
}
},
"dashdash": {
"version": "1.14.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"assert-plus": "1.0.0"
},
"dependencies": {
"assert-plus": {
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true
}
}
},
"debug": {
"version": "2.6.8",
"version": "2.6.9",
"bundled": true,
"dev": true,
"optional": true,
......@@ -3262,11 +3154,6 @@
"dev": true,
"optional": true
},
"delayed-stream": {
"version": "1.0.0",
"bundled": true,
"dev": true
},
"delegates": {
"version": "1.0.0",
"bundled": true,
......@@ -3274,74 +3161,25 @@
"optional": true
},
"detect-libc": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true
},
"ecc-jsbn": {
"version": "0.1.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"jsbn": "0.1.1"
}
},
"extend": {
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true
},
"extsprintf": {
"version": "1.0.2",
"bundled": true,
"dev": true
},
"forever-agent": {
"version": "0.6.1",
"version": "1.0.3",
"bundled": true,
"dev": true,
"optional": true
},
"form-data": {
"version": "2.1.4",
"fs-minipass": {
"version": "1.2.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"asynckit": "0.4.0",
"combined-stream": "1.0.5",
"mime-types": "2.1.15"
"minipass": "2.2.4"
}
},
"fs.realpath": {
"version": "1.0.0",
"bundled": true,
"dev": true
},
"fstream": {
"version": "1.0.11",
"bundled": true,
"dev": true,
"requires": {
"graceful-fs": "4.1.11",
"inherits": "2.0.3",
"mkdirp": "0.5.1",
"rimraf": "2.6.1"
}
},
"fstream-ignore": {
"version": "1.0.5",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"fstream": "1.0.11",
"inherits": "2.0.3",
"minimatch": "3.0.4"
}
"optional": true
},
"gauge": {
"version": "2.7.4",
......@@ -3349,7 +3187,7 @@
"dev": true,
"optional": true,
"requires": {
"aproba": "1.1.1",
"aproba": "1.2.0",
"console-control-strings": "1.1.0",
"has-unicode": "2.0.1",
"object-assign": "4.1.1",
......@@ -3359,27 +3197,11 @@
"wide-align": "1.1.2"
}
},
"getpass": {
"version": "0.1.7",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"assert-plus": "1.0.0"
},
"dependencies": {
"assert-plus": {
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true
}
}
},
"glob": {
"version": "7.1.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"fs.realpath": "1.0.0",
"inflight": "1.0.6",
......@@ -3389,64 +3211,35 @@
"path-is-absolute": "1.0.1"
}
},
"graceful-fs": {
"version": "4.1.11",
"bundled": true,
"dev": true
},
"har-schema": {
"version": "1.0.5",
"bundled": true,
"dev": true,
"optional": true
},
"har-validator": {
"version": "4.2.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ajv": "4.11.8",
"har-schema": "1.0.5"
}
},
"has-unicode": {
"version": "2.0.1",
"bundled": true,
"dev": true,
"optional": true
},
"hawk": {
"version": "3.1.3",
"iconv-lite": {
"version": "0.4.21",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"boom": "2.10.1",
"cryptiles": "2.0.5",
"hoek": "2.16.3",
"sntp": "1.0.9"
"safer-buffer": "2.1.2"
}
},
"hoek": {
"version": "2.16.3",
"bundled": true,
"dev": true
},
"http-signature": {
"version": "1.1.1",
"ignore-walk": {
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"assert-plus": "0.2.0",
"jsprim": "1.4.0",
"sshpk": "1.13.0"
"minimatch": "3.0.4"
}
},
"inflight": {
"version": "1.0.6",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"once": "1.4.0",
"wrappy": "1.0.2"
......@@ -3458,7 +3251,7 @@
"dev": true
},
"ini": {
"version": "1.3.4",
"version": "1.3.5",
"bundled": true,
"dev": true,
"optional": true
......@@ -3471,111 +3264,43 @@
"number-is-nan": "1.0.1"
}
},
"is-typedarray": {
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true
},
"isarray": {
"version": "1.0.0",
"bundled": true,
"dev": true
},
"isstream": {
"version": "0.1.2",
"bundled": true,
"dev": true,
"optional": true
},
"jodid25519": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"jsbn": "0.1.1"
}
},
"jsbn": {
"version": "0.1.1",
"bundled": true,
"dev": true,
"optional": true
},
"json-schema": {
"version": "0.2.3",
"bundled": true,
"dev": true,
"optional": true
},
"json-stable-stringify": {
"version": "1.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"jsonify": "0.0.0"
}
},
"json-stringify-safe": {
"version": "5.0.1",
"bundled": true,
"dev": true,
"optional": true
},
"jsonify": {
"version": "0.0.0",
"bundled": true,
"dev": true,
"optional": true
},
"jsprim": {
"version": "1.4.0",
"minimatch": {
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"assert-plus": "1.0.0",
"extsprintf": "1.0.2",
"json-schema": "0.2.3",
"verror": "1.3.6"
},
"dependencies": {
"assert-plus": {
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true
}
"brace-expansion": "1.1.11"
}
},
"mime-db": {
"version": "1.27.0",
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
},
"mime-types": {
"version": "2.1.15",
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
"requires": {
"mime-db": "1.27.0"
"safe-buffer": "5.1.1",
"yallist": "3.0.2"
}
},
"minimatch": {
"version": "3.0.4",
"minizlib": {
"version": "1.1.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "1.1.7"
"minipass": "2.2.4"
}
},
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
},
"mkdirp": {
"version": "0.5.1",
"bundled": true,
......@@ -3590,23 +3315,40 @@
"dev": true,
"optional": true
},
"nan": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
"integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
"dev": true,
"optional": true
},
"needle": {
"version": "2.2.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"debug": "2.6.9",
"iconv-lite": "0.4.21",
"sax": "1.2.4"
}
},
"node-pre-gyp": {
"version": "0.6.39",
"version": "0.9.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"detect-libc": "1.0.2",
"hawk": "3.1.3",
"detect-libc": "1.0.3",
"mkdirp": "0.5.1",
"needle": "2.2.0",
"nopt": "4.0.1",
"npmlog": "4.1.0",
"rc": "1.2.1",
"request": "2.81.0",
"rimraf": "2.6.1",
"semver": "5.3.0",
"tar": "2.2.1",
"tar-pack": "3.4.0"
"npm-packlist": "1.1.10",
"npmlog": "4.1.2",
"rc": "1.2.6",
"rimraf": "2.6.2",
"semver": "5.5.0",
"tar": "4.4.1"
}
},
"nopt": {
......@@ -3615,12 +3357,28 @@
"dev": true,
"optional": true,
"requires": {
"abbrev": "1.1.0",
"osenv": "0.1.4"
"abbrev": "1.1.1",
"osenv": "0.1.5"
}
},
"npm-bundled": {
"version": "1.0.3",
"bundled": true,
"dev": true,
"optional": true
},
"npm-packlist": {
"version": "1.1.10",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ignore-walk": "3.0.1",
"npm-bundled": "1.0.3"
}
},
"npmlog": {
"version": "4.1.0",
"version": "4.1.2",
"bundled": true,
"dev": true,
"optional": true,
......@@ -3636,12 +3394,6 @@
"bundled": true,
"dev": true
},
"oauth-sign": {
"version": "0.8.2",
"bundled": true,
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
"bundled": true,
......@@ -3669,7 +3421,7 @@
"optional": true
},
"osenv": {
"version": "0.1.4",
"version": "0.1.5",
"bundled": true,
"dev": true,
"optional": true,
......@@ -3681,39 +3433,23 @@
"path-is-absolute": {
"version": "1.0.1",
"bundled": true,
"dev": true
},
"performance-now": {
"version": "0.2.0",
"bundled": true,
"dev": true,
"optional": true
},
"process-nextick-args": {
"version": "1.0.7",
"bundled": true,
"dev": true
},
"punycode": {
"version": "1.4.1",
"bundled": true,
"dev": true,
"optional": true
},
"qs": {
"version": "6.4.0",
"version": "2.0.0",
"bundled": true,
"dev": true,
"optional": true
},
"rc": {
"version": "1.2.1",
"version": "1.2.6",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"deep-extend": "0.4.2",
"ini": "1.3.4",
"ini": "1.3.5",
"minimist": "1.2.0",
"strip-json-comments": "2.0.1"
},
......@@ -3727,112 +3463,63 @@
}
},
"readable-stream": {
"version": "2.2.9",
"version": "2.3.6",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"buffer-shims": "1.0.0",
"core-util-is": "1.0.2",
"inherits": "2.0.3",
"isarray": "1.0.0",
"process-nextick-args": "1.0.7",
"string_decoder": "1.0.1",
"process-nextick-args": "2.0.0",
"safe-buffer": "5.1.1",
"string_decoder": "1.1.1",
"util-deprecate": "1.0.2"
}
},
"request": {
"version": "2.81.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"aws-sign2": "0.6.0",
"aws4": "1.6.0",
"caseless": "0.12.0",
"combined-stream": "1.0.5",
"extend": "3.0.1",
"forever-agent": "0.6.1",
"form-data": "2.1.4",
"har-validator": "4.2.1",
"hawk": "3.1.3",
"http-signature": "1.1.1",
"is-typedarray": "1.0.0",
"isstream": "0.1.2",
"json-stringify-safe": "5.0.1",
"mime-types": "2.1.15",
"oauth-sign": "0.8.2",
"performance-now": "0.2.0",
"qs": "6.4.0",
"safe-buffer": "5.0.1",
"stringstream": "0.0.5",
"tough-cookie": "2.3.2",
"tunnel-agent": "0.6.0",
"uuid": "3.0.1"
}
},
"rimraf": {
"version": "2.6.1",
"version": "2.6.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"glob": "7.1.2"
}
},
"safe-buffer": {
"version": "5.0.1",
"version": "5.1.1",
"bundled": true,
"dev": true
},
"semver": {
"version": "5.3.0",
"safer-buffer": {
"version": "2.1.2",
"bundled": true,
"dev": true,
"optional": true
},
"set-blocking": {
"version": "2.0.0",
"sax": {
"version": "1.2.4",
"bundled": true,
"dev": true,
"optional": true
},
"signal-exit": {
"version": "3.0.2",
"semver": {
"version": "5.5.0",
"bundled": true,
"dev": true,
"optional": true
},
"sntp": {
"version": "1.0.9",
"bundled": true,
"dev": true,
"requires": {
"hoek": "2.16.3"
}
},
"sshpk": {
"version": "1.13.0",
"set-blocking": {
"version": "2.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"asn1": "0.2.3",
"assert-plus": "1.0.0",
"bcrypt-pbkdf": "1.0.1",
"dashdash": "1.14.1",
"ecc-jsbn": "0.1.1",
"getpass": "0.1.7",
"jodid25519": "1.0.2",
"jsbn": "0.1.1",
"tweetnacl": "0.14.5"
"optional": true
},
"dependencies": {
"assert-plus": {
"version": "1.0.0",
"signal-exit": {
"version": "3.0.2",
"bundled": true,
"dev": true,
"optional": true
}
}
},
"string-width": {
"version": "1.0.2",
......@@ -3845,19 +3532,14 @@
}
},
"string_decoder": {
"version": "1.0.1",
"version": "1.1.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "5.0.1"
"safe-buffer": "5.1.1"
}
},
"stringstream": {
"version": "0.0.5",
"bundled": true,
"dev": true,
"optional": true
},
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
......@@ -3873,81 +3555,26 @@
"optional": true
},
"tar": {
"version": "2.2.1",
"bundled": true,
"dev": true,
"requires": {
"block-stream": "0.0.9",
"fstream": "1.0.11",
"inherits": "2.0.3"
}
},
"tar-pack": {
"version": "3.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"debug": "2.6.8",
"fstream": "1.0.11",
"fstream-ignore": "1.0.5",
"once": "1.4.0",
"readable-stream": "2.2.9",
"rimraf": "2.6.1",
"tar": "2.2.1",
"uid-number": "0.0.6"
}
},
"tough-cookie": {
"version": "2.3.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"punycode": "1.4.1"
}
},
"tunnel-agent": {
"version": "0.6.0",
"version": "4.4.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "5.0.1"
"chownr": "1.0.1",
"fs-minipass": "1.2.5",
"minipass": "2.2.4",
"minizlib": "1.1.0",
"mkdirp": "0.5.1",
"safe-buffer": "5.1.1",
"yallist": "3.0.2"
}
},
"tweetnacl": {
"version": "0.14.5",
"bundled": true,
"dev": true,
"optional": true
},
"uid-number": {
"version": "0.0.6",
"bundled": true,
"dev": true,
"optional": true
},
"util-deprecate": {
"version": "1.0.2",
"bundled": true,
"dev": true
},
"uuid": {
"version": "3.0.1",
"bundled": true,
"dev": true,
"optional": true
},
"verror": {
"version": "1.3.6",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"extsprintf": "1.0.2"
}
},
"wide-align": {
"version": "1.1.2",
"bundled": true,
......@@ -3961,6 +3588,11 @@
"version": "1.0.2",
"bundled": true,
"dev": true
},
"yallist": {
"version": "3.0.2",
"bundled": true,
"dev": true
}
}
},
......@@ -7621,9 +7253,9 @@
}
},
"solidity-coverage": {
"version": "0.4.15",
"resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.4.15.tgz",
"integrity": "sha512-iA3MT20rh1LllcNwfxAKU3ZBDu8R/4K8jANJAk7BcJU1foOjEh3tYhGqL8w2kRJPIo5XtoW0wxyVt95X2eJk/A==",
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.5.0.tgz",
"integrity": "sha512-JUVh30DZaK0V61dUZWh4b+PXkD+FFEWpP2PuGj1LAMJNGdMWs3bo7I0hLlCTJiqJ2YZ1YF9v8hQyndFPhkIuCw==",
"dev": true,
"requires": {
"death": "1.1.0",
......@@ -7633,25 +7265,27 @@
"req-cwd": "1.0.1",
"shelljs": "0.7.8",
"sol-explore": "1.6.2",
"solidity-parser-sc": "0.4.7",
"solidity-parser-sc": "0.4.8",
"web3": "0.18.4"
}
},
"dependencies": {
"solidity-parser-sc": {
"version": "0.4.7",
"resolved": "https://registry.npmjs.org/solidity-parser-sc/-/solidity-parser-sc-0.4.7.tgz",
"integrity": "sha512-wbX2806sm6thZME1aniqLcLH9HYwNwuKke6aw/FEgupCvoT9Iq5PdwuN9OyHWKGBOVeczpM5tCrnRXWNQ04YVw==",
"version": "0.4.8",
"resolved": "https://registry.npmjs.org/solidity-parser-sc/-/solidity-parser-sc-0.4.8.tgz",
"integrity": "sha512-Suenp3ireAbJ1E58yXwcFbkxvuhX10VTKdmrPKVzharjMji1jySfvE8PuzIw3FivtkNwUsQtijQ/k6t21RFohg==",
"dev": true,
"requires": {
"mocha": "2.5.3",
"pegjs": "0.10.0",
"yargs": "4.8.1"
}
}
}
},
"solium": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/solium/-/solium-1.1.6.tgz",
"integrity": "sha512-hCZr5cEK2H6LVC1Lr7IGPGJ8Bs4Ktif9cmwnk3BHpoZLIwTtrNE0LUtTRBxkO3/G0GGB4OdxnnJT1pbgsJ/2Uw==",
"version": "1.1.7",
"resolved": "https://registry.npmjs.org/solium/-/solium-1.1.7.tgz",
"integrity": "sha512-yYbalsrzJCU+QJ0HZvxAT4IQIqI1e6KPW2vop0NaHwdijqhQC9fJkVioCrL18NbO2Z8rdcnx8Y0JpvYJWrIjRg==",
"dev": true,
"requires": {
"ajv": "5.5.2",
......@@ -7663,10 +7297,35 @@
"sol-digger": "0.0.2",
"sol-explore": "1.6.1",
"solium-plugin-security": "0.1.1",
"solparse": "2.2.4",
"solparse": "2.2.5",
"text-table": "0.2.0"
},
"dependencies": {
"sol-explore": {
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/sol-explore/-/sol-explore-1.6.1.tgz",
"integrity": "sha1-tZ8HPGn+MyVg1aEMMrqMp/KYbPs=",
"dev": true
}
}
},
"solium-plugin-security": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/solium-plugin-security/-/solium-plugin-security-0.1.1.tgz",
"integrity": "sha512-kpLirBwIq4mhxk0Y/nn5cQ6qdJTI+U1LO3gpoNIcqNaW+sI058moXBe2UiHs+9wvF9IzYD49jcKhFTxcR9u9SQ==",
"dev": true
},
"solparse": {
"version": "2.2.5",
"resolved": "https://registry.npmjs.org/solparse/-/solparse-2.2.5.tgz",
"integrity": "sha512-t7tvtR6KU6QfPYLMv1nlCh9DA8HYIu5tbjHpKu0fhGFZ1NuSp0KKDHfFHv07g6v1xgcuUY3rVqNFjZt5b9+5qA==",
"dev": true,
"requires": {
"mocha": "4.1.0",
"pegjs": "0.10.0",
"yargs": "10.1.2"
},
"dependencies": {
"ansi-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
......@@ -7680,9 +7339,9 @@
"dev": true
},
"cliui": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz",
"integrity": "sha512-nY3W5Gu2racvdDk//ELReY+dHjb9PlIcVDFXP72nVIhq2Gy3LuVXYwJoPVudwQnv1shtohpgkdCKT2YaKY0CKw==",
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
"integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
"dev": true,
"requires": {
"string-width": "2.1.1",
......@@ -7761,23 +7420,6 @@
"mem": "1.1.0"
}
},
"sol-explore": {
"version": "1.6.1",
"resolved": "https://registry.npmjs.org/sol-explore/-/sol-explore-1.6.1.tgz",
"integrity": "sha1-tZ8HPGn+MyVg1aEMMrqMp/KYbPs=",
"dev": true
},
"solparse": {
"version": "2.2.4",
"resolved": "https://registry.npmjs.org/solparse/-/solparse-2.2.4.tgz",
"integrity": "sha512-Sdyk983juUaOITdTD9U5Yc+MaX8kz4pN3wFyCRILWXW3+Ff96PxY9RLBuZINYbBgCAXN1a+kThJfFMlaXG9R6A==",
"dev": true,
"requires": {
"mocha": "4.1.0",
"pegjs": "0.10.0",
"yargs": "10.1.2"
}
},
"string-width": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
......@@ -7818,7 +7460,7 @@
"integrity": "sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig==",
"dev": true,
"requires": {
"cliui": "4.0.0",
"cliui": "4.1.0",
"decamelize": "1.2.0",
"find-up": "2.1.0",
"get-caller-file": "1.0.2",
......@@ -7843,12 +7485,6 @@
}
}
},
"solium-plugin-security": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/solium-plugin-security/-/solium-plugin-security-0.1.1.tgz",
"integrity": "sha512-kpLirBwIq4mhxk0Y/nn5cQ6qdJTI+U1LO3gpoNIcqNaW+sI058moXBe2UiHs+9wvF9IzYD49jcKhFTxcR9u9SQ==",
"dev": true
},
"sort-keys": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz",
......@@ -8285,14 +7921,14 @@
"dev": true
},
"truffle": {
"version": "4.1.5",
"resolved": "https://registry.npmjs.org/truffle/-/truffle-4.1.5.tgz",
"integrity": "sha512-6sOVFQ0xNbb52MMWf0nHxv0FiXWPTV+OIbq1B0+I5F3sIS8JJ7pM1+o7chbs+oO/CLqbbC6ggXJqFWzIWaiaQg==",
"version": "4.1.8",
"resolved": "https://registry.npmjs.org/truffle/-/truffle-4.1.8.tgz",
"integrity": "sha512-btDML3J9Ao+UDqR725ajTybcEqyXzxFzJDC/NAXOyOXoXf2HJwKq6VEvnjP9qc6owA+fJ50d87MmsPRXk+riCg==",
"dev": true,
"requires": {
"mocha": "3.5.3",
"original-require": "1.0.1",
"solc": "0.4.21"
"solc": "0.4.23"
},
"dependencies": {
"commander": {
......@@ -8345,9 +7981,9 @@
}
},
"solc": {
"version": "0.4.21",
"resolved": "https://registry.npmjs.org/solc/-/solc-0.4.21.tgz",
"integrity": "sha512-8lJmimVjOG9AJOQRWS2ph4rSctPMsPGZ4H360HLs5iI+euUlt7iAvUxSLeFZZzwk0kas4Qta7HmlMXNU3yYwhw==",
"version": "0.4.23",
"resolved": "https://registry.npmjs.org/solc/-/solc-0.4.23.tgz",
"integrity": "sha512-AT7anLHY6uIRg2It6N0UlCHeZ7YeecIkUhnlirrCgCPCUevtnoN48BxvgigN/4jJTRljv5oFhAJtI6gvHzT5DQ==",
"dev": true,
"requires": {
"fs-extra": "0.30.0",
......
package.json
......@@ -56,9 +56,9 @@
"ethereumjs-util": "^5.1.2",
"ethjs-abi": "^0.2.1",
"ganache-cli": "6.1.0",
"solidity-coverage": "^0.4.15",
"solium": "^1.1.6",
"truffle": "^4.1.5",
"solidity-coverage": "^0.5.0",
"solium": "^1.1.7",
"truffle": "^4.1.8",
"truffle-hdwallet-provider": "0.0.3"
}
}
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