Skip to content

O
openzeppelin-contracts-upgradeable
Unverified Commit c9fff647 by Ernestas Committed by GitHub
Options

Merge branch 'master' into fix/error-testing-in-delayed-claimable#672

parents a4029e74 ec2f7ba8
Showing with 1611 additions and 461 deletions
.github/PULL_REQUEST_TEMPLATE.md
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
- [ ] 📘 I've reviewed the [OpenZeppelin Contributor Guidelines](/docs/CONTRIBUTING.md) - [ ] 📘 I've reviewed the [OpenZeppelin Contributor Guidelines](/docs/CONTRIBUTING.md)
- [ ] ✅ I've added tests where applicable to test my new functionality. - [ ] ✅ I've added tests where applicable to test my new functionality.
- [ ] 📖 I've made sure that my contracts are well-documented. - [ ] 📖 I've made sure that my contracts are well-documented.
- [ ] 🎨 I've run the JavaScript linter (`npm run lint:fix`) and fixed all issues. - [ ] 🎨 I've run the JS/Solidity linters (`npm run lint:all:fix`) and fixed any issues.
<!-- **Does this close any open issues?** If so, list them here. --> <!-- **Does this close any open issues?** If so, list them here. -->
......
.soliumrc.json
{ {
"custom-rules-filename": null, "extends": "solium:all",
"plugins": ["security"],
"rules": { "rules": {
"imports-on-top": true, "quotes": ["error", "double"],
"variable-declarations": true, "indentation": ["error", 2],
"array-declarations": true, "arg-overflow": ["warning", 3],
"operator-whitespace": true, "security/enforce-explicit-visibility": ["error"],
"lbrace": true, "security/no-block-members": ["warning"],
"mixedcase": false, "security/no-inline-assembly": ["warning"]
"camelcase": true,
"uppercase": true,
"no-with": true,
"no-empty-blocks": true,
"no-unused-vars": true,
"double-quotes": true,
"blank-lines": true,
"indentation": true,
"whitespace": true,
"deprecated-suicide": true,
"pragma-on-top": true
} }
} }
.travis.yml
...@@ -18,6 +18,7 @@ before_script: ...@@ -18,6 +18,7 @@ before_script:
- truffle version - truffle version
script: script:
- npm run lint - npm run lint
- npm run lint:sol
- npm run test - npm run test
notifications: notifications:
slack: slack:
......
contracts/Bounty.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import './payment/PullPayment.sol'; import "./payment/PullPayment.sol";
import './lifecycle/Destructible.sol'; import "./lifecycle/Destructible.sol";
/** /**
...@@ -35,12 +35,6 @@ contract Bounty is PullPayment, Destructible { ...@@ -35,12 +35,6 @@ contract Bounty is PullPayment, Destructible {
} }
/** /**
* @dev Internal function to deploy the target contract.
* @return A target contract address
*/
function deployContract() internal returns(address);
/**
* @dev Sends the contract funds to the researcher that proved the contract is broken. * @dev Sends the contract funds to the researcher that proved the contract is broken.
* @param target contract * @param target contract
*/ */
...@@ -53,6 +47,12 @@ contract Bounty is PullPayment, Destructible { ...@@ -53,6 +47,12 @@ contract Bounty is PullPayment, Destructible {
claimed = true; claimed = true;
} }
/**
* @dev Internal function to deploy the target contract.
* @return A target contract address
*/
function deployContract() internal returns(address);
} }
......
contracts/DayLimit.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
/** /**
* @title DayLimit * @title DayLimit
* @dev Base contract that enables methods to be protected by placing a linear limit (specifiable) * @dev Base contract that enables methods to be protected by placing a linear limit (specifiable)
......
contracts/MerkleProof.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
/* /*
* @title MerkleProof * @title MerkleProof
* @dev Merkle proof verification * @dev Merkle proof verification
...@@ -15,7 +16,9 @@ library MerkleProof { ...@@ -15,7 +16,9 @@ library MerkleProof {
*/ */
function verifyProof(bytes _proof, bytes32 _root, bytes32 _leaf) public pure returns (bool) { function verifyProof(bytes _proof, bytes32 _root, bytes32 _leaf) public pure returns (bool) {
// Check if proof length is a multiple of 32 // Check if proof length is a multiple of 32
if (_proof.length % 32 != 0) return false; if (_proof.length % 32 != 0) {
return false;
}
bytes32 proofElement; bytes32 proofElement;
bytes32 computedHash = _leaf; bytes32 computedHash = _leaf;
......
contracts/ReentrancyGuard.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
/** /**
* @title Helps contracts guard agains reentrancy attacks. * @title Helps contracts guard agains reentrancy attacks.
* @author Remco Bloemen <remco@2π.com> * @author Remco Bloemen <remco@2π.com>
......
contracts/crowdsale/CappedCrowdsale.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../math/SafeMath.sol'; import "../math/SafeMath.sol";
import './Crowdsale.sol'; import "./Crowdsale.sol";
/** /**
* @title CappedCrowdsale * @title CappedCrowdsale
...@@ -17,13 +18,6 @@ contract CappedCrowdsale is Crowdsale { ...@@ -17,13 +18,6 @@ contract CappedCrowdsale is Crowdsale {
cap = _cap; cap = _cap;
} }
// overriding Crowdsale#validPurchase to add extra cap logic
// @return true if investors can buy at the moment
function validPurchase() internal view returns (bool) {
bool withinCap = weiRaised.add(msg.value) <= cap;
return super.validPurchase() && withinCap;
}
// overriding Crowdsale#hasEnded to add cap logic // overriding Crowdsale#hasEnded to add cap logic
// @return true if crowdsale event has ended // @return true if crowdsale event has ended
function hasEnded() public view returns (bool) { function hasEnded() public view returns (bool) {
...@@ -31,4 +25,11 @@ contract CappedCrowdsale is Crowdsale { ...@@ -31,4 +25,11 @@ contract CappedCrowdsale is Crowdsale {
return super.hasEnded() || capReached; return super.hasEnded() || capReached;
} }
// overriding Crowdsale#validPurchase to add extra cap logic
// @return true if investors can buy at the moment
function validPurchase() internal view returns (bool) {
bool withinCap = weiRaised.add(msg.value) <= cap;
return super.validPurchase() && withinCap;
}
} }
contracts/crowdsale/Crowdsale.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../token/MintableToken.sol'; import "../token/MintableToken.sol";
import '../math/SafeMath.sol'; import "../math/SafeMath.sol";
/** /**
* @title Crowdsale * @title Crowdsale
...@@ -53,22 +54,11 @@ contract Crowdsale { ...@@ -53,22 +54,11 @@ contract Crowdsale {
wallet = _wallet; wallet = _wallet;
} }
// creates the token to be sold.
// override this method to have crowdsale of a specific mintable token.
function createTokenContract() internal returns (MintableToken) {
return new MintableToken();
}
// fallback function can be used to buy tokens // fallback function can be used to buy tokens
function () external payable { function () external payable {
buyTokens(msg.sender); buyTokens(msg.sender);
} }
// Override this method to have a way to add business logic to your crowdsale when buying
function getTokenAmount(uint256 weiAmount) internal view returns(uint256) {
return weiAmount.mul(rate);
}
// low level token purchase function // low level token purchase function
function buyTokens(address beneficiary) public payable { function buyTokens(address beneficiary) public payable {
require(beneficiary != address(0)); require(beneficiary != address(0));
...@@ -88,6 +78,22 @@ contract Crowdsale { ...@@ -88,6 +78,22 @@ contract Crowdsale {
forwardFunds(); forwardFunds();
} }
// @return true if crowdsale event has ended
function hasEnded() public view returns (bool) {
return now > endTime;
}
// creates the token to be sold.
// override this method to have crowdsale of a specific mintable token.
function createTokenContract() internal returns (MintableToken) {
return new MintableToken();
}
// Override this method to have a way to add business logic to your crowdsale when buying
function getTokenAmount(uint256 weiAmount) internal view returns(uint256) {
return weiAmount.mul(rate);
}
// send ether to the fund collection wallet // send ether to the fund collection wallet
// override to create custom fund forwarding mechanisms // override to create custom fund forwarding mechanisms
function forwardFunds() internal { function forwardFunds() internal {
...@@ -101,10 +107,4 @@ contract Crowdsale { ...@@ -101,10 +107,4 @@ contract Crowdsale {
return withinPeriod && nonZeroPurchase; return withinPeriod && nonZeroPurchase;
} }
// @return true if crowdsale event has ended
function hasEnded() public view returns (bool) {
return now > endTime;
}
} }
contracts/crowdsale/FinalizableCrowdsale.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../math/SafeMath.sol'; import "../math/SafeMath.sol";
import '../ownership/Ownable.sol'; import "../ownership/Ownable.sol";
import './Crowdsale.sol'; import "./Crowdsale.sol";
/** /**
* @title FinalizableCrowdsale * @title FinalizableCrowdsale
......
contracts/crowdsale/RefundVault.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../math/SafeMath.sol'; import "../math/SafeMath.sol";
import '../ownership/Ownable.sol'; import "../ownership/Ownable.sol";
/** /**
* @title RefundVault * @title RefundVault
......
contracts/crowdsale/RefundableCrowdsale.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../math/SafeMath.sol'; import "../math/SafeMath.sol";
import './FinalizableCrowdsale.sol'; import "./FinalizableCrowdsale.sol";
import './RefundVault.sol'; import "./RefundVault.sol";
/** /**
...@@ -27,13 +27,6 @@ contract RefundableCrowdsale is FinalizableCrowdsale { ...@@ -27,13 +27,6 @@ contract RefundableCrowdsale is FinalizableCrowdsale {
goal = _goal; goal = _goal;
} }
// We're overriding the fund forwarding from Crowdsale.
// In addition to sending the funds, we want to call
// the RefundVault deposit function
function forwardFunds() internal {
vault.deposit.value(msg.value)(msg.sender);
}
// if crowdsale is unsuccessful, investors can claim refunds here // if crowdsale is unsuccessful, investors can claim refunds here
function claimRefund() public { function claimRefund() public {
require(isFinalized); require(isFinalized);
...@@ -42,6 +35,10 @@ contract RefundableCrowdsale is FinalizableCrowdsale { ...@@ -42,6 +35,10 @@ contract RefundableCrowdsale is FinalizableCrowdsale {
vault.refund(msg.sender); vault.refund(msg.sender);
} }
function goalReached() public view returns (bool) {
return weiRaised >= goal;
}
// vault finalization task, called when owner calls finalize() // vault finalization task, called when owner calls finalize()
function finalization() internal { function finalization() internal {
if (goalReached()) { if (goalReached()) {
...@@ -53,8 +50,11 @@ contract RefundableCrowdsale is FinalizableCrowdsale { ...@@ -53,8 +50,11 @@ contract RefundableCrowdsale is FinalizableCrowdsale {
super.finalization(); super.finalization();
} }
function goalReached() public view returns (bool) { // We're overriding the fund forwarding from Crowdsale.
return weiRaised >= goal; // In addition to sending the funds, we want to call
// the RefundVault deposit function
function forwardFunds() internal {
vault.deposit.value(msg.value)(msg.sender);
} }
} }
contracts/examples/SampleCrowdsale.sol
...@@ -4,6 +4,7 @@ import "../crowdsale/CappedCrowdsale.sol"; ...@@ -4,6 +4,7 @@ import "../crowdsale/CappedCrowdsale.sol";
import "../crowdsale/RefundableCrowdsale.sol"; import "../crowdsale/RefundableCrowdsale.sol";
import "../token/MintableToken.sol"; import "../token/MintableToken.sol";
/** /**
* @title SampleCrowdsaleToken * @title SampleCrowdsaleToken
* @dev Very simple ERC20 Token that can be minted. * @dev Very simple ERC20 Token that can be minted.
...@@ -11,12 +12,13 @@ import "../token/MintableToken.sol"; ...@@ -11,12 +12,13 @@ import "../token/MintableToken.sol";
*/ */
contract SampleCrowdsaleToken is MintableToken { contract SampleCrowdsaleToken is MintableToken {
string public constant name = "Sample Crowdsale Token"; string public constant name = "Sample Crowdsale Token"; // solium-disable-line uppercase
string public constant symbol = "SCT"; string public constant symbol = "SCT"; // solium-disable-line uppercase
uint8 public constant decimals = 18; uint8 public constant decimals = 18; // solium-disable-line uppercase
} }
/** /**
* @title SampleCrowdsale * @title SampleCrowdsale
* @dev This is an example of a fully fledged crowdsale. * @dev This is an example of a fully fledged crowdsale.
......
contracts/examples/SimpleToken.sol
...@@ -12,9 +12,9 @@ import "../token/StandardToken.sol"; ...@@ -12,9 +12,9 @@ import "../token/StandardToken.sol";
*/ */
contract SimpleToken is StandardToken { contract SimpleToken is StandardToken {
string public constant name = "SimpleToken"; string public constant name = "SimpleToken"; // solium-disable-line uppercase
string public constant symbol = "SIM"; string public constant symbol = "SIM"; // solium-disable-line uppercase
uint8 public constant decimals = 18; uint8 public constant decimals = 18; // solium-disable-line uppercase
uint256 public constant INITIAL_SUPPLY = 10000 * (10 ** uint256(decimals)); uint256 public constant INITIAL_SUPPLY = 10000 * (10 ** uint256(decimals));
......
contracts/lifecycle/Migrations.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import "../ownership/Ownable.sol";
import '../ownership/Ownable.sol';
/** /**
* @title Migrations * @title Migrations
......
contracts/lifecycle/TokenDestructible.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import "../ownership/Ownable.sol"; import "../ownership/Ownable.sol";
import "../token/ERC20Basic.sol"; import "../token/ERC20Basic.sol";
/** /**
* @title TokenDestructible: * @title TokenDestructible:
* @author Remco Bloemen <remco@2π.com> * @author Remco Bloemen <remco@2π.com>
...@@ -24,7 +24,7 @@ contract TokenDestructible is Ownable { ...@@ -24,7 +24,7 @@ contract TokenDestructible is Ownable {
function destroy(address[] tokens) onlyOwner public { function destroy(address[] tokens) onlyOwner public {
// Transfer tokens to owner // Transfer tokens to owner
for(uint256 i = 0; i < tokens.length; i++) { for (uint256 i = 0; i < tokens.length; i++) {
ERC20Basic token = ERC20Basic(tokens[i]); ERC20Basic token = ERC20Basic(tokens[i]);
uint256 balance = token.balanceOf(this); uint256 balance = token.balanceOf(this);
token.transfer(owner, balance); token.transfer(owner, balance);
......
contracts/math/Math.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
/** /**
* @title Math * @title Math
* @dev Assorted math operations * @dev Assorted math operations
*/ */
library Math { library Math {
function max64(uint64 a, uint64 b) internal pure returns (uint64) { function max64(uint64 a, uint64 b) internal pure returns (uint64) {
return a >= b ? a : b; return a >= b ? a : b;
......
contracts/mocks/BasicTokenMock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../token/BasicToken.sol'; import "../token/BasicToken.sol";
// mock class using BasicToken // mock class using BasicToken
......
contracts/mocks/BurnableTokenMock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../token/BurnableToken.sol'; import "../token/BurnableToken.sol";
contract BurnableTokenMock is BurnableToken { contract BurnableTokenMock is BurnableToken {
......
contracts/mocks/CappedCrowdsaleImpl.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../crowdsale/CappedCrowdsale.sol'; import "../crowdsale/CappedCrowdsale.sol";
contract CappedCrowdsaleImpl is CappedCrowdsale { contract CappedCrowdsaleImpl is CappedCrowdsale {
......
contracts/mocks/DayLimitMock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import "../../contracts/DayLimit.sol"; import "../../contracts/DayLimit.sol";
contract DayLimitMock is DayLimit { contract DayLimitMock is DayLimit {
uint256 public totalSpending; uint256 public totalSpending;
......
contracts/mocks/DetailedERC20Mock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../token/StandardToken.sol'; import "../token/StandardToken.sol";
import '../token/DetailedERC20.sol'; import "../token/DetailedERC20.sol";
contract DetailedERC20Mock is StandardToken, DetailedERC20 { contract DetailedERC20Mock is StandardToken, DetailedERC20 {
function DetailedERC20Mock(string _name, string _symbol, uint8 _decimals) DetailedERC20(_name, _symbol, _decimals) public {} function DetailedERC20Mock(string _name, string _symbol, uint8 _decimals) DetailedERC20(_name, _symbol, _decimals) public {}
......
contracts/mocks/ECRecoveryMock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../ECRecovery.sol'; import "../ECRecovery.sol";
contract ECRecoveryMock { contract ECRecoveryMock {
......
contracts/mocks/ERC23TokenMock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../token/BasicToken.sol'; import "../token/BasicToken.sol";
contract ERC23ContractInterface { contract ERC23ContractInterface {
function tokenFallback(address _from, uint256 _value, bytes _data) external; function tokenFallback(address _from, uint256 _value, bytes _data) external;
} }
contract ERC23TokenMock is BasicToken { contract ERC23TokenMock is BasicToken {
function ERC23TokenMock(address initialAccount, uint256 initialBalance) public { function ERC23TokenMock(address initialAccount, uint256 initialBalance) public {
...@@ -24,7 +25,7 @@ contract ERC23TokenMock is BasicToken { ...@@ -24,7 +25,7 @@ contract ERC23TokenMock is BasicToken {
assembly { assembly {
is_contract := not(iszero(extcodesize(_to))) is_contract := not(iszero(extcodesize(_to)))
} }
if(is_contract) { if (is_contract) {
ERC23ContractInterface receiver = ERC23ContractInterface(_to); ERC23ContractInterface receiver = ERC23ContractInterface(_to);
receiver.tokenFallback(msg.sender, _value, _data); receiver.tokenFallback(msg.sender, _value, _data);
} }
......
contracts/mocks/FinalizableCrowdsaleImpl.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../crowdsale/FinalizableCrowdsale.sol'; import "../crowdsale/FinalizableCrowdsale.sol";
contract FinalizableCrowdsaleImpl is FinalizableCrowdsale { contract FinalizableCrowdsaleImpl is FinalizableCrowdsale {
......
contracts/mocks/ForceEther.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
// @title Force Ether into a contract. // @title Force Ether into a contract.
// @notice even // @notice even
// if the contract is not payable. // if the contract is not payable.
// @notice To use, construct the contract with the target as argument. // @notice To use, construct the contract with the target as argument.
// @author Remco Bloemen <remco@neufund.org> // @author Remco Bloemen <remco@neufund.org>
contract ForceEther { contract ForceEther {
function ForceEther() public payable { } function ForceEther() public payable { }
......
contracts/mocks/HasNoEtherTest.sol
...@@ -2,6 +2,7 @@ pragma solidity ^0.4.18; ...@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
import "../../contracts/ownership/HasNoEther.sol"; import "../../contracts/ownership/HasNoEther.sol";
contract HasNoEtherTest is HasNoEther { contract HasNoEtherTest is HasNoEther {
// Constructor with explicit payable — should still fail // Constructor with explicit payable — should still fail
......
contracts/mocks/InsecureTargetBounty.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import {Bounty, Target} from "../../contracts/Bounty.sol"; import {Bounty, Target} from "../../contracts/Bounty.sol";
contract InsecureTargetMock is Target { contract InsecureTargetMock is Target {
function checkInvariant() public returns(bool){ function checkInvariant() public returns(bool) {
return false; return false;
} }
} }
contract InsecureTargetBounty is Bounty { contract InsecureTargetBounty is Bounty {
function deployContract() internal returns (address) { function deployContract() internal returns (address) {
return new InsecureTargetMock(); return new InsecureTargetMock();
......
contracts/mocks/LimitBalanceMock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../LimitBalance.sol'; import "../LimitBalance.sol";
// mock class using LimitBalance // mock class using LimitBalance
......
contracts/mocks/PausableMock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../lifecycle/Pausable.sol'; import "../lifecycle/Pausable.sol";
// mock class using Pausable // mock class using Pausable
......
contracts/mocks/PausableTokenMock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../token/PausableToken.sol'; import "../token/PausableToken.sol";
// mock class using PausableToken // mock class using PausableToken
contract PausableTokenMock is PausableToken { contract PausableTokenMock is PausableToken {
......
contracts/mocks/PullPaymentMock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../payment/PullPayment.sol'; import "../payment/PullPayment.sol";
// mock class using PullPayment // mock class using PullPayment
......
contracts/mocks/RBACMock.sol
pragma solidity ^0.4.8; pragma solidity ^0.4.8;
import '../ownership/rbac/RBAC.sol'; import "../ownership/rbac/RBAC.sol";
contract RBACMock is RBAC { contract RBACMock is RBAC {
string constant ROLE_ADVISOR = "advisor"; string constant ROLE_ADVISOR = "advisor";
modifier onlyAdminOrAdvisor() modifier onlyAdminOrAdvisor()
{ {
require( require(
hasRole(msg.sender, ROLE_ADMIN) || hasRole(msg.sender, ROLE_ADMIN) ||
hasRole(msg.sender, ROLE_ADVISOR) hasRole(msg.sender, ROLE_ADVISOR)
); );
_; _;
} }
function RBACMock(address[] _advisors) function RBACMock(address[] _advisors)
public public
{ {
addRole(msg.sender, ROLE_ADVISOR); addRole(msg.sender, ROLE_ADVISOR);
for (uint256 i = 0; i < _advisors.length; i++) { for (uint256 i = 0; i < _advisors.length; i++) {
addRole(_advisors[i], ROLE_ADVISOR); addRole(_advisors[i], ROLE_ADVISOR);
}
} }
}
function onlyAdminsCanDoThis() function onlyAdminsCanDoThis()
onlyAdmin onlyAdmin
view view
external external
{ {
} }
function onlyAdvisorsCanDoThis() function onlyAdvisorsCanDoThis()
onlyRole(ROLE_ADVISOR) onlyRole(ROLE_ADVISOR)
view view
external external
{ {
} }
function eitherAdminOrAdvisorCanDoThis() function eitherAdminOrAdvisorCanDoThis()
onlyAdminOrAdvisor onlyAdminOrAdvisor
view view
external external
{ {
} }
function nobodyCanDoThis() function nobodyCanDoThis()
onlyRole("unknown") onlyRole("unknown")
view view
external external
{ {
} }
// admins can remove advisor's role // admins can remove advisor's role
function removeAdvisor(address _addr) function removeAdvisor(address _addr)
onlyAdmin onlyAdmin
public public
{ {
// revert if the user isn't an advisor // revert if the user isn't an advisor
// (perhaps you want to soft-fail here instead?) // (perhaps you want to soft-fail here instead?)
checkRole(_addr, ROLE_ADVISOR); checkRole(_addr, ROLE_ADVISOR);
// remove the advisor's role // remove the advisor's role
removeRole(_addr, ROLE_ADVISOR); removeRole(_addr, ROLE_ADVISOR);
} }
} }
contracts/mocks/ReentrancyAttack.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
contract ReentrancyAttack { contract ReentrancyAttack {
function callSender(bytes4 data) public { function callSender(bytes4 data) public {
......
contracts/mocks/ReentrancyMock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../ReentrancyGuard.sol'; import "../ReentrancyGuard.sol";
import './ReentrancyAttack.sol'; import "./ReentrancyAttack.sol";
contract ReentrancyMock is ReentrancyGuard { contract ReentrancyMock is ReentrancyGuard {
...@@ -11,12 +12,12 @@ contract ReentrancyMock is ReentrancyGuard { ...@@ -11,12 +12,12 @@ contract ReentrancyMock is ReentrancyGuard {
counter = 0; counter = 0;
} }
function count() private { function callback() external nonReentrant {
counter += 1; count();
} }
function countLocalRecursive(uint256 n) public nonReentrant { function countLocalRecursive(uint256 n) public nonReentrant {
if(n > 0) { if (n > 0) {
count(); count();
countLocalRecursive(n - 1); countLocalRecursive(n - 1);
} }
...@@ -24,7 +25,7 @@ contract ReentrancyMock is ReentrancyGuard { ...@@ -24,7 +25,7 @@ contract ReentrancyMock is ReentrancyGuard {
function countThisRecursive(uint256 n) public nonReentrant { function countThisRecursive(uint256 n) public nonReentrant {
bytes4 func = bytes4(keccak256("countThisRecursive(uint256)")); bytes4 func = bytes4(keccak256("countThisRecursive(uint256)"));
if(n > 0) { if (n > 0) {
count(); count();
bool result = this.call(func, n - 1); bool result = this.call(func, n - 1);
require(result == true); require(result == true);
...@@ -37,8 +38,8 @@ contract ReentrancyMock is ReentrancyGuard { ...@@ -37,8 +38,8 @@ contract ReentrancyMock is ReentrancyGuard {
attacker.callSender(func); attacker.callSender(func);
} }
function callback() external nonReentrant { function count() private {
count(); counter += 1;
} }
} }
contracts/mocks/RefundableCrowdsaleImpl.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../crowdsale/RefundableCrowdsale.sol'; import "../crowdsale/RefundableCrowdsale.sol";
contract RefundableCrowdsaleImpl is RefundableCrowdsale { contract RefundableCrowdsaleImpl is RefundableCrowdsale {
......
contracts/mocks/SafeERC20Helper.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../token/ERC20.sol'; import "../token/ERC20.sol";
import '../token/SafeERC20.sol'; import "../token/SafeERC20.sol";
contract ERC20FailingMock is ERC20 { contract ERC20FailingMock is ERC20 {
function transfer(address, uint256) public returns (bool) { function transfer(address, uint256) public returns (bool) {
...@@ -25,6 +26,7 @@ contract ERC20FailingMock is ERC20 { ...@@ -25,6 +26,7 @@ contract ERC20FailingMock is ERC20 {
} }
} }
contract ERC20SucceedingMock is ERC20 { contract ERC20SucceedingMock is ERC20 {
function transfer(address, uint256) public returns (bool) { function transfer(address, uint256) public returns (bool) {
return true; return true;
...@@ -47,6 +49,7 @@ contract ERC20SucceedingMock is ERC20 { ...@@ -47,6 +49,7 @@ contract ERC20SucceedingMock is ERC20 {
} }
} }
contract SafeERC20Helper { contract SafeERC20Helper {
using SafeERC20 for ERC20; using SafeERC20 for ERC20;
......
contracts/mocks/SafeMathMock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../math/SafeMath.sol'; import "../math/SafeMath.sol";
contract SafeMathMock { contract SafeMathMock {
......
contracts/mocks/SecureTargetBounty.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import {Bounty, Target} from "../../contracts/Bounty.sol"; import {Bounty, Target} from "../../contracts/Bounty.sol";
...@@ -10,6 +9,7 @@ contract SecureTargetMock is Target { ...@@ -10,6 +9,7 @@ contract SecureTargetMock is Target {
} }
} }
contract SecureTargetBounty is Bounty { contract SecureTargetBounty is Bounty {
function deployContract() internal returns (address) { function deployContract() internal returns (address) {
return new SecureTargetMock(); return new SecureTargetMock();
......
contracts/mocks/StandardTokenMock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../token/StandardToken.sol'; import "../token/StandardToken.sol";
// mock class using StandardToken // mock class using StandardToken
......
contracts/ownership/CanReclaimToken.sol
...@@ -4,6 +4,7 @@ import "./Ownable.sol"; ...@@ -4,6 +4,7 @@ import "./Ownable.sol";
import "../token/ERC20Basic.sol"; import "../token/ERC20Basic.sol";
import "../token/SafeERC20.sol"; import "../token/SafeERC20.sol";
/** /**
* @title Contracts that should be able to recover tokens * @title Contracts that should be able to recover tokens
* @author SylTi * @author SylTi
......
contracts/ownership/Claimable.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import './Ownable.sol'; import "./Ownable.sol";
/** /**
......
contracts/ownership/Contactable.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import './Ownable.sol'; import "./Ownable.sol";
/** /**
* @title Contactable token * @title Contactable token
* @dev Basic version of a contactable contract, allowing the owner to provide a string with their * @dev Basic version of a contactable contract, allowing the owner to provide a string with their
* contact information. * contact information.
*/ */
contract Contactable is Ownable{ contract Contactable is Ownable {
string public contactInformation; string public contactInformation;
/** /**
* @dev Allows the owner to set a string with their contact information. * @dev Allows the owner to set a string with their contact information.
* @param info The contact information to attach to the contract. * @param info The contact information to attach to the contract.
*/ */
function setContactInformation(string info) onlyOwner public { function setContactInformation(string info) onlyOwner public {
contactInformation = info; contactInformation = info;
} }
} }
contracts/ownership/DelayedClaimable.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import "./Claimable.sol";
import './Claimable.sol';
/** /**
...@@ -26,7 +25,6 @@ contract DelayedClaimable is Claimable { ...@@ -26,7 +25,6 @@ contract DelayedClaimable is Claimable {
start = _start; start = _start;
} }
/** /**
* @dev Allows the pendingOwner address to finalize the transfer, as long as it is called within * @dev Allows the pendingOwner address to finalize the transfer, as long as it is called within
* the specified start and end time. * the specified start and end time.
......
contracts/ownership/HasNoContracts.sol
...@@ -2,6 +2,7 @@ pragma solidity ^0.4.18; ...@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
import "./Ownable.sol"; import "./Ownable.sol";
/** /**
* @title Contracts that should not own Contracts * @title Contracts that should not own Contracts
* @author Remco Bloemen <remco@2π.com> * @author Remco Bloemen <remco@2π.com>
......
contracts/ownership/HasNoEther.sol
...@@ -2,6 +2,7 @@ pragma solidity ^0.4.18; ...@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
import "./Ownable.sol"; import "./Ownable.sol";
/** /**
* @title Contracts that should not own Ether * @title Contracts that should not own Ether
* @author Remco Bloemen <remco@2π.com> * @author Remco Bloemen <remco@2π.com>
......
contracts/ownership/HasNoTokens.sol
...@@ -2,6 +2,7 @@ pragma solidity ^0.4.18; ...@@ -2,6 +2,7 @@ pragma solidity ^0.4.18;
import "./CanReclaimToken.sol"; import "./CanReclaimToken.sol";
/** /**
* @title Contracts that should not own Tokens * @title Contracts that should not own Tokens
* @author Remco Bloemen <remco@2π.com> * @author Remco Bloemen <remco@2π.com>
......
contracts/ownership/NoOwner.sol
...@@ -4,6 +4,7 @@ import "./HasNoEther.sol"; ...@@ -4,6 +4,7 @@ import "./HasNoEther.sol";
import "./HasNoTokens.sol"; import "./HasNoTokens.sol";
import "./HasNoContracts.sol"; import "./HasNoContracts.sol";
/** /**
* @title Base contract for contracts that should not own things. * @title Base contract for contracts that should not own things.
* @author Remco Bloemen <remco@2π.com> * @author Remco Bloemen <remco@2π.com>
......
contracts/ownership/Ownable.sol
...@@ -21,7 +21,6 @@ contract Ownable { ...@@ -21,7 +21,6 @@ contract Ownable {
owner = msg.sender; owner = msg.sender;
} }
/** /**
* @dev Throws if called by any account other than the owner. * @dev Throws if called by any account other than the owner.
*/ */
...@@ -30,7 +29,6 @@ contract Ownable { ...@@ -30,7 +29,6 @@ contract Ownable {
_; _;
} }
/** /**
* @dev Allows the current owner to transfer control of the contract to a newOwner. * @dev Allows the current owner to transfer control of the contract to a newOwner.
* @param newOwner The address to transfer ownership to. * @param newOwner The address to transfer ownership to.
......
contracts/ownership/rbac/RBAC.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import './Roles.sol'; import "./Roles.sol";
/** /**
...@@ -15,143 +15,142 @@ import './Roles.sol'; ...@@ -15,143 +15,142 @@ import './Roles.sol';
* to avoid typos. * to avoid typos.
*/ */
contract RBAC { contract RBAC {
using Roles for Roles.Role; using Roles for Roles.Role;
mapping (string => Roles.Role) private roles; mapping (string => Roles.Role) private roles;
event RoleAdded(address addr, string roleName); event RoleAdded(address addr, string roleName);
event RoleRemoved(address addr, string roleName); event RoleRemoved(address addr, string roleName);
/** /**
* A constant role name for indicating admins. * A constant role name for indicating admins.
*/ */
string public constant ROLE_ADMIN = "admin"; string public constant ROLE_ADMIN = "admin";
/** /**
* @dev constructor. Sets msg.sender as admin by default * @dev constructor. Sets msg.sender as admin by default
*/ */
function RBAC() function RBAC()
public public
{ {
addRole(msg.sender, ROLE_ADMIN); addRole(msg.sender, ROLE_ADMIN);
} }
/** /**
* @dev add a role to an address * @dev reverts if addr does not have role
* @param addr address * @param addr address
* @param roleName the name of the role * @param roleName the name of the role
*/ * // reverts
function addRole(address addr, string roleName) */
internal function checkRole(address addr, string roleName)
{ view
roles[roleName].add(addr); public
RoleAdded(addr, roleName); {
} roles[roleName].check(addr);
}
/**
* @dev remove a role from an address /**
* @param addr address * @dev determine if addr has role
* @param roleName the name of the role * @param addr address
*/ * @param roleName the name of the role
function removeRole(address addr, string roleName) * @return bool
internal */
{ function hasRole(address addr, string roleName)
roles[roleName].remove(addr); view
RoleRemoved(addr, roleName); public
} returns (bool)
{
/** return roles[roleName].has(addr);
* @dev reverts if addr does not have role }
* @param addr address
* @param roleName the name of the role /**
* // reverts * @dev add a role to an address
*/ * @param addr address
function checkRole(address addr, string roleName) * @param roleName the name of the role
view */
public function adminAddRole(address addr, string roleName)
{ onlyAdmin
roles[roleName].check(addr); public
} {
addRole(addr, roleName);
/** }
* @dev determine if addr has role
* @param addr address /**
* @param roleName the name of the role * @dev remove a role from an address
* @return bool * @param addr address
*/ * @param roleName the name of the role
function hasRole(address addr, string roleName) */
view function adminRemoveRole(address addr, string roleName)
public onlyAdmin
returns (bool) public
{ {
return roles[roleName].has(addr); removeRole(addr, roleName);
} }
/** /**
* @dev add a role to an address * @dev add a role to an address
* @param addr address * @param addr address
* @param roleName the name of the role * @param roleName the name of the role
*/ */
function adminAddRole(address addr, string roleName) function addRole(address addr, string roleName)
onlyAdmin internal
public {
{ roles[roleName].add(addr);
addRole(addr, roleName); RoleAdded(addr, roleName);
} }
/** /**
* @dev remove a role from an address * @dev remove a role from an address
* @param addr address * @param addr address
* @param roleName the name of the role * @param roleName the name of the role
*/ */
function adminRemoveRole(address addr, string roleName) function removeRole(address addr, string roleName)
onlyAdmin internal
public {
{ roles[roleName].remove(addr);
removeRole(addr, roleName); RoleRemoved(addr, roleName);
} }
/**
/** * @dev modifier to scope access to a single role (uses msg.sender as addr)
* @dev modifier to scope access to a single role (uses msg.sender as addr) * @param roleName the name of the role
* @param roleName the name of the role * // reverts
* // reverts */
*/ modifier onlyRole(string roleName)
modifier onlyRole(string roleName) {
{ checkRole(msg.sender, roleName);
checkRole(msg.sender, roleName); _;
_; }
}
/**
/** * @dev modifier to scope access to admins
* @dev modifier to scope access to admins * // reverts
* // reverts */
*/ modifier onlyAdmin()
modifier onlyAdmin() {
{ checkRole(msg.sender, ROLE_ADMIN);
checkRole(msg.sender, ROLE_ADMIN); _;
_; }
}
/**
/** * @dev modifier to scope access to a set of roles (uses msg.sender as addr)
* @dev modifier to scope access to a set of roles (uses msg.sender as addr) * @param roleNames the names of the roles to scope access to
* @param roleNames the names of the roles to scope access to * // reverts
* // reverts *
* * @TODO - when solidity supports dynamic arrays as arguments to modifiers, provide this
* @TODO - when solidity supports dynamic arrays as arguments to modifiers, provide this * see: https://github.com/ethereum/solidity/issues/2467
* see: https://github.com/ethereum/solidity/issues/2467 */
*/ // modifier onlyRoles(string[] roleNames) {
// modifier onlyRoles(string[] roleNames) { // bool hasAnyRole = false;
// bool hasAnyRole = false; // for (uint8 i = 0; i < roleNames.length; i++) {
// for (uint8 i = 0; i < roleNames.length; i++) { // if (hasRole(msg.sender, roleNames[i])) {
// if (hasRole(msg.sender, roleNames[i])) { // hasAnyRole = true;
// hasAnyRole = true; // break;
// break; // }
// } // }
// }
// require(hasAnyRole);
// require(hasAnyRole);
// _;
// _; // }
// }
} }
contracts/ownership/rbac/Roles.sol
...@@ -8,48 +8,48 @@ pragma solidity ^0.4.18; ...@@ -8,48 +8,48 @@ pragma solidity ^0.4.18;
* See RBAC.sol for example usage. * See RBAC.sol for example usage.
*/ */
library Roles { library Roles {
struct Role { struct Role {
mapping (address => bool) bearer; mapping (address => bool) bearer;
} }
/** /**
* @dev give an address access to this role * @dev give an address access to this role
*/ */
function add(Role storage role, address addr) function add(Role storage role, address addr)
internal internal
{ {
role.bearer[addr] = true; role.bearer[addr] = true;
} }
/** /**
* @dev remove an address' access to this role * @dev remove an address' access to this role
*/ */
function remove(Role storage role, address addr) function remove(Role storage role, address addr)
internal internal
{ {
role.bearer[addr] = false; role.bearer[addr] = false;
} }
/** /**
* @dev check if an address has this role * @dev check if an address has this role
* // reverts * // reverts
*/ */
function check(Role storage role, address addr) function check(Role storage role, address addr)
view view
internal internal
{ {
require(has(role, addr)); require(has(role, addr));
} }
/** /**
* @dev check if an address has this role * @dev check if an address has this role
* @return bool * @return bool
*/ */
function has(Role storage role, address addr) function has(Role storage role, address addr)
view view
internal internal
returns (bool) returns (bool)
{ {
return role.bearer[addr]; return role.bearer[addr];
} }
} }
contracts/payment/PullPayment.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../math/SafeMath.sol'; import "../math/SafeMath.sol";
/** /**
...@@ -16,16 +16,6 @@ contract PullPayment { ...@@ -16,16 +16,6 @@ contract PullPayment {
uint256 public totalPayments; uint256 public totalPayments;
/** /**
* @dev Called by the payer to store the sent amount as credit to be pulled.
* @param dest The destination address of the funds.
* @param amount The amount to transfer.
*/
function asyncSend(address dest, uint256 amount) internal {
payments[dest] = payments[dest].add(amount);
totalPayments = totalPayments.add(amount);
}
/**
* @dev withdraw accumulated balance, called by payee. * @dev withdraw accumulated balance, called by payee.
*/ */
function withdrawPayments() public { function withdrawPayments() public {
...@@ -40,4 +30,14 @@ contract PullPayment { ...@@ -40,4 +30,14 @@ contract PullPayment {
assert(payee.send(payment)); assert(payee.send(payment));
} }
/**
* @dev Called by the payer to store the sent amount as credit to be pulled.
* @param dest The destination address of the funds.
* @param amount The amount to transfer.
*/
function asyncSend(address dest, uint256 amount) internal {
payments[dest] = payments[dest].add(amount);
totalPayments = totalPayments.add(amount);
}
} }
contracts/payment/SplitPayment.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../math/SafeMath.sol'; import "../math/SafeMath.sol";
/** /**
* @title SplitPayment * @title SplitPayment
...@@ -29,19 +30,9 @@ contract SplitPayment { ...@@ -29,19 +30,9 @@ contract SplitPayment {
} }
/** /**
* @dev Add a new payee to the contract. * @dev payable fallback
* @param _payee The address of the payee to add.
* @param _shares The number of shares owned by the payee.
*/ */
function addPayee(address _payee, uint256 _shares) internal { function () public payable {}
require(_payee != address(0));
require(_shares > 0);
require(shares[_payee] == 0);
payees.push(_payee);
shares[_payee] = _shares;
totalShares = totalShares.add(_shares);
}
/** /**
* @dev Claim your share of the balance. * @dev Claim your share of the balance.
...@@ -64,7 +55,17 @@ contract SplitPayment { ...@@ -64,7 +55,17 @@ contract SplitPayment {
} }
/** /**
* @dev payable fallback * @dev Add a new payee to the contract.
* @param _payee The address of the payee to add.
* @param _shares The number of shares owned by the payee.
*/ */
function () public payable {} function addPayee(address _payee, uint256 _shares) internal {
require(_payee != address(0));
require(_shares > 0);
require(shares[_payee] == 0);
payees.push(_payee);
shares[_payee] = _shares;
totalShares = totalShares.add(_shares);
}
} }
contracts/token/BasicToken.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import './ERC20Basic.sol'; import "./ERC20Basic.sol";
import '../math/SafeMath.sol'; import "../math/SafeMath.sol";
/** /**
......
contracts/token/BurnableToken.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import './BasicToken.sol'; import "./BasicToken.sol";
/** /**
* @title Burnable Token * @title Burnable Token
...@@ -8,20 +9,20 @@ import './BasicToken.sol'; ...@@ -8,20 +9,20 @@ import './BasicToken.sol';
*/ */
contract BurnableToken is BasicToken { contract BurnableToken is BasicToken {
event Burn(address indexed burner, uint256 value); event Burn(address indexed burner, uint256 value);
/** /**
* @dev Burns a specific amount of tokens. * @dev Burns a specific amount of tokens.
* @param _value The amount of token to be burned. * @param _value The amount of token to be burned.
*/ */
function burn(uint256 _value) public { function burn(uint256 _value) public {
require(_value <= balances[msg.sender]); require(_value <= balances[msg.sender]);
// no need to require value <= totalSupply, since that would imply the // no need to require value <= totalSupply, since that would imply the
// sender's balance is greater than the totalSupply, which *should* be an assertion failure // sender's balance is greater than the totalSupply, which *should* be an assertion failure
address burner = msg.sender; address burner = msg.sender;
balances[burner] = balances[burner].sub(_value); balances[burner] = balances[burner].sub(_value);
totalSupply = totalSupply.sub(_value); totalSupply = totalSupply.sub(_value);
Burn(burner, _value); Burn(burner, _value);
} }
} }
contracts/token/CappedToken.sol
pragma solidity ^0.4.11; pragma solidity ^0.4.11;
import './MintableToken.sol'; import "./MintableToken.sol";
/** /**
* @title Capped token * @title Capped token
......
contracts/token/DetailedERC20.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import './ERC20.sol'; import "./ERC20.sol";
contract DetailedERC20 is ERC20 { contract DetailedERC20 is ERC20 {
string public name; string public name;
......
contracts/token/ERC20.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import './ERC20Basic.sol'; import "./ERC20Basic.sol";
/** /**
......
contracts/token/MintableToken.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import './StandardToken.sol'; import "./StandardToken.sol";
import '../ownership/Ownable.sol'; import "../ownership/Ownable.sol";
......
contracts/token/PausableToken.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import './StandardToken.sol'; import "./StandardToken.sol";
import '../lifecycle/Pausable.sol'; import "../lifecycle/Pausable.sol";
/** /**
* @title Pausable token * @title Pausable token
* *
* @dev StandardToken modified with pausable transfers. * @dev StandardToken modified with pausable transfers.
**/ **/
contract PausableToken is StandardToken, Pausable { contract PausableToken is StandardToken, Pausable {
function transfer(address _to, uint256 _value) public whenNotPaused returns (bool) { function transfer(address _to, uint256 _value) public whenNotPaused returns (bool) {
......
contracts/token/SafeERC20.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import './ERC20Basic.sol'; import "./ERC20Basic.sol";
import './ERC20.sol'; import "./ERC20.sol";
/** /**
* @title SafeERC20 * @title SafeERC20
......
contracts/token/StandardToken.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import './BasicToken.sol'; import "./BasicToken.sol";
import './ERC20.sol'; import "./ERC20.sol";
/** /**
......
contracts/token/TokenTimelock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import "./ERC20Basic.sol";
import './ERC20Basic.sol';
import "../token/SafeERC20.sol"; import "../token/SafeERC20.sol";
/** /**
* @title TokenTimelock * @title TokenTimelock
* @dev TokenTimelock is a token holder contract that will allow a * @dev TokenTimelock is a token holder contract that will allow a
......
contracts/token/TokenVesting.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import './ERC20Basic.sol'; import "./ERC20Basic.sol";
import './SafeERC20.sol'; import "./SafeERC20.sol";
import '../ownership/Ownable.sol'; import "../ownership/Ownable.sol";
import '../math/SafeMath.sol'; import "../math/SafeMath.sol";
/** /**
* @title TokenVesting * @title TokenVesting
......
package-lock.json
{ {
"name": "zeppelin-solidity", "name": "zeppelin-solidity",
"version": "1.4.0", "version": "1.5.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
"anymatch": { "anymatch": {
"version": "1.3.2", "version": "1.3.2",
"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
"integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=",
"dev": true, "dev": true,
"requires": { "requires": {
"micromatch": "2.3.11", "micromatch": "2.3.11",
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
"arr-flatten": { "arr-flatten": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
"integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
"dev": true "dev": true
}, },
"array-union": { "array-union": {
...@@ -1058,7 +1058,7 @@ ...@@ -1058,7 +1058,7 @@
"base64-js": { "base64-js": {
"version": "1.2.1", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
"integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==", "integrity": "sha1-qRlH2h9KUW6jjltOwOw3c2deCIY=",
"dev": true "dev": true
}, },
"bcrypt-pbkdf": { "bcrypt-pbkdf": {
...@@ -1090,7 +1090,7 @@ ...@@ -1090,7 +1090,7 @@
"bindings": { "bindings": {
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz", "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
"integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==", "integrity": "sha1-s0b27PapX1qBXFg5/HzbIlAvHtc=",
"dev": true "dev": true
}, },
"bip39": { "bip39": {
...@@ -1126,7 +1126,7 @@ ...@@ -1126,7 +1126,7 @@
"bn.js": { "bn.js": {
"version": "4.11.8", "version": "4.11.8",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=",
"dev": true "dev": true
}, },
"boom": { "boom": {
...@@ -1351,7 +1351,7 @@ ...@@ -1351,7 +1351,7 @@
"chai-as-promised": { "chai-as-promised": {
"version": "7.1.1", "version": "7.1.1",
"resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz", "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-7.1.1.tgz",
"integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==", "integrity": "sha1-CGRdgl3rhpbuYXJdv1kMAS6wDKA=",
"dev": true, "dev": true,
"requires": { "requires": {
"check-error": "1.0.2" "check-error": "1.0.2"
...@@ -1405,6 +1405,7 @@ ...@@ -1405,6 +1405,7 @@
"requires": { "requires": {
"anymatch": "1.3.2", "anymatch": "1.3.2",
"async-each": "1.0.1", "async-each": "1.0.1",
"fsevents": "1.1.3",
"glob-parent": "2.0.0", "glob-parent": "2.0.0",
"inherits": "2.0.3", "inherits": "2.0.3",
"is-binary-path": "1.0.1", "is-binary-path": "1.0.1",
...@@ -1422,7 +1423,7 @@ ...@@ -1422,7 +1423,7 @@
"cipher-base": { "cipher-base": {
"version": "1.0.4", "version": "1.0.4",
"resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
"integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
"dev": true, "dev": true,
"requires": { "requires": {
"inherits": "2.0.3", "inherits": "2.0.3",
...@@ -1512,6 +1513,12 @@ ...@@ -1512,6 +1513,12 @@
"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
"dev": true "dev": true
}, },
"colors": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
"integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
"dev": true
},
"combined-stream": { "combined-stream": {
"version": "1.0.5", "version": "1.0.5",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz",
...@@ -1793,7 +1800,7 @@ ...@@ -1793,7 +1800,7 @@
"deferred-leveldown": { "deferred-leveldown": {
"version": "1.2.2", "version": "1.2.2",
"resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-1.2.2.tgz", "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-1.2.2.tgz",
"integrity": "sha512-uukrWD2bguRtXilKt6cAWKyoXrTSMo5m7crUdLfWQmu8kIm88w3QZoUL+6nhpfKVmhHANER6Re3sKoNoZ3IKMA==", "integrity": "sha1-Os0uC3XRZpkkvApLZChRExFz4es=",
"dev": true, "dev": true,
"requires": { "requires": {
"abstract-leveldown": "2.6.2" "abstract-leveldown": "2.6.2"
...@@ -2993,12 +3000,916 @@ ...@@ -2993,12 +3000,916 @@
"rimraf": "2.6.1" "rimraf": "2.6.1"
} }
}, },
"fs.realpath": { "fs.realpath": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"dev": true "dev": true
}, },
"fsevents": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.3.tgz",
"integrity": "sha512-WIr7iDkdmdbxu/Gh6eKEZJL6KPE74/5MEsf2whTOFNxbIoIixogroLdKYqB6FDav4Wavh/lZdzzd3b2KxIXC5Q==",
"dev": true,
"optional": true,
"requires": {
"nan": "2.6.2",
"node-pre-gyp": "0.6.39"
},
"dependencies": {
"abbrev": {
"version": "1.1.0",
"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",
"bundled": true,
"dev": true,
"optional": true
},
"are-we-there-yet": {
"version": "1.1.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"delegates": "1.0.0",
"readable-stream": "2.2.9"
}
},
"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",
"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",
"bundled": true,
"dev": true,
"requires": {
"balanced-match": "0.4.2",
"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",
"bundled": true,
"dev": true,
"optional": true
},
"code-point-at": {
"version": "1.1.0",
"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,
"dev": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
},
"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",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"ms": "2.0.0"
}
},
"deep-extend": {
"version": "0.4.2",
"bundled": true,
"dev": true,
"optional": true
},
"delayed-stream": {
"version": "1.0.0",
"bundled": true,
"dev": true
},
"delegates": {
"version": "1.0.0",
"bundled": true,
"dev": true,
"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",
"bundled": true,
"dev": true,
"optional": true
},
"form-data": {
"version": "2.1.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"asynckit": "0.4.0",
"combined-stream": "1.0.5",
"mime-types": "2.1.15"
}
},
"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"
}
},
"gauge": {
"version": "2.7.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"aproba": "1.1.1",
"console-control-strings": "1.1.0",
"has-unicode": "2.0.1",
"object-assign": "4.1.1",
"signal-exit": "3.0.2",
"string-width": "1.0.2",
"strip-ansi": "3.0.1",
"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,
"requires": {
"fs.realpath": "1.0.0",
"inflight": "1.0.6",
"inherits": "2.0.3",
"minimatch": "3.0.4",
"once": "1.4.0",
"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",
"bundled": true,
"dev": true,
"requires": {
"boom": "2.10.1",
"cryptiles": "2.0.5",
"hoek": "2.16.3",
"sntp": "1.0.9"
}
},
"hoek": {
"version": "2.16.3",
"bundled": true,
"dev": true
},
"http-signature": {
"version": "1.1.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"assert-plus": "0.2.0",
"jsprim": "1.4.0",
"sshpk": "1.13.0"
}
},
"inflight": {
"version": "1.0.6",
"bundled": true,
"dev": true,
"requires": {
"once": "1.4.0",
"wrappy": "1.0.2"
}
},
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
},
"ini": {
"version": "1.3.4",
"bundled": true,
"dev": true,
"optional": true
},
"is-fullwidth-code-point": {
"version": "1.0.0",
"bundled": true,
"dev": true,
"requires": {
"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",
"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
}
}
},
"mime-db": {
"version": "1.27.0",
"bundled": true,
"dev": true
},
"mime-types": {
"version": "2.1.15",
"bundled": true,
"dev": true,
"requires": {
"mime-db": "1.27.0"
}
},
"minimatch": {
"version": "3.0.4",
"bundled": true,
"dev": true,
"requires": {
"brace-expansion": "1.1.7"
}
},
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
},
"mkdirp": {
"version": "0.5.1",
"bundled": true,
"dev": true,
"requires": {
"minimist": "0.0.8"
}
},
"ms": {
"version": "2.0.0",
"bundled": true,
"dev": true,
"optional": true
},
"node-pre-gyp": {
"version": "0.6.39",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"detect-libc": "1.0.2",
"hawk": "3.1.3",
"mkdirp": "0.5.1",
"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"
}
},
"nopt": {
"version": "4.0.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"abbrev": "1.1.0",
"osenv": "0.1.4"
}
},
"npmlog": {
"version": "4.1.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"are-we-there-yet": "1.1.4",
"console-control-strings": "1.1.0",
"gauge": "2.7.4",
"set-blocking": "2.0.0"
}
},
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
},
"oauth-sign": {
"version": "0.8.2",
"bundled": true,
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
"bundled": true,
"dev": true,
"optional": true
},
"once": {
"version": "1.4.0",
"bundled": true,
"dev": true,
"requires": {
"wrappy": "1.0.2"
}
},
"os-homedir": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true
},
"os-tmpdir": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true
},
"osenv": {
"version": "0.1.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"os-homedir": "1.0.2",
"os-tmpdir": "1.0.2"
}
},
"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",
"bundled": true,
"dev": true,
"optional": true
},
"rc": {
"version": "1.2.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"deep-extend": "0.4.2",
"ini": "1.3.4",
"minimist": "1.2.0",
"strip-json-comments": "2.0.1"
},
"dependencies": {
"minimist": {
"version": "1.2.0",
"bundled": true,
"dev": true,
"optional": true
}
}
},
"readable-stream": {
"version": "2.2.9",
"bundled": true,
"dev": 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",
"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",
"bundled": true,
"dev": true,
"requires": {
"glob": "7.1.2"
}
},
"safe-buffer": {
"version": "5.0.1",
"bundled": true,
"dev": true
},
"semver": {
"version": "5.3.0",
"bundled": true,
"dev": true,
"optional": true
},
"set-blocking": {
"version": "2.0.0",
"bundled": true,
"dev": true,
"optional": true
},
"signal-exit": {
"version": "3.0.2",
"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",
"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"
},
"dependencies": {
"assert-plus": {
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true
}
}
},
"string-width": {
"version": "1.0.2",
"bundled": true,
"dev": true,
"requires": {
"code-point-at": "1.1.0",
"is-fullwidth-code-point": "1.0.0",
"strip-ansi": "3.0.1"
}
},
"string_decoder": {
"version": "1.0.1",
"bundled": true,
"dev": true,
"requires": {
"safe-buffer": "5.0.1"
}
},
"stringstream": {
"version": "0.0.5",
"bundled": true,
"dev": true,
"optional": true
},
"strip-ansi": {
"version": "3.0.1",
"bundled": true,
"dev": true,
"requires": {
"ansi-regex": "2.1.1"
}
},
"strip-json-comments": {
"version": "2.0.1",
"bundled": true,
"dev": true,
"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",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "5.0.1"
}
},
"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,
"dev": true,
"optional": true,
"requires": {
"string-width": "1.0.2"
}
},
"wrappy": {
"version": "1.0.2",
"bundled": true,
"dev": true
}
}
},
"function-bind": { "function-bind": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz",
...@@ -3129,7 +4040,7 @@ ...@@ -3129,7 +4040,7 @@
"globals": { "globals": {
"version": "9.18.0", "version": "9.18.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
"integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
"dev": true "dev": true
}, },
"globby": { "globby": {
...@@ -3241,7 +4152,7 @@ ...@@ -3241,7 +4152,7 @@
"hash.js": { "hash.js": {
"version": "1.1.3", "version": "1.1.3",
"resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
"integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", "integrity": "sha1-NA3tvmKQGHFRweodd3o0SJNd+EY=",
"dev": true, "dev": true,
"requires": { "requires": {
"inherits": "2.0.3", "inherits": "2.0.3",
...@@ -3306,7 +4217,7 @@ ...@@ -3306,7 +4217,7 @@
"hosted-git-info": { "hosted-git-info": {
"version": "2.5.0", "version": "2.5.0",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
"integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=",
"dev": true "dev": true
}, },
"http-signature": { "http-signature": {
...@@ -3833,6 +4744,12 @@ ...@@ -3833,6 +4744,12 @@
"integrity": "sha1-hhIoAhQvCChQKg0d7h2V4lO7AkM=", "integrity": "sha1-hhIoAhQvCChQKg0d7h2V4lO7AkM=",
"dev": true "dev": true
}, },
"js-string-escape": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz",
"integrity": "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8=",
"dev": true
},
"js-tokens": { "js-tokens": {
"version": "3.0.2", "version": "3.0.2",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
...@@ -3865,7 +4782,7 @@ ...@@ -3865,7 +4782,7 @@
"json-loader": { "json-loader": {
"version": "0.5.7", "version": "0.5.7",
"resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz", "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
"integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==", "integrity": "sha1-3KFKcCNf+C8KyaOr62DTN6NlGF0=",
"dev": true "dev": true
}, },
"json-schema": { "json-schema": {
...@@ -3957,7 +4874,7 @@ ...@@ -3957,7 +4874,7 @@
"keccak": { "keccak": {
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/keccak/-/keccak-1.3.0.tgz", "resolved": "https://registry.npmjs.org/keccak/-/keccak-1.3.0.tgz",
"integrity": "sha512-JgsKPxYhcJxKrV+TrCyg/GwZbOjhpRPrz2kG8xbAsUaIDelUlKjm08YcwBO9Fm8sqf/Kg8ZWkk6nWujhLykfvw==", "integrity": "sha1-NoG9ma09A1TdspuQQMG2VgzOCKw=",
"dev": true, "dev": true,
"requires": { "requires": {
"bindings": "1.3.0", "bindings": "1.3.0",
...@@ -4117,7 +5034,7 @@ ...@@ -4117,7 +5034,7 @@
"levelup": { "levelup": {
"version": "1.3.9", "version": "1.3.9",
"resolved": "https://registry.npmjs.org/levelup/-/levelup-1.3.9.tgz", "resolved": "https://registry.npmjs.org/levelup/-/levelup-1.3.9.tgz",
"integrity": "sha512-VVGHfKIlmw8w1XqpGOAGwq6sZm2WwWLmlDcULkKWQXEA5EopA8OBNJ2Ck2v6bdk8HeEZSbCSEgzXadyQFm76sQ==", "integrity": "sha1-LbyuhFsrsra+qE3zNMR1Uzu9gqs=",
"dev": true, "dev": true,
"requires": { "requires": {
"deferred-leveldown": "1.2.2", "deferred-leveldown": "1.2.2",
...@@ -4462,7 +5379,7 @@ ...@@ -4462,7 +5379,7 @@
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
"dev": true, "dev": true,
"requires": { "requires": {
"brace-expansion": "1.1.8" "brace-expansion": "1.1.8"
...@@ -4665,7 +5582,7 @@ ...@@ -4665,7 +5582,7 @@
"normalize-package-data": { "normalize-package-data": {
"version": "2.4.0", "version": "2.4.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
"integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
"dev": true, "dev": true,
"requires": { "requires": {
"hosted-git-info": "2.5.0", "hosted-git-info": "2.5.0",
...@@ -4695,7 +5612,7 @@ ...@@ -4695,7 +5612,7 @@
"npmlog": { "npmlog": {
"version": "4.1.2", "version": "4.1.2",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
"integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "integrity": "sha1-CKfyqL9zRgR3mp76StXMcXq7lUs=",
"dev": true, "dev": true,
"requires": { "requires": {
"are-we-there-yet": "1.1.4", "are-we-there-yet": "1.1.4",
...@@ -4725,7 +5642,7 @@ ...@@ -4725,7 +5642,7 @@
"object-inspect": { "object-inspect": {
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.3.0.tgz", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.3.0.tgz",
"integrity": "sha512-OHHnLgLNXpM++GnJRyyhbr2bwl3pPVm4YvaraHrRvDt/N3r+s/gDVHciA7EJBTkijKXj61ssgSAikq1fb0IBRg==", "integrity": "sha1-Wx645nQuLugzQqY3A02ESSi6L20=",
"dev": true "dev": true
}, },
"object-keys": { "object-keys": {
...@@ -5146,7 +6063,7 @@ ...@@ -5146,7 +6063,7 @@
"randomatic": { "randomatic": {
"version": "1.1.7", "version": "1.1.7",
"resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
"integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=",
"dev": true, "dev": true,
"requires": { "requires": {
"is-number": "3.0.0", "is-number": "3.0.0",
...@@ -5187,7 +6104,7 @@ ...@@ -5187,7 +6104,7 @@
"randombytes": { "randombytes": {
"version": "2.0.5", "version": "2.0.5",
"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz",
"integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==", "integrity": "sha1-3ACaJGuNCaF3tLegrne8Vw9LG3k=",
"dev": true, "dev": true,
"requires": { "requires": {
"safe-buffer": "5.1.1" "safe-buffer": "5.1.1"
...@@ -5237,7 +6154,7 @@ ...@@ -5237,7 +6154,7 @@
"readable-stream": { "readable-stream": {
"version": "2.3.3", "version": "2.3.3",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
"integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
"dev": true, "dev": true,
"requires": { "requires": {
"core-util-is": "1.0.2", "core-util-is": "1.0.2",
...@@ -5533,7 +6450,7 @@ ...@@ -5533,7 +6450,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.1", "version": "5.1.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
"dev": true "dev": true
}, },
"scrypt": { "scrypt": {
...@@ -5584,13 +6501,13 @@ ...@@ -5584,13 +6501,13 @@
"semaphore": { "semaphore": {
"version": "1.1.0", "version": "1.1.0",
"resolved": "https://registry.npmjs.org/semaphore/-/semaphore-1.1.0.tgz", "resolved": "https://registry.npmjs.org/semaphore/-/semaphore-1.1.0.tgz",
"integrity": "sha512-O4OZEaNtkMd/K0i6js9SL+gqy0ZCBMgUvlSqHKi4IBdjhe7wB8pwztUk1BbZ1fmrvpwFrPbHzqd2w5pTcJH6LA==", "integrity": "sha1-qq2LhrIP6OmzKxbcLuaCqM0mqKo=",
"dev": true "dev": true
}, },
"semver": { "semver": {
"version": "5.4.1", "version": "5.4.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4=",
"dev": true "dev": true
}, },
"set-blocking": { "set-blocking": {
...@@ -5710,6 +6627,12 @@ ...@@ -5710,6 +6627,12 @@
"hoek": "2.16.3" "hoek": "2.16.3"
} }
}, },
"sol-digger": {
"version": "0.0.2",
"resolved": "https://registry.npmjs.org/sol-digger/-/sol-digger-0.0.2.tgz",
"integrity": "sha1-QGxKnTHiaef4jrHC6hATGOXgkCU=",
"dev": true
},
"sol-explore": { "sol-explore": {
"version": "1.6.2", "version": "1.6.2",
"resolved": "https://registry.npmjs.org/sol-explore/-/sol-explore-1.6.2.tgz", "resolved": "https://registry.npmjs.org/sol-explore/-/sol-explore-1.6.2.tgz",
...@@ -5781,10 +6704,211 @@ ...@@ -5781,10 +6704,211 @@
"yargs": "4.8.1" "yargs": "4.8.1"
} }
}, },
"solium": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/solium/-/solium-1.1.2.tgz",
"integrity": "sha512-2CvpbiU0msntDkK+X6y3qCcRqg+W7Bf237BrHPTP32zufK7OCaINK4ci7UEMnusbEW41njJwLitN0h32C3rVKA==",
"dev": true,
"requires": {
"ajv": "5.2.2",
"chokidar": "1.7.0",
"colors": "1.1.2",
"commander": "2.11.0",
"js-string-escape": "1.0.1",
"lodash": "4.17.4",
"sol-digger": "0.0.2",
"sol-explore": "1.6.1",
"solium-plugin-security": "0.1.1",
"solparse": "2.2.2",
"text-table": "0.2.0"
},
"dependencies": {
"ansi-regex": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
"integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
"dev": true
},
"camelcase": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
"integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
"dev": true
},
"cliui": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.0.0.tgz",
"integrity": "sha512-nY3W5Gu2racvdDk//ELReY+dHjb9PlIcVDFXP72nVIhq2Gy3LuVXYwJoPVudwQnv1shtohpgkdCKT2YaKY0CKw==",
"dev": true,
"requires": {
"string-width": "2.1.1",
"strip-ansi": "4.0.0",
"wrap-ansi": "2.1.0"
}
},
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"dev": true,
"requires": {
"ms": "2.0.0"
}
},
"diff": {
"version": "3.3.1",
"resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz",
"integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==",
"dev": true
},
"find-up": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
"integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
"dev": true,
"requires": {
"locate-path": "2.0.0"
}
},
"growl": {
"version": "1.10.3",
"resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz",
"integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==",
"dev": true
},
"has-flag": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz",
"integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
"dev": true
},
"is-fullwidth-code-point": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
"dev": true
},
"mocha": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz",
"integrity": "sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==",
"dev": true,
"requires": {
"browser-stdout": "1.3.0",
"commander": "2.11.0",
"debug": "3.1.0",
"diff": "3.3.1",
"escape-string-regexp": "1.0.5",
"glob": "7.1.2",
"growl": "1.10.3",
"he": "1.1.1",
"mkdirp": "0.5.1",
"supports-color": "4.4.0"
}
},
"os-locale": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
"integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
"dev": true,
"requires": {
"execa": "0.7.0",
"lcid": "1.0.0",
"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.2",
"resolved": "https://registry.npmjs.org/solparse/-/solparse-2.2.2.tgz",
"integrity": "sha512-TKX0Foi/N73nKco65+boo0YTtifFVEEXEPQkN4b1GkkEsXLXyV1TnvvIeT0qg9lEPLdi4Ri5WUWYVJipnSny+Q==",
"dev": true,
"requires": {
"mocha": "4.1.0",
"pegjs": "0.10.0",
"yargs": "10.1.1"
}
},
"string-width": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
"integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
"dev": true,
"requires": {
"is-fullwidth-code-point": "2.0.0",
"strip-ansi": "4.0.0"
}
},
"strip-ansi": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
"integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
"dev": true,
"requires": {
"ansi-regex": "3.0.0"
}
},
"supports-color": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
"integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
"dev": true,
"requires": {
"has-flag": "2.0.0"
}
},
"which-module": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
"integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
"dev": true
},
"yargs": {
"version": "10.1.1",
"resolved": "https://registry.npmjs.org/yargs/-/yargs-10.1.1.tgz",
"integrity": "sha512-7uRL1HZdCbc1QTP+X8mehOPuCYKC/XTaqAPj7gABLfTt6pgLyVRn3QVte4qhtilZouWCvqd1kipgMKl5tKsFiw==",
"dev": true,
"requires": {
"cliui": "4.0.0",
"decamelize": "1.2.0",
"find-up": "2.1.0",
"get-caller-file": "1.0.2",
"os-locale": "2.1.0",
"require-directory": "2.1.1",
"require-main-filename": "1.0.1",
"set-blocking": "2.0.0",
"string-width": "2.1.1",
"which-module": "2.0.0",
"y18n": "3.2.1",
"yargs-parser": "8.1.0"
}
},
"yargs-parser": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-8.1.0.tgz",
"integrity": "sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==",
"dev": true,
"requires": {
"camelcase": "4.1.0"
}
}
}
},
"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
},
"source-list-map": { "source-list-map": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
"integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==", "integrity": "sha1-qqR0A/eyRakvvJfqCPJQ1gh+0IU=",
"dev": true "dev": true
}, },
"source-map": { "source-map": {
...@@ -5866,7 +6990,7 @@ ...@@ -5866,7 +6990,7 @@
"stream-http": { "stream-http": {
"version": "2.7.2", "version": "2.7.2",
"resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz",
"integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==", "integrity": "sha1-QKBQ7I3DtTsz2ZCUFcAsC/Gr+60=",
"dev": true, "dev": true,
"requires": { "requires": {
"builtin-status-codes": "3.0.0", "builtin-status-codes": "3.0.0",
...@@ -5901,7 +7025,7 @@ ...@@ -5901,7 +7025,7 @@
"string_decoder": { "string_decoder": {
"version": "1.0.3", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
"integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
"dev": true, "dev": true,
"requires": { "requires": {
"safe-buffer": "5.1.1" "safe-buffer": "5.1.1"
...@@ -6061,7 +7185,7 @@ ...@@ -6061,7 +7185,7 @@
"tape": { "tape": {
"version": "4.8.0", "version": "4.8.0",
"resolved": "https://registry.npmjs.org/tape/-/tape-4.8.0.tgz", "resolved": "https://registry.npmjs.org/tape/-/tape-4.8.0.tgz",
"integrity": "sha512-TWILfEnvO7I8mFe35d98F6T5fbLaEtbFTG/lxWvid8qDfFTxt19EBijWmB4j3+Hoh5TfHE2faWs73ua+EphuBA==", "integrity": "sha1-9qn+xBzFCh3lD6M2A6tYCZH2Bo4=",
"dev": true, "dev": true,
"requires": { "requires": {
"deep-equal": "1.0.1", "deep-equal": "1.0.1",
...@@ -6541,7 +7665,7 @@ ...@@ -6541,7 +7665,7 @@
"uuid": { "uuid": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
"integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==", "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=",
"dev": true "dev": true
}, },
"validate-npm-package-license": { "validate-npm-package-license": {
...@@ -6833,7 +7957,7 @@ ...@@ -6833,7 +7957,7 @@
"which": { "which": {
"version": "1.3.0", "version": "1.3.0",
"resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
"integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=",
"dev": true, "dev": true,
"requires": { "requires": {
"isexe": "2.0.0" "isexe": "2.0.0"
...@@ -6848,7 +7972,7 @@ ...@@ -6848,7 +7972,7 @@
"wide-align": { "wide-align": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz",
"integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=",
"dev": true, "dev": true,
"requires": { "requires": {
"string-width": "1.0.2" "string-width": "1.0.2"
......
package.json
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
"test": "scripts/test.sh", "test": "scripts/test.sh",
"lint": "eslint .", "lint": "eslint .",
"lint:fix": "eslint . --fix", "lint:fix": "eslint . --fix",
"lint:sol": "solium -d .",
"lint:sol:fix": "solium -d . --fix",
"lint:all": "npm run lint && npm run lint:sol",
"lint:all:fix": "npm run lint:fix && npm run lint:sol:fix",
"console": "truffle console", "console": "truffle console",
"coverage": "scripts/coverage.sh" "coverage": "scripts/coverage.sh"
}, },
...@@ -47,6 +51,7 @@ ...@@ -47,6 +51,7 @@
"ethereumjs-util": "^5.1.2", "ethereumjs-util": "^5.1.2",
"mocha-lcov-reporter": "^1.3.0", "mocha-lcov-reporter": "^1.3.0",
"solidity-coverage": "^0.4.3", "solidity-coverage": "^0.4.3",
"solium": "^1.1.2",
"truffle": "^4.0.0", "truffle": "^4.0.0",
"truffle-hdwallet-provider": "0.0.3" "truffle-hdwallet-provider": "0.0.3"
}, },
......
test/mocks/MathMock.sol
pragma solidity ^0.4.18; pragma solidity ^0.4.18;
import '../../contracts/math/Math.sol'; import "../../contracts/math/Math.sol";
contract MathMock { contract MathMock {
......
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