From 38536f42f44c8869f2383bdf3e82d28de875aee3 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Wed, 18 Apr 2018 13:39:41 -0300 Subject: [PATCH 01/54] delete contracts and tests not yet in zos --- contracts/Bounty.sol | 72 ---- contracts/DayLimit.sol | 75 ---- contracts/ECRecovery.sol | 76 ---- contracts/LimitBalance.sol | 31 -- contracts/MerkleProof.sol | 35 -- contracts/ReentrancyGuard.sol | 32 -- contracts/access/SignatureBouncer.sol | 90 ----- contracts/crowdsale/Crowdsale.sol | 163 -------- .../distribution/FinalizableCrowdsale.sol | 42 -- .../distribution/PostDeliveryCrowdsale.sol | 37 -- .../distribution/RefundableCrowdsale.sol | 72 ---- .../distribution/utils/RefundVault.sol | 66 ---- .../crowdsale/emission/AllowanceCrowdsale.sol | 42 -- .../crowdsale/emission/MintedCrowdsale.sol | 22 -- .../price/IncreasingPriceCrowdsale.sol | 54 --- .../crowdsale/validation/CappedCrowdsale.sol | 43 -- .../IndividuallyCappedCrowdsale.sol | 76 ---- .../crowdsale/validation/TimedCrowdsale.sol | 58 --- .../validation/WhitelistedCrowdsale.sol | 58 --- contracts/examples/SampleCrowdsale.sol | 55 --- contracts/examples/SimpleSavingsWallet.sol | 40 -- contracts/examples/SimpleToken.sol | 30 -- contracts/lifecycle/Destructible.sol | 25 -- contracts/lifecycle/TokenDestructible.sol | 36 -- contracts/math/Math.sol | 24 -- contracts/mocks/AllowanceCrowdsaleImpl.sol | 21 - contracts/mocks/BouncerMock.sol | 22 -- contracts/mocks/CappedCrowdsaleImpl.sol | 21 - contracts/mocks/DayLimitMock.sol | 25 -- contracts/mocks/ECRecoveryMock.sol | 25 -- contracts/mocks/ERC223TokenMock.sol | 34 -- contracts/mocks/ERC827TokenMock.sol | 15 - contracts/mocks/FinalizableCrowdsaleImpl.sol | 22 -- contracts/mocks/ForceEther.sol | 16 - contracts/mocks/HasNoEtherTest.sol | 12 - .../mocks/IncreasingPriceCrowdsaleImpl.sol | 24 -- .../mocks/IndividuallyCappedCrowdsaleImpl.sol | 19 - contracts/mocks/InsecureTargetBounty.sol | 17 - contracts/mocks/LimitBalanceMock.sol | 13 - contracts/mocks/MerkleProofWrapper.sol | 11 - contracts/mocks/MessageHelper.sol | 25 -- contracts/mocks/MintedCrowdsaleImpl.sol | 19 - contracts/mocks/PostDeliveryCrowdsaleImpl.sol | 22 -- contracts/mocks/PullPaymentMock.sol | 17 - contracts/mocks/RBACMock.sol | 69 ---- contracts/mocks/ReentrancyAttack.sol | 11 - contracts/mocks/ReentrancyMock.sol | 46 --- contracts/mocks/RefundableCrowdsaleImpl.sol | 24 -- contracts/mocks/SecureTargetBounty.sol | 17 - contracts/mocks/TimedCrowdsaleImpl.sol | 22 -- contracts/mocks/WhitelistMock.sol | 14 - contracts/mocks/WhitelistedCrowdsaleImpl.sol | 19 - contracts/ownership/CanReclaimToken.sol | 26 -- contracts/ownership/Claimable.sol | 39 -- contracts/ownership/Contactable.sol | 22 -- contracts/ownership/DelayedClaimable.sol | 40 -- contracts/ownership/HasNoContracts.sol | 22 -- contracts/ownership/HasNoEther.sol | 42 -- contracts/ownership/HasNoTokens.sol | 28 -- contracts/ownership/Heritable.sol | 117 ------ contracts/ownership/NoOwner.sol | 15 - contracts/ownership/Whitelist.sol | 81 ---- contracts/ownership/rbac/RBAC.sol | 108 ----- contracts/ownership/rbac/RBACWithAdmin.sol | 60 --- contracts/ownership/rbac/Roles.sol | 55 --- contracts/payment/PullPayment.sol | 43 -- contracts/payment/SplitPayment.sol | 71 ---- contracts/token/ERC20/CappedToken.sol | 31 -- contracts/token/ERC721/DeprecatedERC721.sol | 15 - contracts/token/ERC827/ERC827.sol | 25 -- contracts/token/ERC827/ERC827Token.sol | 139 ------- test/Bounty.test.js | 111 ------ test/DayLimit.test.js | 88 ----- test/Heritable.test.js | 136 ------- test/LimitBalance.test.js | 47 --- test/ReentrancyGuard.test.js | 31 -- test/SimpleSavingsWallet.test.js | 33 -- test/access/SignatureBouncer.test.js | 119 ------ test/crowdsale/AllowanceCrowdsale.test.js | 77 ---- test/crowdsale/CappedCrowdsale.test.js | 69 ---- test/crowdsale/Crowdsale.test.js | 81 ---- test/crowdsale/FinalizableCrowdsale.test.js | 62 --- .../IncreasingPriceCrowdsale.test.js | 92 ----- .../IndividuallyCappedCrowdsale.test.js | 107 ----- test/crowdsale/MintedCrowdsale.test.js | 61 --- test/crowdsale/PostDeliveryCrowdsale.test.js | 67 ---- test/crowdsale/RefundVault.test.js | 59 --- test/crowdsale/RefundableCrowdsale.test.js | 82 ---- test/crowdsale/TimedCrowdsale.test.js | 62 --- test/crowdsale/WhitelistedCrowdsale.test.js | 93 ----- test/examples/SampleCrowdsale.test.js | 126 ------ test/examples/SimpleToken.test.js | 41 -- test/library/ECRecovery.test.js | 77 ---- test/library/Math.test.js | 43 -- test/library/MerkleProof.test.js | 61 --- test/lifecycle/Destructible.test.js | 23 -- test/lifecycle/TokenDestructible.test.js | 37 -- test/mocks/MathMock.sol | 26 -- test/ownership/CanReclaimToken.test.js | 35 -- test/ownership/Claimable.test.js | 53 --- test/ownership/Contactable.test.js | 28 -- test/ownership/DelayedClaimable.test.js | 55 --- test/ownership/HasNoContracts.test.js | 33 -- test/ownership/HasNoEther.test.js | 64 --- test/ownership/HasNoTokens.test.js | 40 -- test/ownership/Whitelist.test.js | 103 ----- test/ownership/rbac/RBAC.test.js | 98 ----- test/payment/PullPayment.test.js | 71 ---- test/payment/SplitPayment.test.js | 78 ---- test/token/ERC20/CappedToken.test.js | 36 -- test/token/ERC827/ERC827Token.js | 374 ------------------ 111 files changed, 5914 deletions(-) delete mode 100644 contracts/Bounty.sol delete mode 100644 contracts/DayLimit.sol delete mode 100644 contracts/ECRecovery.sol delete mode 100644 contracts/LimitBalance.sol delete mode 100644 contracts/MerkleProof.sol delete mode 100644 contracts/ReentrancyGuard.sol delete mode 100644 contracts/access/SignatureBouncer.sol delete mode 100644 contracts/crowdsale/Crowdsale.sol delete mode 100644 contracts/crowdsale/distribution/FinalizableCrowdsale.sol delete mode 100644 contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol delete mode 100644 contracts/crowdsale/distribution/RefundableCrowdsale.sol delete mode 100644 contracts/crowdsale/distribution/utils/RefundVault.sol delete mode 100644 contracts/crowdsale/emission/AllowanceCrowdsale.sol delete mode 100644 contracts/crowdsale/emission/MintedCrowdsale.sol delete mode 100644 contracts/crowdsale/price/IncreasingPriceCrowdsale.sol delete mode 100644 contracts/crowdsale/validation/CappedCrowdsale.sol delete mode 100644 contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol delete mode 100644 contracts/crowdsale/validation/TimedCrowdsale.sol delete mode 100644 contracts/crowdsale/validation/WhitelistedCrowdsale.sol delete mode 100644 contracts/examples/SampleCrowdsale.sol delete mode 100644 contracts/examples/SimpleSavingsWallet.sol delete mode 100644 contracts/examples/SimpleToken.sol delete mode 100644 contracts/lifecycle/Destructible.sol delete mode 100644 contracts/lifecycle/TokenDestructible.sol delete mode 100644 contracts/math/Math.sol delete mode 100644 contracts/mocks/AllowanceCrowdsaleImpl.sol delete mode 100644 contracts/mocks/BouncerMock.sol delete mode 100644 contracts/mocks/CappedCrowdsaleImpl.sol delete mode 100644 contracts/mocks/DayLimitMock.sol delete mode 100644 contracts/mocks/ECRecoveryMock.sol delete mode 100644 contracts/mocks/ERC223TokenMock.sol delete mode 100644 contracts/mocks/ERC827TokenMock.sol delete mode 100644 contracts/mocks/FinalizableCrowdsaleImpl.sol delete mode 100644 contracts/mocks/ForceEther.sol delete mode 100644 contracts/mocks/HasNoEtherTest.sol delete mode 100644 contracts/mocks/IncreasingPriceCrowdsaleImpl.sol delete mode 100644 contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol delete mode 100644 contracts/mocks/InsecureTargetBounty.sol delete mode 100644 contracts/mocks/LimitBalanceMock.sol delete mode 100644 contracts/mocks/MerkleProofWrapper.sol delete mode 100644 contracts/mocks/MessageHelper.sol delete mode 100644 contracts/mocks/MintedCrowdsaleImpl.sol delete mode 100644 contracts/mocks/PostDeliveryCrowdsaleImpl.sol delete mode 100644 contracts/mocks/PullPaymentMock.sol delete mode 100644 contracts/mocks/RBACMock.sol delete mode 100644 contracts/mocks/ReentrancyAttack.sol delete mode 100644 contracts/mocks/ReentrancyMock.sol delete mode 100644 contracts/mocks/RefundableCrowdsaleImpl.sol delete mode 100644 contracts/mocks/SecureTargetBounty.sol delete mode 100644 contracts/mocks/TimedCrowdsaleImpl.sol delete mode 100644 contracts/mocks/WhitelistMock.sol delete mode 100644 contracts/mocks/WhitelistedCrowdsaleImpl.sol delete mode 100644 contracts/ownership/CanReclaimToken.sol delete mode 100644 contracts/ownership/Claimable.sol delete mode 100644 contracts/ownership/Contactable.sol delete mode 100644 contracts/ownership/DelayedClaimable.sol delete mode 100644 contracts/ownership/HasNoContracts.sol delete mode 100644 contracts/ownership/HasNoEther.sol delete mode 100644 contracts/ownership/HasNoTokens.sol delete mode 100644 contracts/ownership/Heritable.sol delete mode 100644 contracts/ownership/NoOwner.sol delete mode 100644 contracts/ownership/Whitelist.sol delete mode 100644 contracts/ownership/rbac/RBAC.sol delete mode 100644 contracts/ownership/rbac/RBACWithAdmin.sol delete mode 100644 contracts/ownership/rbac/Roles.sol delete mode 100644 contracts/payment/PullPayment.sol delete mode 100644 contracts/payment/SplitPayment.sol delete mode 100644 contracts/token/ERC20/CappedToken.sol delete mode 100644 contracts/token/ERC721/DeprecatedERC721.sol delete mode 100644 contracts/token/ERC827/ERC827.sol delete mode 100644 contracts/token/ERC827/ERC827Token.sol delete mode 100644 test/Bounty.test.js delete mode 100644 test/DayLimit.test.js delete mode 100644 test/Heritable.test.js delete mode 100644 test/LimitBalance.test.js delete mode 100644 test/ReentrancyGuard.test.js delete mode 100644 test/SimpleSavingsWallet.test.js delete mode 100644 test/access/SignatureBouncer.test.js delete mode 100644 test/crowdsale/AllowanceCrowdsale.test.js delete mode 100644 test/crowdsale/CappedCrowdsale.test.js delete mode 100644 test/crowdsale/Crowdsale.test.js delete mode 100644 test/crowdsale/FinalizableCrowdsale.test.js delete mode 100644 test/crowdsale/IncreasingPriceCrowdsale.test.js delete mode 100644 test/crowdsale/IndividuallyCappedCrowdsale.test.js delete mode 100644 test/crowdsale/MintedCrowdsale.test.js delete mode 100644 test/crowdsale/PostDeliveryCrowdsale.test.js delete mode 100644 test/crowdsale/RefundVault.test.js delete mode 100644 test/crowdsale/RefundableCrowdsale.test.js delete mode 100644 test/crowdsale/TimedCrowdsale.test.js delete mode 100644 test/crowdsale/WhitelistedCrowdsale.test.js delete mode 100644 test/examples/SampleCrowdsale.test.js delete mode 100644 test/examples/SimpleToken.test.js delete mode 100644 test/library/ECRecovery.test.js delete mode 100644 test/library/Math.test.js delete mode 100644 test/library/MerkleProof.test.js delete mode 100644 test/lifecycle/Destructible.test.js delete mode 100644 test/lifecycle/TokenDestructible.test.js delete mode 100644 test/mocks/MathMock.sol delete mode 100644 test/ownership/CanReclaimToken.test.js delete mode 100644 test/ownership/Claimable.test.js delete mode 100644 test/ownership/Contactable.test.js delete mode 100644 test/ownership/DelayedClaimable.test.js delete mode 100644 test/ownership/HasNoContracts.test.js delete mode 100644 test/ownership/HasNoEther.test.js delete mode 100644 test/ownership/HasNoTokens.test.js delete mode 100644 test/ownership/Whitelist.test.js delete mode 100644 test/ownership/rbac/RBAC.test.js delete mode 100644 test/payment/PullPayment.test.js delete mode 100644 test/payment/SplitPayment.test.js delete mode 100644 test/token/ERC20/CappedToken.test.js delete mode 100644 test/token/ERC827/ERC827Token.js diff --git a/contracts/Bounty.sol b/contracts/Bounty.sol deleted file mode 100644 index 2f9879d96..000000000 --- a/contracts/Bounty.sol +++ /dev/null @@ -1,72 +0,0 @@ -pragma solidity ^0.4.21; - - -import "./payment/PullPayment.sol"; -import "./lifecycle/Destructible.sol"; - - -/** - * @title Bounty - * @dev This bounty will pay out to a researcher if they break invariant logic of the contract. - */ -contract Bounty is PullPayment, Destructible { - bool public claimed; - mapping(address => address) public researchers; - - event TargetCreated(address createdAddress); - - /** - * @dev Fallback function allowing the contract to receive funds, if they haven't already been claimed. - */ - function() external payable { - require(!claimed); - } - - /** - * @dev Create and deploy the target contract (extension of Target contract), and sets the - * msg.sender as a researcher - * @return A target contract - */ - function createTarget() public returns(Target) { - Target target = Target(deployContract()); - researchers[target] = msg.sender; - emit TargetCreated(target); - return target; - } - - /** - * @dev Sends the contract funds to the researcher that proved the contract is broken. - * @param target contract - */ - function claim(Target target) public { - address researcher = researchers[target]; - require(researcher != 0); - // Check Target contract invariants - require(!target.checkInvariant()); - asyncSend(researcher, address(this).balance); - claimed = true; - } - - /** - * @dev Internal function to deploy the target contract. - * @return A target contract address - */ - function deployContract() internal returns(address); - -} - - -/** - * @title Target - * @dev Your main contract should inherit from this class and implement the checkInvariant method. - */ -contract Target { - - /** - * @dev Checks all values a contract assumes to be true all the time. If this function returns - * false, the contract is broken in some way and is in an inconsistent state. - * In order to win the bounty, security researchers will try to cause this broken state. - * @return True if all invariant values are correct, false otherwise. - */ - function checkInvariant() public returns(bool); -} diff --git a/contracts/DayLimit.sol b/contracts/DayLimit.sol deleted file mode 100644 index 0bfa9b6d0..000000000 --- a/contracts/DayLimit.sol +++ /dev/null @@ -1,75 +0,0 @@ -pragma solidity ^0.4.21; - - -/** - * @title DayLimit - * @dev Base contract that enables methods to be protected by placing a linear limit (specifiable) - * on a particular resource per calendar day. Is multiowned to allow the limit to be altered. - */ -contract DayLimit { - - uint256 public dailyLimit; - uint256 public spentToday; - uint256 public lastDay; - - /** - * @dev Constructor that sets the passed value as a dailyLimit. - * @param _limit uint256 to represent the daily limit. - */ - function DayLimit(uint256 _limit) public { - dailyLimit = _limit; - lastDay = today(); - } - - /** - * @dev sets the daily limit. Does not alter the amount already spent today. - * @param _newLimit uint256 to represent the new limit. - */ - function _setDailyLimit(uint256 _newLimit) internal { - dailyLimit = _newLimit; - } - - /** - * @dev Resets the amount already spent today. - */ - function _resetSpentToday() internal { - spentToday = 0; - } - - /** - * @dev Checks to see if there is enough resource to spend today. If true, the resource may be expended. - * @param _value uint256 representing the amount of resource to spend. - * @return A boolean that is True if the resource was spent and false otherwise. - */ - function underLimit(uint256 _value) internal returns (bool) { - // reset the spend limit if we're on a different day to last time. - if (today() > lastDay) { - spentToday = 0; - lastDay = today(); - } - // check to see if there's enough left - if so, subtract and return true. - // overflow protection // dailyLimit check - if (spentToday + _value >= spentToday && spentToday + _value <= dailyLimit) { - spentToday += _value; - return true; - } - return false; - } - - /** - * @dev Private function to determine today's index - * @return uint256 of today's index. - */ - function today() private view returns (uint256) { - // solium-disable-next-line security/no-block-members - return block.timestamp / 1 days; - } - - /** - * @dev Simple modifier for daily limit. - */ - modifier limitedDaily(uint256 _value) { - require(underLimit(_value)); - _; - } -} diff --git a/contracts/ECRecovery.sol b/contracts/ECRecovery.sol deleted file mode 100644 index b2076f0e3..000000000 --- a/contracts/ECRecovery.sol +++ /dev/null @@ -1,76 +0,0 @@ -pragma solidity ^0.4.21; - - -/** - * @title Eliptic curve signature operations - * - * @dev Based on https://gist.github.com/axic/5b33912c6f61ae6fd96d6c4a47afde6d - * - * TODO Remove this library once solidity supports passing a signature to ecrecover. - * See https://github.com/ethereum/solidity/issues/864 - * - */ - -library ECRecovery { - - /** - * @dev Recover signer address from a message by using their signature - * @param hash bytes32 message, the hash is the signed message. What is recovered is the signer address. - * @param sig bytes signature, the signature is generated using web3.eth.sign() - */ - function recover(bytes32 hash, bytes sig) - internal - pure - returns (address) - { - bytes32 r; - bytes32 s; - uint8 v; - - // Check the signature length - if (sig.length != 65) { - return (address(0)); - } - - // Divide the signature in r, s and v variables - // ecrecover takes the signature parameters, and the only way to get them - // currently is to use assembly. - // solium-disable-next-line security/no-inline-assembly - assembly { - r := mload(add(sig, 32)) - s := mload(add(sig, 64)) - v := byte(0, mload(add(sig, 96))) - } - - // Version of signature should be 27 or 28, but 0 and 1 are also possible versions - if (v < 27) { - v += 27; - } - - // If the version is correct return the signer address - if (v != 27 && v != 28) { - return (address(0)); - } else { - // solium-disable-next-line arg-overflow - return ecrecover(hash, v, r, s); - } - } - - /** - * toEthSignedMessageHash - * @dev prefix a bytes32 value with "\x19Ethereum Signed Message:" - * @dev and hash the result - */ - function toEthSignedMessageHash(bytes32 hash) - internal - pure - returns (bytes32) - { - // 32 is the length in bytes of hash, - // enforced by the type signature above - return keccak256( - "\x19Ethereum Signed Message:\n32", - hash - ); - } -} diff --git a/contracts/LimitBalance.sol b/contracts/LimitBalance.sol deleted file mode 100644 index e3f28cac1..000000000 --- a/contracts/LimitBalance.sol +++ /dev/null @@ -1,31 +0,0 @@ -pragma solidity ^0.4.21; - - -/** - * @title LimitBalance - * @dev Simple contract to limit the balance of child contract. - * @dev Note this doesn't prevent other contracts to send funds by using selfdestruct(address); - * @dev See: https://github.com/ConsenSys/smart-contract-best-practices#remember-that-ether-can-be-forcibly-sent-to-an-account - */ -contract LimitBalance { - - uint256 public limit; - - /** - * @dev Constructor that sets the passed value as a limit. - * @param _limit uint256 to represent the limit. - */ - function LimitBalance(uint256 _limit) public { - limit = _limit; - } - - /** - * @dev Checks if limit was reached. Case true, it throws. - */ - modifier limitedPayable() { - require(address(this).balance <= limit); - _; - - } - -} diff --git a/contracts/MerkleProof.sol b/contracts/MerkleProof.sol deleted file mode 100644 index a7000c6f2..000000000 --- a/contracts/MerkleProof.sol +++ /dev/null @@ -1,35 +0,0 @@ -pragma solidity ^0.4.21; - - -/* - * @title MerkleProof - * @dev Merkle proof verification - * @note Based on https://github.com/ameensol/merkle-tree-solidity/blob/master/src/MerkleProof.sol - */ -library MerkleProof { - /* - * @dev Verifies a Merkle proof proving the existence of a leaf in a Merkle tree. Assumes that each pair of leaves - * and each pair of pre-images is sorted. - * @param _proof Merkle proof containing sibling hashes on the branch from the leaf to the root of the Merkle tree - * @param _root Merkle root - * @param _leaf Leaf of Merkle tree - */ - function verifyProof(bytes32[] _proof, bytes32 _root, bytes32 _leaf) internal pure returns (bool) { - bytes32 computedHash = _leaf; - - for (uint256 i = 0; i < _proof.length; i++) { - bytes32 proofElement = _proof[i]; - - if (computedHash < proofElement) { - // Hash(current computed hash + current element of the proof) - computedHash = keccak256(computedHash, proofElement); - } else { - // Hash(current element of the proof + current computed hash) - computedHash = keccak256(proofElement, computedHash); - } - } - - // Check if the computed hash (root) is equal to the provided root - return computedHash == _root; - } -} diff --git a/contracts/ReentrancyGuard.sol b/contracts/ReentrancyGuard.sol deleted file mode 100644 index 1b55ceebc..000000000 --- a/contracts/ReentrancyGuard.sol +++ /dev/null @@ -1,32 +0,0 @@ -pragma solidity ^0.4.21; - - -/** - * @title Helps contracts guard agains reentrancy attacks. - * @author Remco Bloemen - * @notice If you mark a function `nonReentrant`, you should also - * mark it `external`. - */ -contract ReentrancyGuard { - - /** - * @dev We use a single lock for the whole contract. - */ - bool private reentrancyLock = false; - - /** - * @dev Prevents a contract from calling itself, directly or indirectly. - * @notice If you mark a function `nonReentrant`, you should also - * mark it `external`. Calling one nonReentrant function from - * another is not supported. Instead, you can implement a - * `private` function doing the actual work, and a `external` - * wrapper marked as `nonReentrant`. - */ - modifier nonReentrant() { - require(!reentrancyLock); - reentrancyLock = true; - _; - reentrancyLock = false; - } - -} diff --git a/contracts/access/SignatureBouncer.sol b/contracts/access/SignatureBouncer.sol deleted file mode 100644 index ad0267de1..000000000 --- a/contracts/access/SignatureBouncer.sol +++ /dev/null @@ -1,90 +0,0 @@ -pragma solidity ^0.4.18; - -import "../ownership/Ownable.sol"; -import "../ownership/rbac/RBAC.sol"; -import "../ECRecovery.sol"; - -/** - * @title SignatureBouncer - * @author PhABC and Shrugs - * @dev Bouncer allows users to submit a signature as a permission to do an action. - * @dev If the signature is from one of the authorized bouncer addresses, the signature - * @dev is valid. The owner of the contract adds/removes bouncers. - * @dev Bouncer addresses can be individual servers signing grants or different - * @dev users within a decentralized club that have permission to invite other members. - * @dev - * @dev This technique is useful for whitelists and airdrops; instead of putting all - * @dev valid addresses on-chain, simply sign a grant of the form - * @dev keccak256(`:contractAddress` + `:granteeAddress`) using a valid bouncer address. - * @dev Then restrict access to your crowdsale/whitelist/airdrop using the - * @dev `onlyValidSignature` modifier (or implement your own using isValidSignature). - * @dev - * @dev See the tests Bouncer.test.js for specific usage examples. - */ -contract SignatureBouncer is Ownable, RBAC { - using ECRecovery for bytes32; - - string public constant ROLE_BOUNCER = "bouncer"; - - /** - * @dev requires that a valid signature of a bouncer was provided - */ - modifier onlyValidSignature(bytes _sig) - { - require(isValidSignature(msg.sender, _sig)); - _; - } - - /** - * @dev allows the owner to add additional bouncer addresses - */ - function addBouncer(address _bouncer) - onlyOwner - public - { - require(_bouncer != address(0)); - addRole(_bouncer, ROLE_BOUNCER); - } - - /** - * @dev allows the owner to remove bouncer addresses - */ - function removeBouncer(address _bouncer) - onlyOwner - public - { - require(_bouncer != address(0)); - removeRole(_bouncer, ROLE_BOUNCER); - } - - /** - * @dev is the signature of `this + sender` from a bouncer? - * @return bool - */ - function isValidSignature(address _address, bytes _sig) - internal - view - returns (bool) - { - return isValidDataHash( - keccak256(address(this), _address), - _sig - ); - } - - /** - * @dev internal function to convert a hash to an eth signed message - * @dev and then recover the signature and check it against the bouncer role - * @return bool - */ - function isValidDataHash(bytes32 hash, bytes _sig) - internal - view - returns (bool) - { - address signer = hash - .toEthSignedMessageHash() - .recover(_sig); - return hasRole(signer, ROLE_BOUNCER); - } -} diff --git a/contracts/crowdsale/Crowdsale.sol b/contracts/crowdsale/Crowdsale.sol deleted file mode 100644 index cbb59eabc..000000000 --- a/contracts/crowdsale/Crowdsale.sol +++ /dev/null @@ -1,163 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/ERC20.sol"; -import "../math/SafeMath.sol"; - - -/** - * @title Crowdsale - * @dev Crowdsale is a base contract for managing a token crowdsale, - * allowing investors to purchase tokens with ether. This contract implements - * such functionality in its most fundamental form and can be extended to provide additional - * functionality and/or custom behavior. - * The external interface represents the basic interface for purchasing tokens, and conform - * the base architecture for crowdsales. They are *not* intended to be modified / overriden. - * The internal interface conforms the extensible and modifiable surface of crowdsales. Override - * the methods to add functionality. Consider using 'super' where appropiate to concatenate - * behavior. - */ -contract Crowdsale { - using SafeMath for uint256; - - // The token being sold - ERC20 public token; - - // Address where funds are collected - address public wallet; - - // How many token units a buyer gets per wei - uint256 public rate; - - // Amount of wei raised - uint256 public weiRaised; - - /** - * Event for token purchase logging - * @param purchaser who paid for the tokens - * @param beneficiary who got the tokens - * @param value weis paid for purchase - * @param amount amount of tokens purchased - */ - event TokenPurchase(address indexed purchaser, address indexed beneficiary, uint256 value, uint256 amount); - - /** - * @param _rate Number of token units a buyer gets per wei - * @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 { - require(_rate > 0); - require(_wallet != address(0)); - require(_token != address(0)); - - rate = _rate; - wallet = _wallet; - token = _token; - } - - // ----------------------------------------- - // Crowdsale external interface - // ----------------------------------------- - - /** - * @dev fallback function ***DO NOT OVERRIDE*** - */ - function () external payable { - buyTokens(msg.sender); - } - - /** - * @dev low level token purchase ***DO NOT OVERRIDE*** - * @param _beneficiary Address performing the token purchase - */ - function buyTokens(address _beneficiary) public payable { - - uint256 weiAmount = msg.value; - _preValidatePurchase(_beneficiary, weiAmount); - - // calculate token amount to be created - uint256 tokens = _getTokenAmount(weiAmount); - - // update state - weiRaised = weiRaised.add(weiAmount); - - _processPurchase(_beneficiary, tokens); - emit TokenPurchase( - msg.sender, - _beneficiary, - weiAmount, - tokens - ); - - _updatePurchasingState(_beneficiary, weiAmount); - - _forwardFunds(); - _postValidatePurchase(_beneficiary, weiAmount); - } - - // ----------------------------------------- - // Internal interface (extensible) - // ----------------------------------------- - - /** - * @dev Validation of an incoming purchase. Use require statements to revert state when conditions are not met. Use super to concatenate validations. - * @param _beneficiary Address performing the token purchase - * @param _weiAmount Value in wei involved in the purchase - */ - function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal { - require(_beneficiary != address(0)); - require(_weiAmount != 0); - } - - /** - * @dev Validation of an executed purchase. Observe state and use revert statements to undo rollback when valid conditions are not met. - * @param _beneficiary Address performing the token purchase - * @param _weiAmount Value in wei involved in the purchase - */ - function _postValidatePurchase(address _beneficiary, uint256 _weiAmount) internal { - // optional override - } - - /** - * @dev Source of tokens. Override this method to modify the way in which the crowdsale ultimately gets and sends its tokens. - * @param _beneficiary Address performing the token purchase - * @param _tokenAmount Number of tokens to be emitted - */ - function _deliverTokens(address _beneficiary, uint256 _tokenAmount) internal { - token.transfer(_beneficiary, _tokenAmount); - } - - /** - * @dev Executed when a purchase has been validated and is ready to be executed. Not necessarily emits/sends tokens. - * @param _beneficiary Address receiving the tokens - * @param _tokenAmount Number of tokens to be purchased - */ - function _processPurchase(address _beneficiary, uint256 _tokenAmount) internal { - _deliverTokens(_beneficiary, _tokenAmount); - } - - /** - * @dev Override for extensions that require an internal state to check for validity (current user contributions, etc.) - * @param _beneficiary Address receiving the tokens - * @param _weiAmount Value in wei involved in the purchase - */ - function _updatePurchasingState(address _beneficiary, uint256 _weiAmount) internal { - // optional override - } - - /** - * @dev Override to extend the way in which ether is converted to tokens. - * @param _weiAmount Value in wei to be converted into tokens - * @return Number of tokens that can be purchased with the specified _weiAmount - */ - function _getTokenAmount(uint256 _weiAmount) internal view returns (uint256) { - return _weiAmount.mul(rate); - } - - /** - * @dev Determines how ETH is stored/forwarded on purchases. - */ - function _forwardFunds() internal { - wallet.transfer(msg.value); - } -} diff --git a/contracts/crowdsale/distribution/FinalizableCrowdsale.sol b/contracts/crowdsale/distribution/FinalizableCrowdsale.sol deleted file mode 100644 index d15d4f62b..000000000 --- a/contracts/crowdsale/distribution/FinalizableCrowdsale.sol +++ /dev/null @@ -1,42 +0,0 @@ -pragma solidity ^0.4.21; - -import "../../math/SafeMath.sol"; -import "../../ownership/Ownable.sol"; -import "../validation/TimedCrowdsale.sol"; - - -/** - * @title FinalizableCrowdsale - * @dev Extension of Crowdsale where an owner can do extra work - * after finishing. - */ -contract FinalizableCrowdsale is TimedCrowdsale, Ownable { - using SafeMath for uint256; - - bool public isFinalized = false; - - event Finalized(); - - /** - * @dev Must be called after crowdsale ends, to do some extra finalization - * work. Calls the contract's finalization function. - */ - function finalize() onlyOwner public { - require(!isFinalized); - require(hasClosed()); - - finalization(); - emit Finalized(); - - isFinalized = true; - } - - /** - * @dev Can be overridden to add finalization logic. The overriding function - * should call super.finalization() to ensure the chain of finalization is - * executed entirely. - */ - function finalization() internal { - } - -} diff --git a/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol b/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol deleted file mode 100644 index ac5daff99..000000000 --- a/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol +++ /dev/null @@ -1,37 +0,0 @@ -pragma solidity ^0.4.21; - -import "../validation/TimedCrowdsale.sol"; -import "../../token/ERC20/ERC20.sol"; -import "../../math/SafeMath.sol"; - - -/** - * @title PostDeliveryCrowdsale - * @dev Crowdsale that locks tokens from withdrawal until it ends. - */ -contract PostDeliveryCrowdsale is TimedCrowdsale { - using SafeMath for uint256; - - mapping(address => uint256) public balances; - - /** - * @dev Withdraw tokens only after crowdsale ends. - */ - function withdrawTokens() public { - require(hasClosed()); - uint256 amount = balances[msg.sender]; - require(amount > 0); - balances[msg.sender] = 0; - _deliverTokens(msg.sender, amount); - } - - /** - * @dev Overrides parent by storing balances instead of issuing tokens right away. - * @param _beneficiary Token purchaser - * @param _tokenAmount Amount of tokens purchased - */ - function _processPurchase(address _beneficiary, uint256 _tokenAmount) internal { - balances[_beneficiary] = balances[_beneficiary].add(_tokenAmount); - } - -} diff --git a/contracts/crowdsale/distribution/RefundableCrowdsale.sol b/contracts/crowdsale/distribution/RefundableCrowdsale.sol deleted file mode 100644 index 9b3819ea4..000000000 --- a/contracts/crowdsale/distribution/RefundableCrowdsale.sol +++ /dev/null @@ -1,72 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../../math/SafeMath.sol"; -import "./FinalizableCrowdsale.sol"; -import "./utils/RefundVault.sol"; - - -/** - * @title RefundableCrowdsale - * @dev Extension of Crowdsale contract that adds a funding goal, and - * the possibility of users getting a refund if goal is not met. - * Uses a RefundVault as the crowdsale's vault. - */ -contract RefundableCrowdsale is FinalizableCrowdsale { - using SafeMath for uint256; - - // minimum amount of funds to be raised in weis - uint256 public goal; - - // refund vault used to hold funds while crowdsale is running - RefundVault public vault; - - /** - * @dev Constructor, creates RefundVault. - * @param _goal Funding goal - */ - function RefundableCrowdsale(uint256 _goal) public { - require(_goal > 0); - vault = new RefundVault(wallet); - goal = _goal; - } - - /** - * @dev Investors can claim refunds here if crowdsale is unsuccessful - */ - function claimRefund() public { - require(isFinalized); - require(!goalReached()); - - vault.refund(msg.sender); - } - - /** - * @dev Checks whether funding goal was reached. - * @return Whether funding goal was reached - */ - function goalReached() public view returns (bool) { - return weiRaised >= goal; - } - - /** - * @dev vault finalization task, called when owner calls finalize() - */ - function finalization() internal { - if (goalReached()) { - vault.close(); - } else { - vault.enableRefunds(); - } - - super.finalization(); - } - - /** - * @dev Overrides Crowdsale fund forwarding, sending funds to vault. - */ - function _forwardFunds() internal { - vault.deposit.value(msg.value)(msg.sender); - } - -} diff --git a/contracts/crowdsale/distribution/utils/RefundVault.sol b/contracts/crowdsale/distribution/utils/RefundVault.sol deleted file mode 100644 index 17a69b08c..000000000 --- a/contracts/crowdsale/distribution/utils/RefundVault.sol +++ /dev/null @@ -1,66 +0,0 @@ -pragma solidity ^0.4.21; - -import "../../../math/SafeMath.sol"; -import "../../../ownership/Ownable.sol"; - - -/** - * @title RefundVault - * @dev This contract is used for storing funds while a crowdsale - * is in progress. Supports refunding the money if crowdsale fails, - * and forwarding it if crowdsale is successful. - */ -contract RefundVault is Ownable { - using SafeMath for uint256; - - enum State { Active, Refunding, Closed } - - mapping (address => uint256) public deposited; - address public wallet; - State public state; - - event Closed(); - event RefundsEnabled(); - event Refunded(address indexed beneficiary, uint256 weiAmount); - - /** - * @param _wallet Vault address - */ - function RefundVault(address _wallet) public { - require(_wallet != address(0)); - wallet = _wallet; - state = State.Active; - } - - /** - * @param investor Investor address - */ - function deposit(address investor) onlyOwner public payable { - require(state == State.Active); - deposited[investor] = deposited[investor].add(msg.value); - } - - function close() onlyOwner public { - require(state == State.Active); - state = State.Closed; - emit Closed(); - wallet.transfer(address(this).balance); - } - - function enableRefunds() onlyOwner public { - require(state == State.Active); - state = State.Refunding; - emit RefundsEnabled(); - } - - /** - * @param investor Investor address - */ - function refund(address investor) public { - require(state == State.Refunding); - uint256 depositedValue = deposited[investor]; - deposited[investor] = 0; - investor.transfer(depositedValue); - emit Refunded(investor, depositedValue); - } -} diff --git a/contracts/crowdsale/emission/AllowanceCrowdsale.sol b/contracts/crowdsale/emission/AllowanceCrowdsale.sol deleted file mode 100644 index ae8fe5992..000000000 --- a/contracts/crowdsale/emission/AllowanceCrowdsale.sol +++ /dev/null @@ -1,42 +0,0 @@ -pragma solidity ^0.4.21; - -import "../Crowdsale.sol"; -import "../../token/ERC20/ERC20.sol"; -import "../../math/SafeMath.sol"; - - -/** - * @title AllowanceCrowdsale - * @dev Extension of Crowdsale where tokens are held by a wallet, which approves an allowance to the crowdsale. - */ -contract AllowanceCrowdsale is Crowdsale { - using SafeMath for uint256; - - address public tokenWallet; - - /** - * @dev Constructor, takes token wallet address. - * @param _tokenWallet Address holding the tokens, which has approved allowance to the crowdsale - */ - function AllowanceCrowdsale(address _tokenWallet) public { - require(_tokenWallet != address(0)); - tokenWallet = _tokenWallet; - } - - /** - * @dev Checks the amount of tokens left in the allowance. - * @return Amount of tokens left in the allowance - */ - function remainingTokens() public view returns (uint256) { - return token.allowance(tokenWallet, this); - } - - /** - * @dev Overrides parent behavior by transferring tokens from wallet. - * @param _beneficiary Token purchaser - * @param _tokenAmount Amount of tokens purchased - */ - function _deliverTokens(address _beneficiary, uint256 _tokenAmount) internal { - token.transferFrom(tokenWallet, _beneficiary, _tokenAmount); - } -} diff --git a/contracts/crowdsale/emission/MintedCrowdsale.sol b/contracts/crowdsale/emission/MintedCrowdsale.sol deleted file mode 100644 index 4d30de156..000000000 --- a/contracts/crowdsale/emission/MintedCrowdsale.sol +++ /dev/null @@ -1,22 +0,0 @@ -pragma solidity ^0.4.21; - -import "../Crowdsale.sol"; -import "../../token/ERC20/MintableToken.sol"; - - -/** - * @title MintedCrowdsale - * @dev Extension of Crowdsale contract whose tokens are minted in each purchase. - * Token ownership should be transferred to MintedCrowdsale for minting. - */ -contract MintedCrowdsale is Crowdsale { - - /** - * @dev Overrides delivery by minting tokens upon purchase. - * @param _beneficiary Token purchaser - * @param _tokenAmount Number of tokens to be minted - */ - function _deliverTokens(address _beneficiary, uint256 _tokenAmount) internal { - require(MintableToken(token).mint(_beneficiary, _tokenAmount)); - } -} diff --git a/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol b/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol deleted file mode 100644 index c9f773bf4..000000000 --- a/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol +++ /dev/null @@ -1,54 +0,0 @@ -pragma solidity ^0.4.21; - -import "../validation/TimedCrowdsale.sol"; -import "../../math/SafeMath.sol"; - - -/** - * @title IncreasingPriceCrowdsale - * @dev Extension of Crowdsale contract that increases the price of tokens linearly in time. - * Note that what should be provided to the constructor is the initial and final _rates_, that is, - * the amount of tokens per wei contributed. Thus, the initial rate must be greater than the final rate. - */ -contract IncreasingPriceCrowdsale is TimedCrowdsale { - using SafeMath for uint256; - - uint256 public initialRate; - uint256 public finalRate; - - /** - * @dev Constructor, takes intial and final rates of tokens received per wei contributed. - * @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 { - require(_initialRate >= _finalRate); - require(_finalRate > 0); - initialRate = _initialRate; - finalRate = _finalRate; - } - - /** - * @dev Returns the rate of tokens per wei at the present time. - * Note that, as price _increases_ with time, the rate _decreases_. - * @return The number of tokens a buyer gets per wei at a given time - */ - function getCurrentRate() public view returns (uint256) { - // solium-disable-next-line security/no-block-members - uint256 elapsedTime = block.timestamp.sub(openingTime); - uint256 timeRange = closingTime.sub(openingTime); - uint256 rateRange = initialRate.sub(finalRate); - return initialRate.sub(elapsedTime.mul(rateRange).div(timeRange)); - } - - /** - * @dev Overrides parent method taking into account variable rate. - * @param _weiAmount The value in wei to be converted into tokens - * @return The number of tokens _weiAmount wei will buy at present time - */ - function _getTokenAmount(uint256 _weiAmount) internal view returns (uint256) { - uint256 currentRate = getCurrentRate(); - return currentRate.mul(_weiAmount); - } - -} diff --git a/contracts/crowdsale/validation/CappedCrowdsale.sol b/contracts/crowdsale/validation/CappedCrowdsale.sol deleted file mode 100644 index 0b899665a..000000000 --- a/contracts/crowdsale/validation/CappedCrowdsale.sol +++ /dev/null @@ -1,43 +0,0 @@ -pragma solidity ^0.4.21; - -import "../../math/SafeMath.sol"; -import "../Crowdsale.sol"; - - -/** - * @title CappedCrowdsale - * @dev Crowdsale with a limit for total contributions. - */ -contract CappedCrowdsale is Crowdsale { - using SafeMath for uint256; - - uint256 public cap; - - /** - * @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 { - require(_cap > 0); - cap = _cap; - } - - /** - * @dev Checks whether the cap has been reached. - * @return Whether the cap was reached - */ - function capReached() public view returns (bool) { - return weiRaised >= cap; - } - - /** - * @dev Extend parent behavior requiring purchase to respect the funding cap. - * @param _beneficiary Token purchaser - * @param _weiAmount Amount of wei contributed - */ - function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal { - super._preValidatePurchase(_beneficiary, _weiAmount); - require(weiRaised.add(_weiAmount) <= cap); - } - -} diff --git a/contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol b/contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol deleted file mode 100644 index ee363deb8..000000000 --- a/contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol +++ /dev/null @@ -1,76 +0,0 @@ -pragma solidity ^0.4.21; - -import "../../math/SafeMath.sol"; -import "../Crowdsale.sol"; -import "../../ownership/Ownable.sol"; - - -/** - * @title IndividuallyCappedCrowdsale - * @dev Crowdsale with per-user caps. - */ -contract IndividuallyCappedCrowdsale is Crowdsale, Ownable { - using SafeMath for uint256; - - mapping(address => uint256) public contributions; - mapping(address => uint256) public caps; - - /** - * @dev Sets a specific user's maximum contribution. - * @param _beneficiary Address to be capped - * @param _cap Wei limit for individual contribution - */ - function setUserCap(address _beneficiary, uint256 _cap) external onlyOwner { - caps[_beneficiary] = _cap; - } - - /** - * @dev Sets a group of users' maximum contribution. - * @param _beneficiaries List of addresses to be capped - * @param _cap Wei limit for individual contribution - */ - function setGroupCap(address[] _beneficiaries, uint256 _cap) external onlyOwner { - for (uint256 i = 0; i < _beneficiaries.length; i++) { - caps[_beneficiaries[i]] = _cap; - } - } - - /** - * @dev Returns the cap of a specific user. - * @param _beneficiary Address whose cap is to be checked - * @return Current cap for individual user - */ - function getUserCap(address _beneficiary) public view returns (uint256) { - return caps[_beneficiary]; - } - - /** - * @dev Returns the amount contributed so far by a sepecific user. - * @param _beneficiary Address of contributor - * @return User contribution so far - */ - function getUserContribution(address _beneficiary) public view returns (uint256) { - return contributions[_beneficiary]; - } - - /** - * @dev Extend parent behavior requiring purchase to respect the user's funding cap. - * @param _beneficiary Token purchaser - * @param _weiAmount Amount of wei contributed - */ - function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal { - super._preValidatePurchase(_beneficiary, _weiAmount); - require(contributions[_beneficiary].add(_weiAmount) <= caps[_beneficiary]); - } - - /** - * @dev Extend parent behavior to update user contributions - * @param _beneficiary Token purchaser - * @param _weiAmount Amount of wei contributed - */ - function _updatePurchasingState(address _beneficiary, uint256 _weiAmount) internal { - super._updatePurchasingState(_beneficiary, _weiAmount); - contributions[_beneficiary] = contributions[_beneficiary].add(_weiAmount); - } - -} diff --git a/contracts/crowdsale/validation/TimedCrowdsale.sol b/contracts/crowdsale/validation/TimedCrowdsale.sol deleted file mode 100644 index 9977990a7..000000000 --- a/contracts/crowdsale/validation/TimedCrowdsale.sol +++ /dev/null @@ -1,58 +0,0 @@ -pragma solidity ^0.4.21; - -import "../../math/SafeMath.sol"; -import "../Crowdsale.sol"; - - -/** - * @title TimedCrowdsale - * @dev Crowdsale accepting contributions only within a time frame. - */ -contract TimedCrowdsale is Crowdsale { - using SafeMath for uint256; - - uint256 public openingTime; - uint256 public closingTime; - - /** - * @dev Reverts if not in crowdsale time range. - */ - modifier onlyWhileOpen { - // solium-disable-next-line security/no-block-members - require(block.timestamp >= openingTime && block.timestamp <= closingTime); - _; - } - - /** - * @dev Constructor, takes crowdsale opening and closing times. - * @param _openingTime Crowdsale opening time - * @param _closingTime Crowdsale closing time - */ - function TimedCrowdsale(uint256 _openingTime, uint256 _closingTime) public { - // solium-disable-next-line security/no-block-members - require(_openingTime >= block.timestamp); - require(_closingTime >= _openingTime); - - openingTime = _openingTime; - closingTime = _closingTime; - } - - /** - * @dev Checks whether the period in which the crowdsale is open has already elapsed. - * @return Whether crowdsale period has elapsed - */ - function hasClosed() public view returns (bool) { - // solium-disable-next-line security/no-block-members - return block.timestamp > closingTime; - } - - /** - * @dev Extend parent behavior requiring to be within contributing period - * @param _beneficiary Token purchaser - * @param _weiAmount Amount of wei contributed - */ - function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal onlyWhileOpen { - super._preValidatePurchase(_beneficiary, _weiAmount); - } - -} diff --git a/contracts/crowdsale/validation/WhitelistedCrowdsale.sol b/contracts/crowdsale/validation/WhitelistedCrowdsale.sol deleted file mode 100644 index bbccd58a4..000000000 --- a/contracts/crowdsale/validation/WhitelistedCrowdsale.sol +++ /dev/null @@ -1,58 +0,0 @@ -pragma solidity ^0.4.21; - -import "../Crowdsale.sol"; -import "../../ownership/Ownable.sol"; - - -/** - * @title WhitelistedCrowdsale - * @dev Crowdsale in which only whitelisted users can contribute. - */ -contract WhitelistedCrowdsale is Crowdsale, Ownable { - - mapping(address => bool) public whitelist; - - /** - * @dev Reverts if beneficiary is not whitelisted. Can be used when extending this contract. - */ - modifier isWhitelisted(address _beneficiary) { - require(whitelist[_beneficiary]); - _; - } - - /** - * @dev Adds single address to whitelist. - * @param _beneficiary Address to be added to the whitelist - */ - function addToWhitelist(address _beneficiary) external onlyOwner { - whitelist[_beneficiary] = true; - } - - /** - * @dev Adds list of addresses to whitelist. Not overloaded due to limitations with truffle testing. - * @param _beneficiaries Addresses to be added to the whitelist - */ - function addManyToWhitelist(address[] _beneficiaries) external onlyOwner { - for (uint256 i = 0; i < _beneficiaries.length; i++) { - whitelist[_beneficiaries[i]] = true; - } - } - - /** - * @dev Removes single address from whitelist. - * @param _beneficiary Address to be removed to the whitelist - */ - function removeFromWhitelist(address _beneficiary) external onlyOwner { - whitelist[_beneficiary] = false; - } - - /** - * @dev Extend parent behavior requiring beneficiary to be in whitelist. - * @param _beneficiary Token beneficiary - * @param _weiAmount Amount of wei contributed - */ - function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal isWhitelisted(_beneficiary) { - super._preValidatePurchase(_beneficiary, _weiAmount); - } - -} diff --git a/contracts/examples/SampleCrowdsale.sol b/contracts/examples/SampleCrowdsale.sol deleted file mode 100644 index 8067a5aa9..000000000 --- a/contracts/examples/SampleCrowdsale.sol +++ /dev/null @@ -1,55 +0,0 @@ -pragma solidity ^0.4.21; - -import "../crowdsale/validation/CappedCrowdsale.sol"; -import "../crowdsale/distribution/RefundableCrowdsale.sol"; -import "../crowdsale/emission/MintedCrowdsale.sol"; -import "../token/ERC20/MintableToken.sol"; - - -/** - * @title SampleCrowdsaleToken - * @dev Very simple ERC20 Token that can be minted. - * It is meant to be used in a crowdsale contract. - */ -contract SampleCrowdsaleToken is MintableToken { - - string public constant name = "Sample Crowdsale Token"; // solium-disable-line uppercase - string public constant symbol = "SCT"; // solium-disable-line uppercase - uint8 public constant decimals = 18; // solium-disable-line uppercase - -} - - -/** - * @title SampleCrowdsale - * @dev This is an example of a fully fledged crowdsale. - * The way to add new features to a base crowdsale is by multiple inheritance. - * In this example we are providing following extensions: - * CappedCrowdsale - sets a max boundary for raised funds - * RefundableCrowdsale - set a min goal to be reached and returns funds if it's not met - * - * After adding multiple features it's good practice to run integration tests - * to ensure that subcontracts works together as intended. - */ -contract SampleCrowdsale is CappedCrowdsale, RefundableCrowdsale, MintedCrowdsale { - - function SampleCrowdsale( - uint256 _openingTime, - uint256 _closingTime, - uint256 _rate, - address _wallet, - uint256 _cap, - MintableToken _token, - uint256 _goal - ) - public - Crowdsale(_rate, _wallet, _token) - CappedCrowdsale(_cap) - TimedCrowdsale(_openingTime, _closingTime) - RefundableCrowdsale(_goal) - { - //As goal needs to be met for a successful crowdsale - //the value needs to less or equal than a cap which is limit for accepted funds - require(_goal <= _cap); - } -} diff --git a/contracts/examples/SimpleSavingsWallet.sol b/contracts/examples/SimpleSavingsWallet.sol deleted file mode 100644 index ea02acec2..000000000 --- a/contracts/examples/SimpleSavingsWallet.sol +++ /dev/null @@ -1,40 +0,0 @@ -pragma solidity ^0.4.21; - -import "../ownership/Heritable.sol"; - - -/** - * @title SimpleSavingsWallet - * @dev Simplest form of savings wallet whose ownership can be claimed by a heir - * if owner dies. - * In this example, we take a very simple savings wallet providing two operations - * (to send and receive funds) and extend its capabilities by making it Heritable. - * The account that creates the contract is set as owner, who has the authority to - * choose an heir account. Heir account can reclaim the contract ownership in the - * case that the owner dies. - */ -contract SimpleSavingsWallet is Heritable { - - event Sent(address indexed payee, uint256 amount, uint256 balance); - event Received(address indexed payer, uint256 amount, uint256 balance); - - - function SimpleSavingsWallet(uint256 _heartbeatTimeout) Heritable(_heartbeatTimeout) public {} - - /** - * @dev wallet can receive funds. - */ - function () public payable { - emit Received(msg.sender, msg.value, address(this).balance); - } - - /** - * @dev wallet can send funds - */ - function sendTo(address payee, uint256 amount) public onlyOwner { - require(payee != 0 && payee != address(this)); - require(amount > 0); - payee.transfer(amount); - emit Sent(payee, amount, address(this).balance); - } -} diff --git a/contracts/examples/SimpleToken.sol b/contracts/examples/SimpleToken.sol deleted file mode 100644 index a394f9dc7..000000000 --- a/contracts/examples/SimpleToken.sol +++ /dev/null @@ -1,30 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../token/ERC20/StandardToken.sol"; - - -/** - * @title SimpleToken - * @dev Very simple ERC20 Token example, where all tokens are pre-assigned to the creator. - * Note they can later distribute these tokens as they wish using `transfer` and other - * `StandardToken` functions. - */ -contract SimpleToken is StandardToken { - - string public constant name = "SimpleToken"; // solium-disable-line uppercase - string public constant symbol = "SIM"; // solium-disable-line uppercase - uint8 public constant decimals = 18; // solium-disable-line uppercase - - uint256 public constant INITIAL_SUPPLY = 10000 * (10 ** uint256(decimals)); - - /** - * @dev Constructor that gives msg.sender all of existing tokens. - */ - function SimpleToken() public { - totalSupply_ = INITIAL_SUPPLY; - balances[msg.sender] = INITIAL_SUPPLY; - emit Transfer(0x0, msg.sender, INITIAL_SUPPLY); - } - -} diff --git a/contracts/lifecycle/Destructible.sol b/contracts/lifecycle/Destructible.sol deleted file mode 100644 index cfb288d4e..000000000 --- a/contracts/lifecycle/Destructible.sol +++ /dev/null @@ -1,25 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../ownership/Ownable.sol"; - - -/** - * @title Destructible - * @dev Base contract that can be destroyed by owner. All funds in contract will be sent to the owner. - */ -contract Destructible is Ownable { - - function Destructible() public payable { } - - /** - * @dev Transfers the current balance to the owner and terminates the contract. - */ - function destroy() onlyOwner public { - selfdestruct(owner); - } - - function destroyAndSend(address _recipient) onlyOwner public { - selfdestruct(_recipient); - } -} diff --git a/contracts/lifecycle/TokenDestructible.sol b/contracts/lifecycle/TokenDestructible.sol deleted file mode 100644 index 6ebe9c015..000000000 --- a/contracts/lifecycle/TokenDestructible.sol +++ /dev/null @@ -1,36 +0,0 @@ -pragma solidity ^0.4.21; - -import "../ownership/Ownable.sol"; -import "../token/ERC20/ERC20Basic.sol"; - - -/** - * @title TokenDestructible: - * @author Remco Bloemen - * @dev Base contract that can be destroyed by owner. All funds in contract including - * listed tokens will be sent to the owner. - */ -contract TokenDestructible is Ownable { - - function TokenDestructible() public payable { } - - /** - * @notice Terminate contract and refund to owner - * @param tokens List of addresses of ERC20 or ERC20Basic token contracts to - refund. - * @notice The called token contracts could try to re-enter this contract. Only - supply token contracts you trust. - */ - function destroy(address[] tokens) onlyOwner public { - - // Transfer tokens to owner - for (uint256 i = 0; i < tokens.length; i++) { - ERC20Basic token = ERC20Basic(tokens[i]); - uint256 balance = token.balanceOf(this); - token.transfer(owner, balance); - } - - // Transfer Eth to owner and terminate contract - selfdestruct(owner); - } -} diff --git a/contracts/math/Math.sol b/contracts/math/Math.sol deleted file mode 100644 index 0532ecb30..000000000 --- a/contracts/math/Math.sol +++ /dev/null @@ -1,24 +0,0 @@ -pragma solidity ^0.4.21; - - -/** - * @title Math - * @dev Assorted math operations - */ -library Math { - function max64(uint64 a, uint64 b) internal pure returns (uint64) { - return a >= b ? a : b; - } - - function min64(uint64 a, uint64 b) internal pure returns (uint64) { - return a < b ? a : b; - } - - function max256(uint256 a, uint256 b) internal pure returns (uint256) { - return a >= b ? a : b; - } - - function min256(uint256 a, uint256 b) internal pure returns (uint256) { - return a < b ? a : b; - } -} diff --git a/contracts/mocks/AllowanceCrowdsaleImpl.sol b/contracts/mocks/AllowanceCrowdsaleImpl.sol deleted file mode 100644 index e3ffabed3..000000000 --- a/contracts/mocks/AllowanceCrowdsaleImpl.sol +++ /dev/null @@ -1,21 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/ERC20.sol"; -import "../crowdsale/emission/AllowanceCrowdsale.sol"; - - -contract AllowanceCrowdsaleImpl is AllowanceCrowdsale { - - function AllowanceCrowdsaleImpl ( - uint256 _rate, - address _wallet, - ERC20 _token, - address _tokenWallet - ) - public - Crowdsale(_rate, _wallet, _token) - AllowanceCrowdsale(_tokenWallet) - { - } - -} diff --git a/contracts/mocks/BouncerMock.sol b/contracts/mocks/BouncerMock.sol deleted file mode 100644 index 2add95874..000000000 --- a/contracts/mocks/BouncerMock.sol +++ /dev/null @@ -1,22 +0,0 @@ -pragma solidity ^0.4.18; - -import "../access/SignatureBouncer.sol"; - - -contract SignatureBouncerMock is SignatureBouncer { - function checkValidSignature(address _address, bytes _sig) - public - view - returns (bool) - { - return isValidSignature(_address, _sig); - } - - function onlyWithValidSignature(bytes _sig) - onlyValidSignature(_sig) - public - view - { - - } -} diff --git a/contracts/mocks/CappedCrowdsaleImpl.sol b/contracts/mocks/CappedCrowdsaleImpl.sol deleted file mode 100644 index 5666d4fd9..000000000 --- a/contracts/mocks/CappedCrowdsaleImpl.sol +++ /dev/null @@ -1,21 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/ERC20.sol"; -import "../crowdsale/validation/CappedCrowdsale.sol"; - - -contract CappedCrowdsaleImpl is CappedCrowdsale { - - function CappedCrowdsaleImpl ( - uint256 _rate, - address _wallet, - ERC20 _token, - uint256 _cap - ) - public - Crowdsale(_rate, _wallet, _token) - CappedCrowdsale(_cap) - { - } - -} diff --git a/contracts/mocks/DayLimitMock.sol b/contracts/mocks/DayLimitMock.sol deleted file mode 100644 index 0081966b6..000000000 --- a/contracts/mocks/DayLimitMock.sol +++ /dev/null @@ -1,25 +0,0 @@ -pragma solidity ^0.4.21; - -import "../../contracts/DayLimit.sol"; - - -contract DayLimitMock is DayLimit { - uint256 public totalSpending; - - function DayLimitMock(uint256 _value) public DayLimit(_value) { - totalSpending = 0; - } - - function attemptSpend(uint256 _value) external limitedDaily(_value) { - totalSpending += _value; - } - - function setDailyLimit(uint256 _newLimit) external { - _setDailyLimit(_newLimit); - } - - function resetSpentToday() external { - _resetSpentToday(); - } - -} diff --git a/contracts/mocks/ECRecoveryMock.sol b/contracts/mocks/ECRecoveryMock.sol deleted file mode 100644 index 091055161..000000000 --- a/contracts/mocks/ECRecoveryMock.sol +++ /dev/null @@ -1,25 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../ECRecovery.sol"; - - -contract ECRecoveryMock { - using ECRecovery for bytes32; - - function recover(bytes32 hash, bytes sig) - public - pure - returns (address) - { - return hash.recover(sig); - } - - function toEthSignedMessageHash(bytes32 hash) - public - pure - returns (bytes32) - { - return hash.toEthSignedMessageHash(); - } -} diff --git a/contracts/mocks/ERC223TokenMock.sol b/contracts/mocks/ERC223TokenMock.sol deleted file mode 100644 index fbe47fcc8..000000000 --- a/contracts/mocks/ERC223TokenMock.sol +++ /dev/null @@ -1,34 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/BasicToken.sol"; - - -contract ERC223ContractInterface { - function tokenFallback(address _from, uint256 _value, bytes _data) external; -} - - -contract ERC223TokenMock is BasicToken { - - function ERC223TokenMock(address initialAccount, uint256 initialBalance) public { - balances[initialAccount] = initialBalance; - totalSupply_ = initialBalance; - } - - // ERC223 compatible transfer function (except the name) - function transferERC223(address _to, uint256 _value, bytes _data) public - returns (bool success) - { - transfer(_to, _value); - bool isContract = false; - // solium-disable-next-line security/no-inline-assembly - assembly { - isContract := not(iszero(extcodesize(_to))) - } - if (isContract) { - ERC223ContractInterface receiver = ERC223ContractInterface(_to); - receiver.tokenFallback(msg.sender, _value, _data); - } - return true; - } -} diff --git a/contracts/mocks/ERC827TokenMock.sol b/contracts/mocks/ERC827TokenMock.sol deleted file mode 100644 index 1107a73e7..000000000 --- a/contracts/mocks/ERC827TokenMock.sol +++ /dev/null @@ -1,15 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../token/ERC827/ERC827Token.sol"; - - -// mock class using ERC827 Token -contract ERC827TokenMock is ERC827Token { - - function ERC827TokenMock(address initialAccount, uint256 initialBalance) public { - balances[initialAccount] = initialBalance; - totalSupply_ = initialBalance; - } - -} diff --git a/contracts/mocks/FinalizableCrowdsaleImpl.sol b/contracts/mocks/FinalizableCrowdsaleImpl.sol deleted file mode 100644 index 82d0a5500..000000000 --- a/contracts/mocks/FinalizableCrowdsaleImpl.sol +++ /dev/null @@ -1,22 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/MintableToken.sol"; -import "../crowdsale/distribution/FinalizableCrowdsale.sol"; - - -contract FinalizableCrowdsaleImpl is FinalizableCrowdsale { - - function FinalizableCrowdsaleImpl ( - uint256 _openingTime, - uint256 _closingTime, - uint256 _rate, - address _wallet, - MintableToken _token - ) - public - Crowdsale(_rate, _wallet, _token) - TimedCrowdsale(_openingTime, _closingTime) - { - } - -} diff --git a/contracts/mocks/ForceEther.sol b/contracts/mocks/ForceEther.sol deleted file mode 100644 index 7bbbf85fa..000000000 --- a/contracts/mocks/ForceEther.sol +++ /dev/null @@ -1,16 +0,0 @@ -pragma solidity ^0.4.21; - - -// @title Force Ether into a contract. -// @notice even -// if the contract is not payable. -// @notice To use, construct the contract with the target as argument. -// @author Remco Bloemen -contract ForceEther { - - function ForceEther() public payable { } - - function destroyAndSend(address _recipient) public { - selfdestruct(_recipient); - } -} diff --git a/contracts/mocks/HasNoEtherTest.sol b/contracts/mocks/HasNoEtherTest.sol deleted file mode 100644 index bbf9dfdb4..000000000 --- a/contracts/mocks/HasNoEtherTest.sol +++ /dev/null @@ -1,12 +0,0 @@ -pragma solidity ^0.4.21; - -import "../../contracts/ownership/HasNoEther.sol"; - - -contract HasNoEtherTest is HasNoEther { - - // Constructor with explicit payable — should still fail - function HasNoEtherTest() public payable { - } - -} diff --git a/contracts/mocks/IncreasingPriceCrowdsaleImpl.sol b/contracts/mocks/IncreasingPriceCrowdsaleImpl.sol deleted file mode 100644 index ea1466122..000000000 --- a/contracts/mocks/IncreasingPriceCrowdsaleImpl.sol +++ /dev/null @@ -1,24 +0,0 @@ -pragma solidity ^0.4.21; - -import "../crowdsale/price/IncreasingPriceCrowdsale.sol"; -import "../math/SafeMath.sol"; - - -contract IncreasingPriceCrowdsaleImpl is IncreasingPriceCrowdsale { - - function IncreasingPriceCrowdsaleImpl ( - uint256 _openingTime, - uint256 _closingTime, - address _wallet, - ERC20 _token, - uint256 _initialRate, - uint256 _finalRate - ) - public - Crowdsale(_initialRate, _wallet, _token) - TimedCrowdsale(_openingTime, _closingTime) - IncreasingPriceCrowdsale(_initialRate, _finalRate) - { - } - -} diff --git a/contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol b/contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol deleted file mode 100644 index 7ac944d0b..000000000 --- a/contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol +++ /dev/null @@ -1,19 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/ERC20.sol"; -import "../crowdsale/validation/IndividuallyCappedCrowdsale.sol"; - - -contract IndividuallyCappedCrowdsaleImpl is IndividuallyCappedCrowdsale { - - function IndividuallyCappedCrowdsaleImpl ( - uint256 _rate, - address _wallet, - ERC20 _token - ) - public - Crowdsale(_rate, _wallet, _token) - { - } - -} diff --git a/contracts/mocks/InsecureTargetBounty.sol b/contracts/mocks/InsecureTargetBounty.sol deleted file mode 100644 index 74bc531b2..000000000 --- a/contracts/mocks/InsecureTargetBounty.sol +++ /dev/null @@ -1,17 +0,0 @@ -pragma solidity ^0.4.21; - -import {Bounty, Target} from "../../contracts/Bounty.sol"; - - -contract InsecureTargetMock is Target { - function checkInvariant() public returns(bool) { - return false; - } -} - - -contract InsecureTargetBounty is Bounty { - function deployContract() internal returns (address) { - return new InsecureTargetMock(); - } -} diff --git a/contracts/mocks/LimitBalanceMock.sol b/contracts/mocks/LimitBalanceMock.sol deleted file mode 100644 index a5ed18c5c..000000000 --- a/contracts/mocks/LimitBalanceMock.sol +++ /dev/null @@ -1,13 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../LimitBalance.sol"; - - -// mock class using LimitBalance -contract LimitBalanceMock is LimitBalance(1000) { - - function limitedDeposit() public payable limitedPayable { - } - -} diff --git a/contracts/mocks/MerkleProofWrapper.sol b/contracts/mocks/MerkleProofWrapper.sol deleted file mode 100644 index aa830e63a..000000000 --- a/contracts/mocks/MerkleProofWrapper.sol +++ /dev/null @@ -1,11 +0,0 @@ -pragma solidity ^0.4.21; - -import { MerkleProof } from "../MerkleProof.sol"; - - -contract MerkleProofWrapper { - - function verifyProof(bytes32[] _proof, bytes32 _root, bytes32 _leaf) public pure returns (bool) { - return MerkleProof.verifyProof(_proof, _root, _leaf); - } -} diff --git a/contracts/mocks/MessageHelper.sol b/contracts/mocks/MessageHelper.sol deleted file mode 100644 index b44b6496a..000000000 --- a/contracts/mocks/MessageHelper.sol +++ /dev/null @@ -1,25 +0,0 @@ -pragma solidity ^0.4.21; - - -contract MessageHelper { - - event Show(bytes32 b32, uint256 number, string text); - - function showMessage( bytes32 message, uint256 number, string text ) public returns (bool) { - emit Show(message, number, text); - return true; - } - - function fail() public { - require(false); - } - - function call(address to, bytes data) public returns (bool) { - // solium-disable-next-line security/no-low-level-calls - if (to.call(data)) - return true; - else - return false; - } - -} diff --git a/contracts/mocks/MintedCrowdsaleImpl.sol b/contracts/mocks/MintedCrowdsaleImpl.sol deleted file mode 100644 index f6999b021..000000000 --- a/contracts/mocks/MintedCrowdsaleImpl.sol +++ /dev/null @@ -1,19 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/MintableToken.sol"; -import "../crowdsale/emission/MintedCrowdsale.sol"; - - -contract MintedCrowdsaleImpl is MintedCrowdsale { - - function MintedCrowdsaleImpl ( - uint256 _rate, - address _wallet, - MintableToken _token - ) - public - Crowdsale(_rate, _wallet, _token) - { - } - -} diff --git a/contracts/mocks/PostDeliveryCrowdsaleImpl.sol b/contracts/mocks/PostDeliveryCrowdsaleImpl.sol deleted file mode 100644 index 09db38067..000000000 --- a/contracts/mocks/PostDeliveryCrowdsaleImpl.sol +++ /dev/null @@ -1,22 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/ERC20.sol"; -import "../crowdsale/distribution/PostDeliveryCrowdsale.sol"; - - -contract PostDeliveryCrowdsaleImpl is PostDeliveryCrowdsale { - - function PostDeliveryCrowdsaleImpl ( - uint256 _openingTime, - uint256 _closingTime, - uint256 _rate, - address _wallet, - ERC20 _token - ) - public - TimedCrowdsale(_openingTime, _closingTime) - Crowdsale(_rate, _wallet, _token) - { - } - -} diff --git a/contracts/mocks/PullPaymentMock.sol b/contracts/mocks/PullPaymentMock.sol deleted file mode 100644 index fb4a1231b..000000000 --- a/contracts/mocks/PullPaymentMock.sol +++ /dev/null @@ -1,17 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../payment/PullPayment.sol"; - - -// mock class using PullPayment -contract PullPaymentMock is PullPayment { - - function PullPaymentMock() public payable { } - - // test helper function to call asyncSend - function callSend(address dest, uint256 amount) public { - asyncSend(dest, amount); - } - -} diff --git a/contracts/mocks/RBACMock.sol b/contracts/mocks/RBACMock.sol deleted file mode 100644 index 7dfa2a985..000000000 --- a/contracts/mocks/RBACMock.sol +++ /dev/null @@ -1,69 +0,0 @@ -pragma solidity ^0.4.21; - -import "../ownership/rbac/RBACWithAdmin.sol"; - - -contract RBACMock is RBACWithAdmin { - - string constant ROLE_ADVISOR = "advisor"; - - modifier onlyAdminOrAdvisor() - { - require( - hasRole(msg.sender, ROLE_ADMIN) || - hasRole(msg.sender, ROLE_ADVISOR) - ); - _; - } - - function RBACMock(address[] _advisors) - public - { - addRole(msg.sender, ROLE_ADVISOR); - - for (uint256 i = 0; i < _advisors.length; i++) { - addRole(_advisors[i], ROLE_ADVISOR); - } - } - - function onlyAdminsCanDoThis() - onlyAdmin - view - external - { - } - - function onlyAdvisorsCanDoThis() - onlyRole(ROLE_ADVISOR) - view - external - { - } - - function eitherAdminOrAdvisorCanDoThis() - onlyAdminOrAdvisor - view - external - { - } - - function nobodyCanDoThis() - onlyRole("unknown") - view - external - { - } - - // admins can remove advisor's role - function removeAdvisor(address _addr) - onlyAdmin - public - { - // revert if the user isn't an advisor - // (perhaps you want to soft-fail here instead?) - checkRole(_addr, ROLE_ADVISOR); - - // remove the advisor's role - removeRole(_addr, ROLE_ADVISOR); - } -} diff --git a/contracts/mocks/ReentrancyAttack.sol b/contracts/mocks/ReentrancyAttack.sol deleted file mode 100644 index 5caebb1d6..000000000 --- a/contracts/mocks/ReentrancyAttack.sol +++ /dev/null @@ -1,11 +0,0 @@ -pragma solidity ^0.4.21; - - -contract ReentrancyAttack { - - function callSender(bytes4 data) public { - // solium-disable-next-line security/no-low-level-calls - require(msg.sender.call(data)); - } - -} diff --git a/contracts/mocks/ReentrancyMock.sol b/contracts/mocks/ReentrancyMock.sol deleted file mode 100644 index 72f4a284f..000000000 --- a/contracts/mocks/ReentrancyMock.sol +++ /dev/null @@ -1,46 +0,0 @@ -pragma solidity ^0.4.21; - -import "../ReentrancyGuard.sol"; -import "./ReentrancyAttack.sol"; - - -contract ReentrancyMock is ReentrancyGuard { - - uint256 public counter; - - function ReentrancyMock() public { - counter = 0; - } - - function callback() external nonReentrant { - count(); - } - - function countLocalRecursive(uint256 n) public nonReentrant { - if (n > 0) { - count(); - countLocalRecursive(n - 1); - } - } - - function countThisRecursive(uint256 n) public nonReentrant { - bytes4 func = bytes4(keccak256("countThisRecursive(uint256)")); - if (n > 0) { - count(); - // solium-disable-next-line security/no-low-level-calls - bool result = address(this).call(func, n - 1); - require(result == true); - } - } - - function countAndCall(ReentrancyAttack attacker) public nonReentrant { - count(); - bytes4 func = bytes4(keccak256("callback()")); - attacker.callSender(func); - } - - function count() private { - counter += 1; - } - -} diff --git a/contracts/mocks/RefundableCrowdsaleImpl.sol b/contracts/mocks/RefundableCrowdsaleImpl.sol deleted file mode 100644 index 08ee14512..000000000 --- a/contracts/mocks/RefundableCrowdsaleImpl.sol +++ /dev/null @@ -1,24 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/MintableToken.sol"; -import "../crowdsale/distribution/RefundableCrowdsale.sol"; - - -contract RefundableCrowdsaleImpl is RefundableCrowdsale { - - function RefundableCrowdsaleImpl ( - uint256 _openingTime, - uint256 _closingTime, - uint256 _rate, - address _wallet, - MintableToken _token, - uint256 _goal - ) - public - Crowdsale(_rate, _wallet, _token) - TimedCrowdsale(_openingTime, _closingTime) - RefundableCrowdsale(_goal) - { - } - -} diff --git a/contracts/mocks/SecureTargetBounty.sol b/contracts/mocks/SecureTargetBounty.sol deleted file mode 100644 index 1b69176a1..000000000 --- a/contracts/mocks/SecureTargetBounty.sol +++ /dev/null @@ -1,17 +0,0 @@ -pragma solidity ^0.4.21; - -import {Bounty, Target} from "../../contracts/Bounty.sol"; - - -contract SecureTargetMock is Target { - function checkInvariant() public returns(bool) { - return true; - } -} - - -contract SecureTargetBounty is Bounty { - function deployContract() internal returns (address) { - return new SecureTargetMock(); - } -} diff --git a/contracts/mocks/TimedCrowdsaleImpl.sol b/contracts/mocks/TimedCrowdsaleImpl.sol deleted file mode 100644 index b66566239..000000000 --- a/contracts/mocks/TimedCrowdsaleImpl.sol +++ /dev/null @@ -1,22 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/ERC20.sol"; -import "../crowdsale/validation/TimedCrowdsale.sol"; - - -contract TimedCrowdsaleImpl is TimedCrowdsale { - - function TimedCrowdsaleImpl ( - uint256 _openingTime, - uint256 _closingTime, - uint256 _rate, - address _wallet, - ERC20 _token - ) - public - Crowdsale(_rate, _wallet, _token) - TimedCrowdsale(_openingTime, _closingTime) - { - } - -} diff --git a/contracts/mocks/WhitelistMock.sol b/contracts/mocks/WhitelistMock.sol deleted file mode 100644 index 9c50405b0..000000000 --- a/contracts/mocks/WhitelistMock.sol +++ /dev/null @@ -1,14 +0,0 @@ -pragma solidity ^0.4.21; - -import "../ownership/Whitelist.sol"; - - -contract WhitelistMock is Whitelist { - - function onlyWhitelistedCanDoThis() - onlyWhitelisted - view - external - { - } -} diff --git a/contracts/mocks/WhitelistedCrowdsaleImpl.sol b/contracts/mocks/WhitelistedCrowdsaleImpl.sol deleted file mode 100644 index 16dc45434..000000000 --- a/contracts/mocks/WhitelistedCrowdsaleImpl.sol +++ /dev/null @@ -1,19 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/ERC20.sol"; -import "../crowdsale/validation/WhitelistedCrowdsale.sol"; - - -contract WhitelistedCrowdsaleImpl is WhitelistedCrowdsale { - - function WhitelistedCrowdsaleImpl ( - uint256 _rate, - address _wallet, - ERC20 _token - ) - public - Crowdsale(_rate, _wallet, _token) - { - } - -} diff --git a/contracts/ownership/CanReclaimToken.sol b/contracts/ownership/CanReclaimToken.sol deleted file mode 100644 index 474baae4e..000000000 --- a/contracts/ownership/CanReclaimToken.sol +++ /dev/null @@ -1,26 +0,0 @@ -pragma solidity ^0.4.21; - -import "./Ownable.sol"; -import "../token/ERC20/ERC20Basic.sol"; -import "../token/ERC20/SafeERC20.sol"; - - -/** - * @title Contracts that should be able to recover tokens - * @author SylTi - * @dev This allow a contract to recover any ERC20 token received in a contract by transferring the balance to the contract owner. - * This will prevent any accidental loss of tokens. - */ -contract CanReclaimToken is Ownable { - using SafeERC20 for ERC20Basic; - - /** - * @dev Reclaim all ERC20Basic compatible tokens - * @param token ERC20Basic The address of the token contract - */ - function reclaimToken(ERC20Basic token) external onlyOwner { - uint256 balance = token.balanceOf(this); - token.safeTransfer(owner, balance); - } - -} diff --git a/contracts/ownership/Claimable.sol b/contracts/ownership/Claimable.sol deleted file mode 100644 index f1ebd76dd..000000000 --- a/contracts/ownership/Claimable.sol +++ /dev/null @@ -1,39 +0,0 @@ -pragma solidity ^0.4.21; - - -import "./Ownable.sol"; - - -/** - * @title Claimable - * @dev Extension for the Ownable contract, where the ownership needs to be claimed. - * This allows the new owner to accept the transfer. - */ -contract Claimable is Ownable { - address public pendingOwner; - - /** - * @dev Modifier throws if called by any account other than the pendingOwner. - */ - modifier onlyPendingOwner() { - require(msg.sender == pendingOwner); - _; - } - - /** - * @dev Allows the current owner to set the pendingOwner address. - * @param newOwner The address to transfer ownership to. - */ - function transferOwnership(address newOwner) onlyOwner public { - pendingOwner = newOwner; - } - - /** - * @dev Allows the pendingOwner address to finalize the transfer. - */ - function claimOwnership() onlyPendingOwner public { - emit OwnershipTransferred(owner, pendingOwner); - owner = pendingOwner; - pendingOwner = address(0); - } -} diff --git a/contracts/ownership/Contactable.sol b/contracts/ownership/Contactable.sol deleted file mode 100644 index adeeaa02a..000000000 --- a/contracts/ownership/Contactable.sol +++ /dev/null @@ -1,22 +0,0 @@ -pragma solidity ^0.4.21; - -import "./Ownable.sol"; - - -/** - * @title Contactable token - * @dev Basic version of a contactable contract, allowing the owner to provide a string with their - * contact information. - */ -contract Contactable is Ownable { - - string public contactInformation; - - /** - * @dev Allows the owner to set a string with their contact information. - * @param info The contact information to attach to the contract. - */ - function setContactInformation(string info) onlyOwner public { - contactInformation = info; - } -} diff --git a/contracts/ownership/DelayedClaimable.sol b/contracts/ownership/DelayedClaimable.sol deleted file mode 100644 index f221afb56..000000000 --- a/contracts/ownership/DelayedClaimable.sol +++ /dev/null @@ -1,40 +0,0 @@ -pragma solidity ^0.4.21; - -import "./Claimable.sol"; - - -/** - * @title DelayedClaimable - * @dev Extension for the Claimable contract, where the ownership needs to be claimed before/after - * a certain block number. - */ -contract DelayedClaimable is Claimable { - - uint256 public end; - uint256 public start; - - /** - * @dev Used to specify the time period during which a pending - * owner can claim ownership. - * @param _start The earliest time ownership can be claimed. - * @param _end The latest time ownership can be claimed. - */ - function setLimits(uint256 _start, uint256 _end) onlyOwner public { - require(_start <= _end); - end = _end; - start = _start; - } - - /** - * @dev Allows the pendingOwner address to finalize the transfer, as long as it is called within - * the specified start and end time. - */ - function claimOwnership() onlyPendingOwner public { - require((block.number <= end) && (block.number >= start)); - emit OwnershipTransferred(owner, pendingOwner); - owner = pendingOwner; - pendingOwner = address(0); - end = 0; - } - -} diff --git a/contracts/ownership/HasNoContracts.sol b/contracts/ownership/HasNoContracts.sol deleted file mode 100644 index 19e8d0ff9..000000000 --- a/contracts/ownership/HasNoContracts.sol +++ /dev/null @@ -1,22 +0,0 @@ -pragma solidity ^0.4.21; - -import "./Ownable.sol"; - - -/** - * @title Contracts that should not own Contracts - * @author Remco Bloemen - * @dev Should contracts (anything Ownable) end up being owned by this contract, it allows the owner - * of this contract to reclaim ownership of the contracts. - */ -contract HasNoContracts is Ownable { - - /** - * @dev Reclaim ownership of Ownable contracts - * @param contractAddr The address of the Ownable to be reclaimed. - */ - function reclaimContract(address contractAddr) external onlyOwner { - Ownable contractInst = Ownable(contractAddr); - contractInst.transferOwnership(owner); - } -} diff --git a/contracts/ownership/HasNoEther.sol b/contracts/ownership/HasNoEther.sol deleted file mode 100644 index 6cce9858c..000000000 --- a/contracts/ownership/HasNoEther.sol +++ /dev/null @@ -1,42 +0,0 @@ -pragma solidity ^0.4.21; - -import "./Ownable.sol"; - - -/** - * @title Contracts that should not own Ether - * @author Remco Bloemen - * @dev This tries to block incoming ether to prevent accidental loss of Ether. Should Ether end up - * in the contract, it will allow the owner to reclaim this ether. - * @notice Ether can still be send to this contract by: - * calling functions labeled `payable` - * `selfdestruct(contract_address)` - * mining directly to the contract address -*/ -contract HasNoEther is Ownable { - - /** - * @dev Constructor that rejects incoming Ether - * @dev The `payable` flag is added so we can access `msg.value` without compiler warning. If we - * leave out payable, then Solidity will allow inheriting contracts to implement a payable - * 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 { - require(msg.value == 0); - } - - /** - * @dev Disallows direct send by settings a default function without the `payable` flag. - */ - function() external { - } - - /** - * @dev Transfer all Ether held by the contract to the owner. - */ - function reclaimEther() external onlyOwner { - // solium-disable-next-line security/no-send - assert(owner.send(address(this).balance)); - } -} diff --git a/contracts/ownership/HasNoTokens.sol b/contracts/ownership/HasNoTokens.sol deleted file mode 100644 index eaede63ae..000000000 --- a/contracts/ownership/HasNoTokens.sol +++ /dev/null @@ -1,28 +0,0 @@ -pragma solidity ^0.4.21; - -import "./CanReclaimToken.sol"; - - -/** - * @title Contracts that should not own Tokens - * @author Remco Bloemen - * @dev This blocks incoming ERC223 tokens to prevent accidental loss of tokens. - * Should tokens (any ERC20Basic compatible) end up in the contract, it allows the - * owner to reclaim the tokens. - */ -contract HasNoTokens is CanReclaimToken { - - /** - * @dev Reject all ERC223 compatible tokens - * @param from_ address The address that is transferring the tokens - * @param value_ uint256 the amount of the specified token - * @param data_ Bytes The data passed from the caller. - */ - function tokenFallback(address from_, uint256 value_, bytes data_) external { - from_; - value_; - data_; - revert(); - } - -} diff --git a/contracts/ownership/Heritable.sol b/contracts/ownership/Heritable.sol deleted file mode 100644 index 3b592a0a5..000000000 --- a/contracts/ownership/Heritable.sol +++ /dev/null @@ -1,117 +0,0 @@ -pragma solidity ^0.4.21; - - -import "./Ownable.sol"; - - -/** - * @title Heritable - * @dev The Heritable contract provides ownership transfer capabilities, in the - * case that the current owner stops "heartbeating". Only the heir can pronounce the - * owner's death. - */ -contract Heritable is Ownable { - address private heir_; - - // Time window the owner has to notify they are alive. - uint256 private heartbeatTimeout_; - - // Timestamp of the owner's death, as pronounced by the heir. - uint256 private timeOfDeath_; - - event HeirChanged(address indexed owner, address indexed newHeir); - event OwnerHeartbeated(address indexed owner); - event OwnerProclaimedDead(address indexed owner, address indexed heir, uint256 timeOfDeath); - event HeirOwnershipClaimed(address indexed previousOwner, address indexed newOwner); - - - /** - * @dev Throw an exception if called by any account other than the heir's. - */ - modifier onlyHeir() { - require(msg.sender == heir_); - _; - } - - - /** - * @notice Create a new Heritable Contract with heir address 0x0. - * @param _heartbeatTimeout time available for the owner to notify they are alive, - * before the heir can take ownership. - */ - function Heritable(uint256 _heartbeatTimeout) public { - setHeartbeatTimeout(_heartbeatTimeout); - } - - function setHeir(address newHeir) public onlyOwner { - require(newHeir != owner); - heartbeat(); - emit HeirChanged(owner, newHeir); - heir_ = newHeir; - } - - /** - * @dev Use these getter functions to access the internal variables in - * an inherited contract. - */ - function heir() public view returns(address) { - return heir_; - } - - function heartbeatTimeout() public view returns(uint256) { - return heartbeatTimeout_; - } - - function timeOfDeath() public view returns(uint256) { - return timeOfDeath_; - } - - /** - * @dev set heir = 0x0 - */ - function removeHeir() public onlyOwner { - heartbeat(); - heir_ = 0; - } - - /** - * @dev Heir can pronounce the owners death. To claim the ownership, they will - * have to wait for `heartbeatTimeout` seconds. - */ - function proclaimDeath() public onlyHeir { - require(ownerLives()); - emit OwnerProclaimedDead(owner, heir_, timeOfDeath_); - // solium-disable-next-line security/no-block-members - timeOfDeath_ = block.timestamp; - } - - /** - * @dev Owner can send a heartbeat if they were mistakenly pronounced dead. - */ - function heartbeat() public onlyOwner { - emit OwnerHeartbeated(owner); - timeOfDeath_ = 0; - } - - /** - * @dev Allows heir to transfer ownership only if heartbeat has timed out. - */ - function claimHeirOwnership() public onlyHeir { - require(!ownerLives()); - // solium-disable-next-line security/no-block-members - require(block.timestamp >= timeOfDeath_ + heartbeatTimeout_); - emit OwnershipTransferred(owner, heir_); - emit HeirOwnershipClaimed(owner, heir_); - owner = heir_; - timeOfDeath_ = 0; - } - - function setHeartbeatTimeout(uint256 newHeartbeatTimeout) internal onlyOwner { - require(ownerLives()); - heartbeatTimeout_ = newHeartbeatTimeout; - } - - function ownerLives() internal view returns (bool) { - return timeOfDeath_ == 0; - } -} diff --git a/contracts/ownership/NoOwner.sol b/contracts/ownership/NoOwner.sol deleted file mode 100644 index 9b4c7c93b..000000000 --- a/contracts/ownership/NoOwner.sol +++ /dev/null @@ -1,15 +0,0 @@ -pragma solidity ^0.4.21; - -import "./HasNoEther.sol"; -import "./HasNoTokens.sol"; -import "./HasNoContracts.sol"; - - -/** - * @title Base contract for contracts that should not own things. - * @author Remco Bloemen - * @dev Solves a class of errors where a contract accidentally becomes owner of Ether, Tokens or - * Owned contracts. See respective base contracts for details. - */ -contract NoOwner is HasNoEther, HasNoTokens, HasNoContracts { -} diff --git a/contracts/ownership/Whitelist.sol b/contracts/ownership/Whitelist.sol deleted file mode 100644 index 4d6e2a70a..000000000 --- a/contracts/ownership/Whitelist.sol +++ /dev/null @@ -1,81 +0,0 @@ -pragma solidity ^0.4.21; - - -import "./Ownable.sol"; - - -/** - * @title Whitelist - * @dev The Whitelist contract has a whitelist of addresses, and provides basic authorization control functions. - * @dev This simplifies the implementation of "user permissions". - */ -contract Whitelist is Ownable { - mapping(address => bool) public whitelist; - - event WhitelistedAddressAdded(address addr); - event WhitelistedAddressRemoved(address addr); - - /** - * @dev Throws if called by any account that's not whitelisted. - */ - modifier onlyWhitelisted() { - require(whitelist[msg.sender]); - _; - } - - /** - * @dev add an address to the whitelist - * @param addr address - * @return true if the address was added to the whitelist, false if the address was already in the whitelist - */ - function addAddressToWhitelist(address addr) onlyOwner public returns(bool success) { - if (!whitelist[addr]) { - whitelist[addr] = true; - emit WhitelistedAddressAdded(addr); - success = true; - } - } - - /** - * @dev add addresses to the whitelist - * @param addrs addresses - * @return true if at least one address was added to the whitelist, - * false if all addresses were already in the whitelist - */ - function addAddressesToWhitelist(address[] addrs) onlyOwner public returns(bool success) { - for (uint256 i = 0; i < addrs.length; i++) { - if (addAddressToWhitelist(addrs[i])) { - success = true; - } - } - } - - /** - * @dev remove an address from the whitelist - * @param addr address - * @return true if the address was removed from the whitelist, - * false if the address wasn't in the whitelist in the first place - */ - function removeAddressFromWhitelist(address addr) onlyOwner public returns(bool success) { - if (whitelist[addr]) { - whitelist[addr] = false; - emit WhitelistedAddressRemoved(addr); - success = true; - } - } - - /** - * @dev remove addresses from the whitelist - * @param addrs addresses - * @return true if at least one address was removed from the whitelist, - * false if all addresses weren't in the whitelist in the first place - */ - function removeAddressesFromWhitelist(address[] addrs) onlyOwner public returns(bool success) { - for (uint256 i = 0; i < addrs.length; i++) { - if (removeAddressFromWhitelist(addrs[i])) { - success = true; - } - } - } - -} diff --git a/contracts/ownership/rbac/RBAC.sol b/contracts/ownership/rbac/RBAC.sol deleted file mode 100644 index 998d334f8..000000000 --- a/contracts/ownership/rbac/RBAC.sol +++ /dev/null @@ -1,108 +0,0 @@ -pragma solidity ^0.4.21; - -import "./Roles.sol"; - - -/** - * @title RBAC (Role-Based Access Control) - * @author Matt Condon (@Shrugs) - * @dev Stores and provides setters and getters for roles and addresses. - * @dev Supports unlimited numbers of roles and addresses. - * @dev See //contracts/mocks/RBACMock.sol for an example of usage. - * This RBAC method uses strings to key roles. It may be beneficial - * for you to write your own implementation of this interface using Enums or similar. - * It's also recommended that you define constants in the contract, like ROLE_ADMIN below, - * to avoid typos. - */ -contract RBAC { - using Roles for Roles.Role; - - mapping (string => Roles.Role) private roles; - - event RoleAdded(address addr, string roleName); - event RoleRemoved(address addr, string roleName); - - /** - * @dev reverts if addr does not have role - * @param addr address - * @param roleName the name of the role - * // reverts - */ - function checkRole(address addr, string roleName) - view - public - { - roles[roleName].check(addr); - } - - /** - * @dev determine if addr has role - * @param addr address - * @param roleName the name of the role - * @return bool - */ - function hasRole(address addr, string roleName) - view - public - returns (bool) - { - return roles[roleName].has(addr); - } - - /** - * @dev add a role to an address - * @param addr address - * @param roleName the name of the role - */ - function addRole(address addr, string roleName) - internal - { - roles[roleName].add(addr); - emit RoleAdded(addr, roleName); - } - - /** - * @dev remove a role from an address - * @param addr address - * @param roleName the name of the role - */ - function removeRole(address addr, string roleName) - internal - { - roles[roleName].remove(addr); - emit RoleRemoved(addr, roleName); - } - - /** - * @dev modifier to scope access to a single role (uses msg.sender as addr) - * @param roleName the name of the role - * // reverts - */ - modifier onlyRole(string roleName) - { - checkRole(msg.sender, roleName); - _; - } - - /** - * @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 - * // reverts - * - * @TODO - when solidity supports dynamic arrays as arguments to modifiers, provide this - * see: https://github.com/ethereum/solidity/issues/2467 - */ - // modifier onlyRoles(string[] roleNames) { - // bool hasAnyRole = false; - // for (uint8 i = 0; i < roleNames.length; i++) { - // if (hasRole(msg.sender, roleNames[i])) { - // hasAnyRole = true; - // break; - // } - // } - - // require(hasAnyRole); - - // _; - // } -} diff --git a/contracts/ownership/rbac/RBACWithAdmin.sol b/contracts/ownership/rbac/RBACWithAdmin.sol deleted file mode 100644 index 90eb187a1..000000000 --- a/contracts/ownership/rbac/RBACWithAdmin.sol +++ /dev/null @@ -1,60 +0,0 @@ -pragma solidity ^0.4.21; - -import "./RBAC.sol"; - - -/** - * @title RBACWithAdmin - * @author Matt Condon (@Shrugs) - * @dev It's recommended that you define constants in the contract, - * @dev like ROLE_ADMIN below, to avoid typos. - */ -contract RBACWithAdmin is RBAC { - /** - * A constant role name for indicating admins. - */ - string public constant ROLE_ADMIN = "admin"; - - /** - * @dev modifier to scope access to admins - * // reverts - */ - modifier onlyAdmin() - { - checkRole(msg.sender, ROLE_ADMIN); - _; - } - - /** - * @dev constructor. Sets msg.sender as admin by default - */ - function RBACWithAdmin() - public - { - addRole(msg.sender, ROLE_ADMIN); - } - - /** - * @dev add a role to an address - * @param addr address - * @param roleName the name of the role - */ - function adminAddRole(address addr, string roleName) - onlyAdmin - public - { - addRole(addr, roleName); - } - - /** - * @dev remove a role from an address - * @param addr address - * @param roleName the name of the role - */ - function adminRemoveRole(address addr, string roleName) - onlyAdmin - public - { - removeRole(addr, roleName); - } -} diff --git a/contracts/ownership/rbac/Roles.sol b/contracts/ownership/rbac/Roles.sol deleted file mode 100644 index c9dbd73af..000000000 --- a/contracts/ownership/rbac/Roles.sol +++ /dev/null @@ -1,55 +0,0 @@ -pragma solidity ^0.4.21; - - -/** - * @title Roles - * @author Francisco Giordano (@frangio) - * @dev Library for managing addresses assigned to a Role. - * See RBAC.sol for example usage. - */ -library Roles { - struct Role { - mapping (address => bool) bearer; - } - - /** - * @dev give an address access to this role - */ - function add(Role storage role, address addr) - internal - { - role.bearer[addr] = true; - } - - /** - * @dev remove an address' access to this role - */ - function remove(Role storage role, address addr) - internal - { - role.bearer[addr] = false; - } - - /** - * @dev check if an address has this role - * // reverts - */ - function check(Role storage role, address addr) - view - internal - { - require(has(role, addr)); - } - - /** - * @dev check if an address has this role - * @return bool - */ - function has(Role storage role, address addr) - view - internal - returns (bool) - { - return role.bearer[addr]; - } -} diff --git a/contracts/payment/PullPayment.sol b/contracts/payment/PullPayment.sol deleted file mode 100644 index 030e971b3..000000000 --- a/contracts/payment/PullPayment.sol +++ /dev/null @@ -1,43 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../math/SafeMath.sol"; - - -/** - * @title PullPayment - * @dev Base contract supporting async send for pull payments. Inherit from this - * contract and use asyncSend instead of send or transfer. - */ -contract PullPayment { - using SafeMath for uint256; - - mapping(address => uint256) public payments; - uint256 public totalPayments; - - /** - * @dev Withdraw accumulated balance, called by payee. - */ - function withdrawPayments() public { - address payee = msg.sender; - uint256 payment = payments[payee]; - - require(payment != 0); - require(address(this).balance >= payment); - - totalPayments = totalPayments.sub(payment); - payments[payee] = 0; - - payee.transfer(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); - } -} diff --git a/contracts/payment/SplitPayment.sol b/contracts/payment/SplitPayment.sol deleted file mode 100644 index 019eba694..000000000 --- a/contracts/payment/SplitPayment.sol +++ /dev/null @@ -1,71 +0,0 @@ -pragma solidity ^0.4.21; - -import "../math/SafeMath.sol"; - - -/** - * @title SplitPayment - * @dev Base contract that supports multiple payees claiming funds sent to this contract - * according to the proportion they own. - */ -contract SplitPayment { - using SafeMath for uint256; - - uint256 public totalShares = 0; - uint256 public totalReleased = 0; - - mapping(address => uint256) public shares; - mapping(address => uint256) public released; - address[] public payees; - - /** - * @dev Constructor - */ - function SplitPayment(address[] _payees, uint256[] _shares) public payable { - require(_payees.length == _shares.length); - - for (uint256 i = 0; i < _payees.length; i++) { - addPayee(_payees[i], _shares[i]); - } - } - - /** - * @dev payable fallback - */ - function () public payable {} - - /** - * @dev Claim your share of the balance. - */ - function claim() public { - address payee = msg.sender; - - require(shares[payee] > 0); - - uint256 totalReceived = address(this).balance.add(totalReleased); - uint256 payment = totalReceived.mul(shares[payee]).div(totalShares).sub(released[payee]); - - require(payment != 0); - require(address(this).balance >= payment); - - released[payee] = released[payee].add(payment); - totalReleased = totalReleased.add(payment); - - payee.transfer(payment); - } - - /** - * @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 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); - } -} diff --git a/contracts/token/ERC20/CappedToken.sol b/contracts/token/ERC20/CappedToken.sol deleted file mode 100644 index 47cd4fb4d..000000000 --- a/contracts/token/ERC20/CappedToken.sol +++ /dev/null @@ -1,31 +0,0 @@ -pragma solidity ^0.4.21; - -import "./MintableToken.sol"; - - -/** - * @title Capped token - * @dev Mintable token with a token cap. - */ -contract CappedToken is MintableToken { - - uint256 public cap; - - function CappedToken(uint256 _cap) public { - require(_cap > 0); - cap = _cap; - } - - /** - * @dev Function to mint tokens - * @param _to The address that will receive the minted tokens. - * @param _amount The amount of tokens to mint. - * @return A boolean that indicates if the operation was successful. - */ - function mint(address _to, uint256 _amount) onlyOwner canMint public returns (bool) { - require(totalSupply_.add(_amount) <= cap); - - return super.mint(_to, _amount); - } - -} diff --git a/contracts/token/ERC721/DeprecatedERC721.sol b/contracts/token/ERC721/DeprecatedERC721.sol deleted file mode 100644 index fa9d9a3d3..000000000 --- a/contracts/token/ERC721/DeprecatedERC721.sol +++ /dev/null @@ -1,15 +0,0 @@ -pragma solidity ^0.4.21; - -import "./ERC721.sol"; - - -/** - * @title ERC-721 methods shipped in OpenZeppelin v1.7.0, removed in the latest version of the standard - * @dev Only use this interface for compatibility with previously deployed contracts - * @dev Use ERC721 for interacting with new contracts which are standard-compliant - */ -contract DeprecatedERC721 is ERC721 { - function takeOwnership(uint256 _tokenId) public; - function transfer(address _to, uint256 _tokenId) public; - function tokensOf(address _owner) public view returns (uint256[]); -} diff --git a/contracts/token/ERC827/ERC827.sol b/contracts/token/ERC827/ERC827.sol deleted file mode 100644 index a0ee18036..000000000 --- a/contracts/token/ERC827/ERC827.sol +++ /dev/null @@ -1,25 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../ERC20/ERC20.sol"; - - -/** - * @title ERC827 interface, an extension of ERC20 token standard - * - * @dev Interface of a ERC827 token, following the ERC20 standard with extra - * @dev methods to transfer value and data and execute calls in transfers and - * @dev approvals. - */ -contract ERC827 is ERC20 { - function approve(address _spender, uint256 _value, bytes _data) public returns (bool); - function transfer(address _to, uint256 _value, bytes _data) public returns (bool); - function transferFrom( - address _from, - address _to, - uint256 _value, - bytes _data - ) - public - returns (bool); -} diff --git a/contracts/token/ERC827/ERC827Token.sol b/contracts/token/ERC827/ERC827Token.sol deleted file mode 100644 index 28dbfceea..000000000 --- a/contracts/token/ERC827/ERC827Token.sol +++ /dev/null @@ -1,139 +0,0 @@ -/* solium-disable security/no-low-level-calls */ - -pragma solidity ^0.4.21; - -import "./ERC827.sol"; -import "../ERC20/StandardToken.sol"; - - -/** - * @title ERC827, an extension of ERC20 token standard - * - * @dev Implementation the ERC827, following the ERC20 standard with extra - * @dev methods to transfer value and data and execute calls in transfers and - * @dev approvals. - * - * @dev Uses OpenZeppelin StandardToken. - */ -contract ERC827Token is ERC827, StandardToken { - - /** - * @dev Addition to ERC20 token methods. It allows to - * @dev approve the transfer of value and execute a call with the sent data. - * - * @dev Beware that changing an allowance with this method brings the risk that - * @dev someone may use both the old and the new allowance by unfortunate - * @dev transaction ordering. One possible solution to mitigate this race condition - * @dev is to first reduce the spender's allowance to 0 and set the desired value - * @dev afterwards: - * @dev https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729 - * - * @param _spender The address that will spend the funds. - * @param _value The amount of tokens to be spent. - * @param _data ABI-encoded contract call to call `_to` address. - * - * @return true if the call function was executed successfully - */ - function approve(address _spender, uint256 _value, bytes _data) public returns (bool) { - require(_spender != address(this)); - - super.approve(_spender, _value); - - require(_spender.call(_data)); - - return true; - } - - /** - * @dev Addition to ERC20 token methods. Transfer tokens to a specified - * @dev address and execute a call with the sent data on the same transaction - * - * @param _to address The address which you want to transfer to - * @param _value uint256 the amout of tokens to be transfered - * @param _data ABI-encoded contract call to call `_to` address. - * - * @return true if the call function was executed successfully - */ - function transfer(address _to, uint256 _value, bytes _data) public returns (bool) { - require(_to != address(this)); - - super.transfer(_to, _value); - - require(_to.call(_data)); - return true; - } - - /** - * @dev Addition to ERC20 token methods. Transfer tokens from one address to - * @dev another and make a contract call on the same transaction - * - * @param _from The address which you want to send tokens from - * @param _to The address which you want to transfer to - * @param _value The amout of tokens to be transferred - * @param _data ABI-encoded contract call to call `_to` address. - * - * @return true if the call function was executed successfully - */ - function transferFrom( - address _from, - address _to, - uint256 _value, - bytes _data - ) - public returns (bool) - { - require(_to != address(this)); - - super.transferFrom(_from, _to, _value); - - require(_to.call(_data)); - return true; - } - - /** - * @dev Addition to StandardToken methods. Increase the amount of tokens that - * @dev an owner allowed to a spender and execute a call with the sent data. - * - * @dev approve should be called when allowed[_spender] == 0. To increment - * @dev allowed value is better to use this function to avoid 2 calls (and wait until - * @dev the first transaction is mined) - * @dev From MonolithDAO Token.sol - * - * @param _spender The address which will spend the funds. - * @param _addedValue The amount of tokens to increase the allowance by. - * @param _data ABI-encoded contract call to call `_spender` address. - */ - function increaseApproval(address _spender, uint _addedValue, bytes _data) public returns (bool) { - require(_spender != address(this)); - - super.increaseApproval(_spender, _addedValue); - - require(_spender.call(_data)); - - return true; - } - - /** - * @dev Addition to StandardToken methods. Decrease the amount of tokens that - * @dev an owner allowed to a spender and execute a call with the sent data. - * - * @dev approve should be called when allowed[_spender] == 0. To decrement - * @dev allowed value is better to use this function to avoid 2 calls (and wait until - * @dev the first transaction is mined) - * @dev From MonolithDAO Token.sol - * - * @param _spender The address which will spend the funds. - * @param _subtractedValue The amount of tokens to decrease the allowance by. - * @param _data ABI-encoded contract call to call `_spender` address. - */ - function decreaseApproval(address _spender, uint _subtractedValue, bytes _data) public returns (bool) { - require(_spender != address(this)); - - super.decreaseApproval(_spender, _subtractedValue); - - require(_spender.call(_data)); - - return true; - } - -} diff --git a/test/Bounty.test.js b/test/Bounty.test.js deleted file mode 100644 index b440f399c..000000000 --- a/test/Bounty.test.js +++ /dev/null @@ -1,111 +0,0 @@ - -let sendReward = function (sender, receiver, value) { - web3.eth.sendTransaction({ - from: sender, - to: receiver, - value: value, - }); -}; -var SecureTargetBounty = artifacts.require('SecureTargetBounty'); -var InsecureTargetBounty = artifacts.require('InsecureTargetBounty'); - -function awaitEvent (event, handler) { - return new Promise((resolve, reject) => { - function wrappedHandler (...args) { - Promise.resolve(handler(...args)).then(resolve).catch(reject); - } - - event.watch(wrappedHandler); - }); -} - -contract('Bounty', function (accounts) { - it('sets reward', async function () { - let owner = accounts[0]; - let reward = web3.toWei(1, 'ether'); - let bounty = await SecureTargetBounty.new(); - sendReward(owner, bounty.address, reward); - - assert.equal(reward, web3.eth.getBalance(bounty.address).toNumber()); - }); - - it('empties itself when destroyed', async function () { - let owner = accounts[0]; - let reward = web3.toWei(1, 'ether'); - let bounty = await SecureTargetBounty.new(); - sendReward(owner, bounty.address, reward); - - assert.equal(reward, web3.eth.getBalance(bounty.address).toNumber()); - - await bounty.destroy(); - assert.equal(0, web3.eth.getBalance(bounty.address).toNumber()); - }); - - describe('Against secure contract', function () { - it('cannot claim reward', async function () { - let owner = accounts[0]; - let researcher = accounts[1]; - let reward = web3.toWei(1, 'ether'); - let bounty = await SecureTargetBounty.new(); - let event = bounty.TargetCreated({}); - - let watcher = async function (err, result) { - event.stopWatching(); - if (err) { throw err; } - - var targetAddress = result.args.createdAddress; - sendReward(owner, bounty.address, reward); - - assert.equal(reward, - web3.eth.getBalance(bounty.address).toNumber()); - - try { - await bounty.claim(targetAddress, { from: researcher }); - assert.isTrue(false); // should never reach here - } catch (error) { - let reClaimedBounty = await bounty.claimed.call(); - assert.isFalse(reClaimedBounty); - } - try { - await bounty.withdrawPayments({ from: researcher }); - assert.isTrue(false); // should never reach here - } catch (err) { - assert.equal(reward, - web3.eth.getBalance(bounty.address).toNumber()); - } - }; - await bounty.createTarget({ from: researcher }); - await awaitEvent(event, watcher); - }); - }); - - describe('Against broken contract', function () { - it('claims reward', async function () { - let owner = accounts[0]; - let researcher = accounts[1]; - let reward = web3.toWei(1, 'ether'); - let bounty = await InsecureTargetBounty.new(); - let event = bounty.TargetCreated({}); - - let watcher = async function (err, result) { - event.stopWatching(); - if (err) { throw err; } - let targetAddress = result.args.createdAddress; - sendReward(owner, bounty.address, reward); - - assert.equal(reward, web3.eth.getBalance(bounty.address).toNumber()); - - await bounty.claim(targetAddress, { from: researcher }); - let claim = await bounty.claimed.call(); - - assert.isTrue(claim); - - await bounty.withdrawPayments({ from: researcher }); - - assert.equal(0, web3.eth.getBalance(bounty.address).toNumber()); - }; - await bounty.createTarget({ from: researcher }); - await awaitEvent(event, watcher); - }); - }); -}); diff --git a/test/DayLimit.test.js b/test/DayLimit.test.js deleted file mode 100644 index ab2aa903f..000000000 --- a/test/DayLimit.test.js +++ /dev/null @@ -1,88 +0,0 @@ - -import latestTime from './helpers/latestTime'; -import { increaseTimeTo, duration } from './helpers/increaseTime'; - -import assertRevert from './helpers/assertRevert'; - -const DayLimitMock = artifacts.require('DayLimitMock'); - -contract('DayLimit', function (accounts) { - let dayLimit; - let initLimit = 10; - - beforeEach(async function () { - this.startTime = latestTime(); - dayLimit = await DayLimitMock.new(initLimit); - }); - - it('should construct with the passed daily limit', async function () { - let dailyLimit = await dayLimit.dailyLimit(); - assert.equal(initLimit, dailyLimit); - }); - - it('should be able to spend if daily limit is not reached', async function () { - await dayLimit.attemptSpend(8); - let spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 8); - - await dayLimit.attemptSpend(2); - spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 10); - }); - - it('should prevent spending if daily limit is reached', async function () { - await dayLimit.attemptSpend(8); - let spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 8); - await assertRevert(dayLimit.attemptSpend(3)); - }); - - it('should allow spending if daily limit is reached and then set higher', async function () { - await dayLimit.attemptSpend(8); - let spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 8); - - await assertRevert(dayLimit.attemptSpend(3)); - spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 8); - - await dayLimit.setDailyLimit(15); - await dayLimit.attemptSpend(3); - spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 11); - }); - - it('should allow spending if daily limit is reached and then amount spent is reset', async function () { - await dayLimit.attemptSpend(8); - let spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 8); - - await assertRevert(dayLimit.attemptSpend(3)); - spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 8); - - await dayLimit.resetSpentToday(); - await dayLimit.attemptSpend(3); - spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 3); - }); - - it('should allow spending if daily limit is reached and then the next has come', async function () { - let limit = 10; - let dayLimit = await DayLimitMock.new(limit); - - await dayLimit.attemptSpend(8); - let spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 8); - - await assertRevert(dayLimit.attemptSpend(3)); - spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 8); - - await increaseTimeTo(this.startTime + duration.days(1)); - - await dayLimit.attemptSpend(3); - spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 3); - }); -}); diff --git a/test/Heritable.test.js b/test/Heritable.test.js deleted file mode 100644 index 2124a5279..000000000 --- a/test/Heritable.test.js +++ /dev/null @@ -1,136 +0,0 @@ -import increaseTime from './helpers/increaseTime'; -import expectThrow from './helpers/expectThrow'; -import assertRevert from './helpers/assertRevert'; - -const NULL_ADDRESS = '0x0000000000000000000000000000000000000000'; - -const Heritable = artifacts.require('Heritable'); - -contract('Heritable', function (accounts) { - let heritable; - let owner; - - beforeEach(async function () { - heritable = await Heritable.new(4141); - owner = await heritable.owner(); - }); - - it('should start off with an owner, but without heir', async function () { - const heir = await heritable.heir(); - - assert.equal(typeof (owner), 'string'); - assert.equal(typeof (heir), 'string'); - assert.notStrictEqual( - owner, NULL_ADDRESS, - 'Owner shouldn\'t be the null address' - ); - assert.isTrue( - heir === NULL_ADDRESS, - 'Heir should be the null address' - ); - }); - - it('only owner should set heir', async function () { - const newHeir = accounts[1]; - const someRandomAddress = accounts[2]; - assert.isTrue(owner !== someRandomAddress); - - await heritable.setHeir(newHeir, { from: owner }); - await expectThrow(heritable.setHeir(newHeir, { from: someRandomAddress })); - }); - - it('owner can\'t be heir', async function () { - await assertRevert(heritable.setHeir(owner, { from: owner })); - }); - - it('owner can remove heir', async function () { - const newHeir = accounts[1]; - await heritable.setHeir(newHeir, { from: owner }); - let heir = await heritable.heir(); - - assert.notStrictEqual(heir, NULL_ADDRESS); - await heritable.removeHeir(); - heir = await heritable.heir(); - assert.isTrue(heir === NULL_ADDRESS); - }); - - it('heir can claim ownership only if owner is dead and timeout was reached', async function () { - const heir = accounts[1]; - await heritable.setHeir(heir, { from: owner }); - await expectThrow(heritable.claimHeirOwnership({ from: heir })); - - await heritable.proclaimDeath({ from: heir }); - await increaseTime(1); - await expectThrow(heritable.claimHeirOwnership({ from: heir })); - - await increaseTime(4141); - await heritable.claimHeirOwnership({ from: heir }); - assert.isTrue(await heritable.heir() === heir); - }); - - it('only heir can proclaim death', async function () { - const someRandomAddress = accounts[2]; - await assertRevert(heritable.proclaimDeath({ from: owner })); - await assertRevert(heritable.proclaimDeath({ from: someRandomAddress })); - }); - - it('heir can\'t proclaim death if owner is death', async function () { - const heir = accounts[1]; - await heritable.setHeir(heir, { from: owner }); - await heritable.proclaimDeath({ from: heir }); - await assertRevert(heritable.proclaimDeath({ from: heir })); - }); - - it('heir can\'t claim ownership if owner heartbeats', async function () { - const heir = accounts[1]; - await heritable.setHeir(heir, { from: owner }); - - await heritable.proclaimDeath({ from: heir }); - await heritable.heartbeat({ from: owner }); - await expectThrow(heritable.claimHeirOwnership({ from: heir })); - - await heritable.proclaimDeath({ from: heir }); - await increaseTime(4141); - await heritable.heartbeat({ from: owner }); - await expectThrow(heritable.claimHeirOwnership({ from: heir })); - }); - - it('should log events appropriately', async function () { - const heir = accounts[1]; - - const setHeirLogs = (await heritable.setHeir(heir, { from: owner })).logs; - const setHeirEvent = setHeirLogs.find(e => e.event === 'HeirChanged'); - - assert.isTrue(setHeirEvent.args.owner === owner); - assert.isTrue(setHeirEvent.args.newHeir === heir); - - const heartbeatLogs = (await heritable.heartbeat({ from: owner })).logs; - const heartbeatEvent = heartbeatLogs.find(e => e.event === 'OwnerHeartbeated'); - - assert.isTrue(heartbeatEvent.args.owner === owner); - - const proclaimDeathLogs = (await heritable.proclaimDeath({ from: heir })).logs; - const ownerDeadEvent = proclaimDeathLogs.find(e => e.event === 'OwnerProclaimedDead'); - - assert.isTrue(ownerDeadEvent.args.owner === owner); - assert.isTrue(ownerDeadEvent.args.heir === heir); - - await increaseTime(4141); - const claimHeirOwnershipLogs = (await heritable.claimHeirOwnership({ from: heir })).logs; - const ownershipTransferredEvent = claimHeirOwnershipLogs.find(e => e.event === 'OwnershipTransferred'); - const heirOwnershipClaimedEvent = claimHeirOwnershipLogs.find(e => e.event === 'HeirOwnershipClaimed'); - - assert.isTrue(ownershipTransferredEvent.args.previousOwner === owner); - assert.isTrue(ownershipTransferredEvent.args.newOwner === heir); - assert.isTrue(heirOwnershipClaimedEvent.args.previousOwner === owner); - assert.isTrue(heirOwnershipClaimedEvent.args.newOwner === heir); - }); - - it('timeOfDeath can be queried', async function () { - assert.equal(await heritable.timeOfDeath(), 0); - }); - - it('heartbeatTimeout can be queried', async function () { - assert.equal(await heritable.heartbeatTimeout(), 4141); - }); -}); diff --git a/test/LimitBalance.test.js b/test/LimitBalance.test.js deleted file mode 100644 index 9df8b0dc8..000000000 --- a/test/LimitBalance.test.js +++ /dev/null @@ -1,47 +0,0 @@ -import assertRevert from './helpers/assertRevert'; -var LimitBalanceMock = artifacts.require('LimitBalanceMock'); - -contract('LimitBalance', function (accounts) { - let lb; - - beforeEach(async function () { - lb = await LimitBalanceMock.new(); - }); - - let LIMIT = 1000; - - it('should expose limit', async function () { - let limit = await lb.limit(); - assert.equal(limit, LIMIT); - }); - - it('should allow sending below limit', async function () { - let amount = 1; - await lb.limitedDeposit({ value: amount }); - - assert.equal(web3.eth.getBalance(lb.address), amount); - }); - - it('shouldnt allow sending above limit', async function () { - let amount = 1110; - await assertRevert(lb.limitedDeposit({ value: amount })); - }); - - it('should allow multiple sends below limit', async function () { - let amount = 500; - await lb.limitedDeposit({ value: amount }); - - assert.equal(web3.eth.getBalance(lb.address), amount); - - await lb.limitedDeposit({ value: amount }); - assert.equal(web3.eth.getBalance(lb.address), amount * 2); - }); - - it('shouldnt allow multiple sends above limit', async function () { - let amount = 500; - await lb.limitedDeposit({ value: amount }); - - assert.equal(web3.eth.getBalance(lb.address), amount); - await assertRevert(lb.limitedDeposit({ value: amount + 1 })); - }); -}); diff --git a/test/ReentrancyGuard.test.js b/test/ReentrancyGuard.test.js deleted file mode 100644 index 0e32cf369..000000000 --- a/test/ReentrancyGuard.test.js +++ /dev/null @@ -1,31 +0,0 @@ - -import expectThrow from './helpers/expectThrow'; -const ReentrancyMock = artifacts.require('ReentrancyMock'); -const ReentrancyAttack = artifacts.require('ReentrancyAttack'); - -contract('ReentrancyGuard', function (accounts) { - let reentrancyMock; - - beforeEach(async function () { - reentrancyMock = await ReentrancyMock.new(); - let initialCounter = await reentrancyMock.counter(); - assert.equal(initialCounter, 0); - }); - - it('should not allow remote callback', async function () { - let attacker = await ReentrancyAttack.new(); - await expectThrow(reentrancyMock.countAndCall(attacker.address)); - }); - - // The following are more side-effects than intended behaviour: - // I put them here as documentation, and to monitor any changes - // in the side-effects. - - it('should not allow local recursion', async function () { - await expectThrow(reentrancyMock.countLocalRecursive(10)); - }); - - it('should not allow indirect local recursion', async function () { - await expectThrow(reentrancyMock.countThisRecursive(10)); - }); -}); diff --git a/test/SimpleSavingsWallet.test.js b/test/SimpleSavingsWallet.test.js deleted file mode 100644 index 07787c2de..000000000 --- a/test/SimpleSavingsWallet.test.js +++ /dev/null @@ -1,33 +0,0 @@ - -import expectThrow from './helpers/expectThrow'; - -const SimpleSavingsWallet = artifacts.require('SimpleSavingsWallet'); - -contract('SimpleSavingsWallet', function (accounts) { - let savingsWallet; - let owner; - - const paymentAmount = 4242; - - beforeEach(async function () { - savingsWallet = await SimpleSavingsWallet.new(4141); - owner = await savingsWallet.owner(); - }); - - it('should receive funds', async function () { - await web3.eth.sendTransaction({ from: owner, to: savingsWallet.address, value: paymentAmount }); - assert.isTrue((new web3.BigNumber(paymentAmount)).equals(web3.eth.getBalance(savingsWallet.address))); - }); - - it('owner can send funds', async function () { - // Receive payment so we have some money to spend. - await web3.eth.sendTransaction({ from: accounts[9], to: savingsWallet.address, value: 1000000 }); - await expectThrow(savingsWallet.sendTo(0, paymentAmount, { from: owner })); - await expectThrow(savingsWallet.sendTo(savingsWallet.address, paymentAmount, { from: owner })); - await expectThrow(savingsWallet.sendTo(accounts[1], 0, { from: owner })); - - const balance = web3.eth.getBalance(accounts[1]); - await savingsWallet.sendTo(accounts[1], paymentAmount, { from: owner }); - assert.isTrue(balance.plus(paymentAmount).equals(web3.eth.getBalance(accounts[1]))); - }); -}); diff --git a/test/access/SignatureBouncer.test.js b/test/access/SignatureBouncer.test.js deleted file mode 100644 index 472a41226..000000000 --- a/test/access/SignatureBouncer.test.js +++ /dev/null @@ -1,119 +0,0 @@ - -import assertRevert from '../helpers/assertRevert'; -import { signHex } from '../helpers/sign'; - -const Bouncer = artifacts.require('SignatureBouncerMock'); - -require('chai') - .use(require('chai-as-promised')) - .should(); - -export const getSigner = (contract, signer, data = '') => (addr) => { - // via: https://github.com/OpenZeppelin/zeppelin-solidity/pull/812/files - const message = contract.address.substr(2) + addr.substr(2) + data; - // ^ substr to remove `0x` because in solidity the address is a set of byes, not a string `0xabcd` - return signHex(signer, message); -}; - -contract('Bouncer', ([_, owner, authorizedUser, anyone, bouncerAddress, newBouncer]) => { - before(async function () { - this.bouncer = await Bouncer.new({ from: owner }); - this.roleBouncer = await this.bouncer.ROLE_BOUNCER(); - this.genSig = getSigner(this.bouncer, bouncerAddress); - }); - - it('should have a default owner of self', async function () { - const theOwner = await this.bouncer.owner(); - theOwner.should.eq(owner); - }); - - it('should allow owner to add a bouncer', async function () { - await this.bouncer.addBouncer(bouncerAddress, { from: owner }); - const hasRole = await this.bouncer.hasRole(bouncerAddress, this.roleBouncer); - hasRole.should.eq(true); - }); - - it('should not allow anyone to add a bouncer', async function () { - await assertRevert( - this.bouncer.addBouncer(bouncerAddress, { from: anyone }) - ); - }); - - context('modifiers', () => { - it('should allow valid signature for sender', async function () { - await this.bouncer.onlyWithValidSignature( - this.genSig(authorizedUser), - { from: authorizedUser } - ); - }); - it('should not allow invalid signature for sender', async function () { - await assertRevert( - this.bouncer.onlyWithValidSignature( - 'abcd', - { from: authorizedUser } - ) - ); - }); - }); - - context('signatures', () => { - it('should accept valid message for valid user', async function () { - const isValid = await this.bouncer.checkValidSignature( - authorizedUser, - this.genSig(authorizedUser) - ); - isValid.should.eq(true); - }); - it('should not accept invalid message for valid user', async function () { - const isValid = await this.bouncer.checkValidSignature( - authorizedUser, - this.genSig(anyone) - ); - isValid.should.eq(false); - }); - it('should not accept invalid message for invalid user', async function () { - const isValid = await this.bouncer.checkValidSignature( - anyone, - 'abcd' - ); - isValid.should.eq(false); - }); - it('should not accept valid message for invalid user', async function () { - const isValid = await this.bouncer.checkValidSignature( - anyone, - this.genSig(authorizedUser) - ); - isValid.should.eq(false); - }); - }); - - context('management', () => { - it('should not allow anyone to add bouncers', async function () { - await assertRevert( - this.bouncer.addBouncer(newBouncer, { from: anyone }) - ); - }); - - it('should be able to add bouncers', async function () { - await this.bouncer.addBouncer(newBouncer, { from: owner }) - .should.be.fulfilled; - }); - - it('should not allow adding invalid address', async function () { - await assertRevert( - this.bouncer.addBouncer('0x0', { from: owner }) - ); - }); - - it('should not allow anyone to remove bouncer', async function () { - await assertRevert( - this.bouncer.removeBouncer(newBouncer, { from: anyone }) - ); - }); - - it('should be able to remove bouncers', async function () { - await this.bouncer.removeBouncer(newBouncer, { from: owner }) - .should.be.fulfilled; - }); - }); -}); diff --git a/test/crowdsale/AllowanceCrowdsale.test.js b/test/crowdsale/AllowanceCrowdsale.test.js deleted file mode 100644 index 44799010a..000000000 --- a/test/crowdsale/AllowanceCrowdsale.test.js +++ /dev/null @@ -1,77 +0,0 @@ -import ether from '../helpers/ether'; -import assertRevert from '../helpers/assertRevert'; - -const BigNumber = web3.BigNumber; - -const should = require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const AllowanceCrowdsale = artifacts.require('AllowanceCrowdsaleImpl'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('AllowanceCrowdsale', function ([_, investor, wallet, purchaser, tokenWallet]) { - const rate = new BigNumber(1); - const value = ether(0.42); - const expectedTokenAmount = rate.mul(value); - const tokenAllowance = new BigNumber('1e22'); - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; - - beforeEach(async function () { - this.token = await SimpleToken.new({ from: tokenWallet }); - this.crowdsale = await AllowanceCrowdsale.new(rate, wallet, this.token.address, tokenWallet); - await this.token.approve(this.crowdsale.address, tokenAllowance, { from: tokenWallet }); - }); - - describe('accepting payments', function () { - it('should accept sends', async function () { - await this.crowdsale.send(value).should.be.fulfilled; - }); - - it('should accept payments', async function () { - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }).should.be.fulfilled; - }); - }); - - describe('high-level purchase', function () { - it('should log purchase', async function () { - const { logs } = await this.crowdsale.sendTransaction({ value: value, from: investor }); - const event = logs.find(e => e.event === 'TokenPurchase'); - should.exist(event); - event.args.purchaser.should.equal(investor); - event.args.beneficiary.should.equal(investor); - event.args.value.should.be.bignumber.equal(value); - event.args.amount.should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should assign tokens to sender', async function () { - await this.crowdsale.sendTransaction({ value: value, from: investor }); - let balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should forward funds to wallet', async function () { - const pre = web3.eth.getBalance(wallet); - await this.crowdsale.sendTransaction({ value, from: investor }); - const post = web3.eth.getBalance(wallet); - post.minus(pre).should.be.bignumber.equal(value); - }); - }); - - describe('check remaining allowance', function () { - it('should report correct allowace left', async function () { - let remainingAllowance = tokenAllowance - expectedTokenAmount; - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }); - let tokensRemaining = await this.crowdsale.remainingTokens(); - tokensRemaining.should.be.bignumber.equal(remainingAllowance); - }); - }); - - describe('when token wallet is different from token address', function () { - it('creation reverts', async function () { - this.token = await SimpleToken.new({ from: tokenWallet }); - await assertRevert(AllowanceCrowdsale.new(rate, wallet, this.token.address, ZERO_ADDRESS)); - }); - }); -}); diff --git a/test/crowdsale/CappedCrowdsale.test.js b/test/crowdsale/CappedCrowdsale.test.js deleted file mode 100644 index a3dd9660f..000000000 --- a/test/crowdsale/CappedCrowdsale.test.js +++ /dev/null @@ -1,69 +0,0 @@ -import ether from '../helpers/ether'; -import EVMRevert from '../helpers/EVMRevert'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const CappedCrowdsale = artifacts.require('CappedCrowdsaleImpl'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('CappedCrowdsale', function ([_, wallet]) { - const rate = new BigNumber(1); - const cap = ether(100); - const lessThanCap = ether(60); - const tokenSupply = new BigNumber('1e22'); - - beforeEach(async function () { - this.token = await SimpleToken.new(); - this.crowdsale = await CappedCrowdsale.new(rate, wallet, this.token.address, cap); - await this.token.transfer(this.crowdsale.address, tokenSupply); - }); - - describe('creating a valid crowdsale', function () { - it('should fail with zero cap', async function () { - await CappedCrowdsale.new(rate, wallet, 0, this.token.address).should.be.rejectedWith(EVMRevert); - }); - }); - - describe('accepting payments', function () { - it('should accept payments within cap', async function () { - await this.crowdsale.send(cap.minus(lessThanCap)).should.be.fulfilled; - await this.crowdsale.send(lessThanCap).should.be.fulfilled; - }); - - it('should reject payments outside cap', async function () { - await this.crowdsale.send(cap); - await this.crowdsale.send(1).should.be.rejectedWith(EVMRevert); - }); - - it('should reject payments that exceed cap', async function () { - await this.crowdsale.send(cap.plus(1)).should.be.rejectedWith(EVMRevert); - }); - }); - - describe('ending', function () { - it('should not reach cap if sent under cap', async function () { - let capReached = await this.crowdsale.capReached(); - capReached.should.equal(false); - await this.crowdsale.send(lessThanCap); - capReached = await this.crowdsale.capReached(); - capReached.should.equal(false); - }); - - it('should not reach cap if sent just under cap', async function () { - await this.crowdsale.send(cap.minus(1)); - let capReached = await this.crowdsale.capReached(); - capReached.should.equal(false); - }); - - it('should reach cap if cap sent', async function () { - await this.crowdsale.send(cap); - let capReached = await this.crowdsale.capReached(); - capReached.should.equal(true); - }); - }); -}); diff --git a/test/crowdsale/Crowdsale.test.js b/test/crowdsale/Crowdsale.test.js deleted file mode 100644 index 4053dca37..000000000 --- a/test/crowdsale/Crowdsale.test.js +++ /dev/null @@ -1,81 +0,0 @@ -import ether from '../helpers/ether'; - -const BigNumber = web3.BigNumber; - -const should = require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const Crowdsale = artifacts.require('Crowdsale'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('Crowdsale', function ([_, investor, wallet, purchaser]) { - const rate = new BigNumber(1); - const value = ether(42); - const tokenSupply = new BigNumber('1e22'); - const expectedTokenAmount = rate.mul(value); - - beforeEach(async function () { - this.token = await SimpleToken.new(); - this.crowdsale = await Crowdsale.new(rate, wallet, this.token.address); - await this.token.transfer(this.crowdsale.address, tokenSupply); - }); - - describe('accepting payments', function () { - it('should accept payments', async function () { - await this.crowdsale.send(value).should.be.fulfilled; - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }).should.be.fulfilled; - }); - }); - - describe('high-level purchase', function () { - it('should log purchase', async function () { - const { logs } = await this.crowdsale.sendTransaction({ value: value, from: investor }); - const event = logs.find(e => e.event === 'TokenPurchase'); - should.exist(event); - event.args.purchaser.should.equal(investor); - event.args.beneficiary.should.equal(investor); - event.args.value.should.be.bignumber.equal(value); - event.args.amount.should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should assign tokens to sender', async function () { - await this.crowdsale.sendTransaction({ value: value, from: investor }); - let balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should forward funds to wallet', async function () { - const pre = web3.eth.getBalance(wallet); - await this.crowdsale.sendTransaction({ value, from: investor }); - const post = web3.eth.getBalance(wallet); - post.minus(pre).should.be.bignumber.equal(value); - }); - }); - - describe('low-level purchase', function () { - it('should log purchase', async function () { - const { logs } = await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }); - const event = logs.find(e => e.event === 'TokenPurchase'); - should.exist(event); - event.args.purchaser.should.equal(purchaser); - event.args.beneficiary.should.equal(investor); - event.args.value.should.be.bignumber.equal(value); - event.args.amount.should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should assign tokens to beneficiary', async function () { - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - const balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should forward funds to wallet', async function () { - const pre = web3.eth.getBalance(wallet); - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - const post = web3.eth.getBalance(wallet); - post.minus(pre).should.be.bignumber.equal(value); - }); - }); -}); diff --git a/test/crowdsale/FinalizableCrowdsale.test.js b/test/crowdsale/FinalizableCrowdsale.test.js deleted file mode 100644 index 9a6c16a6f..000000000 --- a/test/crowdsale/FinalizableCrowdsale.test.js +++ /dev/null @@ -1,62 +0,0 @@ -import { advanceBlock } from '../helpers/advanceToBlock'; -import { increaseTimeTo, duration } from '../helpers/increaseTime'; -import latestTime from '../helpers/latestTime'; -import EVMRevert from '../helpers/EVMRevert'; - -const BigNumber = web3.BigNumber; - -const should = require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const FinalizableCrowdsale = artifacts.require('FinalizableCrowdsaleImpl'); -const MintableToken = artifacts.require('MintableToken'); - -contract('FinalizableCrowdsale', function ([_, owner, wallet, thirdparty]) { - const rate = new BigNumber(1000); - - before(async function () { - // Advance to the next block to correctly read time in the solidity "now" function interpreted by ganache - await advanceBlock(); - }); - - beforeEach(async function () { - this.openingTime = latestTime() + duration.weeks(1); - this.closingTime = this.openingTime + duration.weeks(1); - this.afterClosingTime = this.closingTime + duration.seconds(1); - - this.token = await MintableToken.new(); - this.crowdsale = await FinalizableCrowdsale.new( - this.openingTime, this.closingTime, rate, wallet, this.token.address, { from: owner } - ); - await this.token.transferOwnership(this.crowdsale.address); - }); - - it('cannot be finalized before ending', async function () { - await this.crowdsale.finalize({ from: owner }).should.be.rejectedWith(EVMRevert); - }); - - it('cannot be finalized by third party after ending', async function () { - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.finalize({ from: thirdparty }).should.be.rejectedWith(EVMRevert); - }); - - it('can be finalized by owner after ending', async function () { - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.finalize({ from: owner }).should.be.fulfilled; - }); - - it('cannot be finalized twice', async function () { - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.finalize({ from: owner }); - await this.crowdsale.finalize({ from: owner }).should.be.rejectedWith(EVMRevert); - }); - - it('logs finalized', async function () { - await increaseTimeTo(this.afterClosingTime); - const { logs } = await this.crowdsale.finalize({ from: owner }); - const event = logs.find(e => e.event === 'Finalized'); - should.exist(event); - }); -}); diff --git a/test/crowdsale/IncreasingPriceCrowdsale.test.js b/test/crowdsale/IncreasingPriceCrowdsale.test.js deleted file mode 100644 index 76f82ab02..000000000 --- a/test/crowdsale/IncreasingPriceCrowdsale.test.js +++ /dev/null @@ -1,92 +0,0 @@ -import ether from '../helpers/ether'; -import { advanceBlock } from '../helpers/advanceToBlock'; -import { increaseTimeTo, duration } from '../helpers/increaseTime'; -import latestTime from '../helpers/latestTime'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const IncreasingPriceCrowdsale = artifacts.require('IncreasingPriceCrowdsaleImpl'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('IncreasingPriceCrowdsale', function ([_, investor, wallet, purchaser]) { - const value = ether(1); - const tokenSupply = new BigNumber('1e22'); - - describe('rate during crowdsale should change at a fixed step every block', async function () { - let balance; - const initialRate = new BigNumber(9166); - const finalRate = new BigNumber(5500); - const rateAtTime150 = new BigNumber(9166); - const rateAtTime300 = new BigNumber(9165); - const rateAtTime1500 = new BigNumber(9157); - const rateAtTime30 = new BigNumber(9166); - const rateAtTime150000 = new BigNumber(8257); - const rateAtTime450000 = new BigNumber(6439); - - beforeEach(async function () { - await advanceBlock(); - this.startTime = latestTime() + duration.weeks(1); - this.closingTime = this.startTime + duration.weeks(1); - this.afterClosingTime = this.closingTime + duration.seconds(1); - this.token = await SimpleToken.new(); - this.crowdsale = await IncreasingPriceCrowdsale.new( - this.startTime, this.closingTime, wallet, this.token.address, initialRate, finalRate - ); - await this.token.transfer(this.crowdsale.address, tokenSupply); - }); - - it('at start', async function () { - await increaseTimeTo(this.startTime); - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(value.mul(initialRate)); - }); - - it('at time 150', async function () { - await increaseTimeTo(this.startTime + 150); - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(value.mul(rateAtTime150)); - }); - - it('at time 300', async function () { - await increaseTimeTo(this.startTime + 300); - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(value.mul(rateAtTime300)); - }); - - it('at time 1500', async function () { - await increaseTimeTo(this.startTime + 1500); - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(value.mul(rateAtTime1500)); - }); - - it('at time 30', async function () { - await increaseTimeTo(this.startTime + 30); - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(value.mul(rateAtTime30)); - }); - - it('at time 150000', async function () { - await increaseTimeTo(this.startTime + 150000); - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(value.mul(rateAtTime150000)); - }); - - it('at time 450000', async function () { - await increaseTimeTo(this.startTime + 450000); - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(value.mul(rateAtTime450000)); - }); - }); -}); diff --git a/test/crowdsale/IndividuallyCappedCrowdsale.test.js b/test/crowdsale/IndividuallyCappedCrowdsale.test.js deleted file mode 100644 index e8585ad6d..000000000 --- a/test/crowdsale/IndividuallyCappedCrowdsale.test.js +++ /dev/null @@ -1,107 +0,0 @@ -import ether from '../helpers/ether'; -import EVMRevert from '../helpers/EVMRevert'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const CappedCrowdsale = artifacts.require('IndividuallyCappedCrowdsaleImpl'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('IndividuallyCappedCrowdsale', function ([_, wallet, alice, bob, charlie]) { - const rate = new BigNumber(1); - const capAlice = ether(10); - const capBob = ether(2); - const lessThanCapAlice = ether(6); - const lessThanCapBoth = ether(1); - const tokenSupply = new BigNumber('1e22'); - - describe('individual capping', function () { - beforeEach(async function () { - this.token = await SimpleToken.new(); - this.crowdsale = await CappedCrowdsale.new(rate, wallet, this.token.address); - await this.crowdsale.setUserCap(alice, capAlice); - await this.crowdsale.setUserCap(bob, capBob); - await this.token.transfer(this.crowdsale.address, tokenSupply); - }); - - describe('accepting payments', function () { - it('should accept payments within cap', async function () { - await this.crowdsale.buyTokens(alice, { value: lessThanCapAlice }).should.be.fulfilled; - await this.crowdsale.buyTokens(bob, { value: lessThanCapBoth }).should.be.fulfilled; - }); - - it('should reject payments outside cap', async function () { - await this.crowdsale.buyTokens(alice, { value: capAlice }); - await this.crowdsale.buyTokens(alice, { value: 1 }).should.be.rejectedWith(EVMRevert); - }); - - it('should reject payments that exceed cap', async function () { - await this.crowdsale.buyTokens(alice, { value: capAlice.plus(1) }).should.be.rejectedWith(EVMRevert); - await this.crowdsale.buyTokens(bob, { value: capBob.plus(1) }).should.be.rejectedWith(EVMRevert); - }); - - it('should manage independent caps', async function () { - await this.crowdsale.buyTokens(alice, { value: lessThanCapAlice }).should.be.fulfilled; - await this.crowdsale.buyTokens(bob, { value: lessThanCapAlice }).should.be.rejectedWith(EVMRevert); - }); - - it('should default to a cap of zero', async function () { - await this.crowdsale.buyTokens(charlie, { value: lessThanCapBoth }).should.be.rejectedWith(EVMRevert); - }); - }); - - describe('reporting state', function () { - it('should report correct cap', async function () { - let retrievedCap = await this.crowdsale.getUserCap(alice); - retrievedCap.should.be.bignumber.equal(capAlice); - }); - - it('should report actual contribution', async function () { - await this.crowdsale.buyTokens(alice, { value: lessThanCapAlice }); - let retrievedContribution = await this.crowdsale.getUserContribution(alice); - retrievedContribution.should.be.bignumber.equal(lessThanCapAlice); - }); - }); - }); - - describe('group capping', function () { - beforeEach(async function () { - this.token = await SimpleToken.new(); - this.crowdsale = await CappedCrowdsale.new(rate, wallet, this.token.address); - await this.crowdsale.setGroupCap([bob, charlie], capBob); - await this.token.transfer(this.crowdsale.address, tokenSupply); - }); - - describe('accepting payments', function () { - it('should accept payments within cap', async function () { - await this.crowdsale.buyTokens(bob, { value: lessThanCapBoth }).should.be.fulfilled; - await this.crowdsale.buyTokens(charlie, { value: lessThanCapBoth }).should.be.fulfilled; - }); - - it('should reject payments outside cap', async function () { - await this.crowdsale.buyTokens(bob, { value: capBob }); - await this.crowdsale.buyTokens(bob, { value: 1 }).should.be.rejectedWith(EVMRevert); - await this.crowdsale.buyTokens(charlie, { value: capBob }); - await this.crowdsale.buyTokens(charlie, { value: 1 }).should.be.rejectedWith(EVMRevert); - }); - - it('should reject payments that exceed cap', async function () { - await this.crowdsale.buyTokens(bob, { value: capBob.plus(1) }).should.be.rejectedWith(EVMRevert); - await this.crowdsale.buyTokens(charlie, { value: capBob.plus(1) }).should.be.rejectedWith(EVMRevert); - }); - }); - - describe('reporting state', function () { - it('should report correct cap', async function () { - let retrievedCapBob = await this.crowdsale.getUserCap(bob); - retrievedCapBob.should.be.bignumber.equal(capBob); - let retrievedCapCharlie = await this.crowdsale.getUserCap(charlie); - retrievedCapCharlie.should.be.bignumber.equal(capBob); - }); - }); - }); -}); diff --git a/test/crowdsale/MintedCrowdsale.test.js b/test/crowdsale/MintedCrowdsale.test.js deleted file mode 100644 index 362dc23af..000000000 --- a/test/crowdsale/MintedCrowdsale.test.js +++ /dev/null @@ -1,61 +0,0 @@ -import ether from '../helpers/ether'; - -const BigNumber = web3.BigNumber; - -const should = require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const MintedCrowdsale = artifacts.require('MintedCrowdsaleImpl'); -const MintableToken = artifacts.require('MintableToken'); - -contract('MintedCrowdsale', function ([_, investor, wallet, purchaser]) { - const rate = new BigNumber(1000); - const value = ether(42); - - const expectedTokenAmount = rate.mul(value); - - beforeEach(async function () { - this.token = await MintableToken.new(); - this.crowdsale = await MintedCrowdsale.new(rate, wallet, this.token.address); - await this.token.transferOwnership(this.crowdsale.address); - }); - - describe('accepting payments', function () { - it('should be token owner', async function () { - const owner = await this.token.owner(); - owner.should.equal(this.crowdsale.address); - }); - - it('should accept payments', async function () { - await this.crowdsale.send(value).should.be.fulfilled; - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }).should.be.fulfilled; - }); - }); - - describe('high-level purchase', function () { - it('should log purchase', async function () { - const { logs } = await this.crowdsale.sendTransaction({ value: value, from: investor }); - const event = logs.find(e => e.event === 'TokenPurchase'); - should.exist(event); - event.args.purchaser.should.equal(investor); - event.args.beneficiary.should.equal(investor); - event.args.value.should.be.bignumber.equal(value); - event.args.amount.should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should assign tokens to sender', async function () { - await this.crowdsale.sendTransaction({ value: value, from: investor }); - let balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should forward funds to wallet', async function () { - const pre = web3.eth.getBalance(wallet); - await this.crowdsale.sendTransaction({ value, from: investor }); - const post = web3.eth.getBalance(wallet); - post.minus(pre).should.be.bignumber.equal(value); - }); - }); -}); diff --git a/test/crowdsale/PostDeliveryCrowdsale.test.js b/test/crowdsale/PostDeliveryCrowdsale.test.js deleted file mode 100644 index 1860a8dea..000000000 --- a/test/crowdsale/PostDeliveryCrowdsale.test.js +++ /dev/null @@ -1,67 +0,0 @@ -import { advanceBlock } from '../helpers/advanceToBlock'; -import { increaseTimeTo, duration } from '../helpers/increaseTime'; -import latestTime from '../helpers/latestTime'; -import EVMRevert from '../helpers/EVMRevert'; -import ether from '../helpers/ether'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const PostDeliveryCrowdsale = artifacts.require('PostDeliveryCrowdsaleImpl'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('PostDeliveryCrowdsale', function ([_, investor, wallet, purchaser]) { - const rate = new BigNumber(1); - const value = ether(42); - const tokenSupply = new BigNumber('1e22'); - - before(async function () { - // Advance to the next block to correctly read time in the solidity "now" function interpreted by ganache - await advanceBlock(); - }); - - beforeEach(async function () { - this.openingTime = latestTime() + duration.weeks(1); - this.closingTime = this.openingTime + duration.weeks(1); - this.beforeEndTime = this.closingTime - duration.hours(1); - this.afterClosingTime = this.closingTime + duration.seconds(1); - this.token = await SimpleToken.new(); - this.crowdsale = await PostDeliveryCrowdsale.new( - this.openingTime, this.closingTime, rate, wallet, this.token.address - ); - await this.token.transfer(this.crowdsale.address, tokenSupply); - }); - - it('should not immediately assign tokens to beneficiary', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }); - const balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(0); - }); - - it('should not allow beneficiaries to withdraw tokens before crowdsale ends', async function () { - await increaseTimeTo(this.beforeEndTime); - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }); - await this.crowdsale.withdrawTokens({ from: investor }).should.be.rejectedWith(EVMRevert); - }); - - it('should allow beneficiaries to withdraw tokens after crowdsale ends', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }); - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.withdrawTokens({ from: investor }).should.be.fulfilled; - }); - - it('should return the amount of tokens bought', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }); - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.withdrawTokens({ from: investor }); - const balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(value); - }); -}); diff --git a/test/crowdsale/RefundVault.test.js b/test/crowdsale/RefundVault.test.js deleted file mode 100644 index e3b88dfce..000000000 --- a/test/crowdsale/RefundVault.test.js +++ /dev/null @@ -1,59 +0,0 @@ -import ether from '../helpers/ether'; -import EVMRevert from '../helpers/EVMRevert'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const RefundVault = artifacts.require('RefundVault'); - -contract('RefundVault', function ([_, owner, wallet, investor]) { - const value = ether(42); - - beforeEach(async function () { - this.vault = await RefundVault.new(wallet, { from: owner }); - }); - - it('should accept contributions', async function () { - await this.vault.deposit(investor, { value, from: owner }).should.be.fulfilled; - }); - - it('should not refund contribution during active state', async function () { - await this.vault.deposit(investor, { value, from: owner }); - await this.vault.refund(investor).should.be.rejectedWith(EVMRevert); - }); - - it('only owner can enter refund mode', async function () { - await this.vault.enableRefunds({ from: _ }).should.be.rejectedWith(EVMRevert); - await this.vault.enableRefunds({ from: owner }).should.be.fulfilled; - }); - - it('should refund contribution after entering refund mode', async function () { - await this.vault.deposit(investor, { value, from: owner }); - await this.vault.enableRefunds({ from: owner }); - - const pre = web3.eth.getBalance(investor); - await this.vault.refund(investor); - const post = web3.eth.getBalance(investor); - - post.minus(pre).should.be.bignumber.equal(value); - }); - - it('only owner can close', async function () { - await this.vault.close({ from: _ }).should.be.rejectedWith(EVMRevert); - await this.vault.close({ from: owner }).should.be.fulfilled; - }); - - it('should forward funds to wallet after closing', async function () { - await this.vault.deposit(investor, { value, from: owner }); - - const pre = web3.eth.getBalance(wallet); - await this.vault.close({ from: owner }); - const post = web3.eth.getBalance(wallet); - - post.minus(pre).should.be.bignumber.equal(value); - }); -}); diff --git a/test/crowdsale/RefundableCrowdsale.test.js b/test/crowdsale/RefundableCrowdsale.test.js deleted file mode 100644 index 551e65c98..000000000 --- a/test/crowdsale/RefundableCrowdsale.test.js +++ /dev/null @@ -1,82 +0,0 @@ -import ether from '../helpers/ether'; -import { advanceBlock } from '../helpers/advanceToBlock'; -import { increaseTimeTo, duration } from '../helpers/increaseTime'; -import latestTime from '../helpers/latestTime'; -import EVMRevert from '../helpers/EVMRevert'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const RefundableCrowdsale = artifacts.require('RefundableCrowdsaleImpl'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('RefundableCrowdsale', function ([_, owner, wallet, investor, purchaser]) { - const rate = new BigNumber(1); - const goal = ether(50); - const lessThanGoal = ether(45); - const tokenSupply = new BigNumber('1e22'); - - before(async function () { - // Advance to the next block to correctly read time in the solidity "now" function interpreted by ganache - await advanceBlock(); - }); - - beforeEach(async function () { - this.openingTime = latestTime() + duration.weeks(1); - this.closingTime = this.openingTime + duration.weeks(1); - this.afterClosingTime = this.closingTime + duration.seconds(1); - - this.token = await SimpleToken.new(); - this.crowdsale = await RefundableCrowdsale.new( - this.openingTime, this.closingTime, rate, wallet, this.token.address, goal, { from: owner } - ); - await this.token.transfer(this.crowdsale.address, tokenSupply); - }); - - describe('creating a valid crowdsale', function () { - it('should fail with zero goal', async function () { - await RefundableCrowdsale.new( - this.openingTime, this.closingTime, rate, wallet, this.token.address, 0, { from: owner } - ).should.be.rejectedWith(EVMRevert); - }); - }); - - it('should deny refunds before end', async function () { - await this.crowdsale.claimRefund({ from: investor }).should.be.rejectedWith(EVMRevert); - await increaseTimeTo(this.openingTime); - await this.crowdsale.claimRefund({ from: investor }).should.be.rejectedWith(EVMRevert); - }); - - it('should deny refunds after end if goal was reached', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.sendTransaction({ value: goal, from: investor }); - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.claimRefund({ from: investor }).should.be.rejectedWith(EVMRevert); - }); - - it('should allow refunds after end if goal was not reached', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.sendTransaction({ value: lessThanGoal, from: investor }); - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.finalize({ from: owner }); - const pre = web3.eth.getBalance(investor); - await this.crowdsale.claimRefund({ from: investor, gasPrice: 0 }) - .should.be.fulfilled; - const post = web3.eth.getBalance(investor); - post.minus(pre).should.be.bignumber.equal(lessThanGoal); - }); - - it('should forward funds to wallet after end if goal was reached', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.sendTransaction({ value: goal, from: investor }); - await increaseTimeTo(this.afterClosingTime); - const pre = web3.eth.getBalance(wallet); - await this.crowdsale.finalize({ from: owner }); - const post = web3.eth.getBalance(wallet); - post.minus(pre).should.be.bignumber.equal(goal); - }); -}); diff --git a/test/crowdsale/TimedCrowdsale.test.js b/test/crowdsale/TimedCrowdsale.test.js deleted file mode 100644 index ad54792a4..000000000 --- a/test/crowdsale/TimedCrowdsale.test.js +++ /dev/null @@ -1,62 +0,0 @@ -import ether from '../helpers/ether'; -import { advanceBlock } from '../helpers/advanceToBlock'; -import { increaseTimeTo, duration } from '../helpers/increaseTime'; -import latestTime from '../helpers/latestTime'; -import EVMRevert from '../helpers/EVMRevert'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const TimedCrowdsale = artifacts.require('TimedCrowdsaleImpl'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('TimedCrowdsale', function ([_, investor, wallet, purchaser]) { - const rate = new BigNumber(1); - const value = ether(42); - const tokenSupply = new BigNumber('1e22'); - - before(async function () { - // Advance to the next block to correctly read time in the solidity "now" function interpreted by ganache - await advanceBlock(); - }); - - beforeEach(async function () { - this.openingTime = latestTime() + duration.weeks(1); - this.closingTime = this.openingTime + duration.weeks(1); - this.afterClosingTime = this.closingTime + duration.seconds(1); - this.token = await SimpleToken.new(); - this.crowdsale = await TimedCrowdsale.new(this.openingTime, this.closingTime, rate, wallet, this.token.address); - await this.token.transfer(this.crowdsale.address, tokenSupply); - }); - - it('should be ended only after end', async function () { - let ended = await this.crowdsale.hasClosed(); - ended.should.equal(false); - await increaseTimeTo(this.afterClosingTime); - ended = await this.crowdsale.hasClosed(); - ended.should.equal(true); - }); - - describe('accepting payments', function () { - it('should reject payments before start', async function () { - await this.crowdsale.send(value).should.be.rejectedWith(EVMRevert); - await this.crowdsale.buyTokens(investor, { from: purchaser, value: value }).should.be.rejectedWith(EVMRevert); - }); - - it('should accept payments after start', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.send(value).should.be.fulfilled; - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }).should.be.fulfilled; - }); - - it('should reject payments after end', async function () { - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.send(value).should.be.rejectedWith(EVMRevert); - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }).should.be.rejectedWith(EVMRevert); - }); - }); -}); diff --git a/test/crowdsale/WhitelistedCrowdsale.test.js b/test/crowdsale/WhitelistedCrowdsale.test.js deleted file mode 100644 index e62016ace..000000000 --- a/test/crowdsale/WhitelistedCrowdsale.test.js +++ /dev/null @@ -1,93 +0,0 @@ -import ether from '../helpers/ether'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .should(); - -const WhitelistedCrowdsale = artifacts.require('WhitelistedCrowdsaleImpl'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('WhitelistedCrowdsale', function ([_, wallet, authorized, unauthorized, anotherAuthorized]) { - const rate = 1; - const value = ether(42); - const tokenSupply = new BigNumber('1e22'); - - describe('single user whitelisting', function () { - beforeEach(async function () { - this.token = await SimpleToken.new(); - this.crowdsale = await WhitelistedCrowdsale.new(rate, wallet, this.token.address); - await this.token.transfer(this.crowdsale.address, tokenSupply); - await this.crowdsale.addToWhitelist(authorized); - }); - - describe('accepting payments', function () { - it('should accept payments to whitelisted (from whichever buyers)', async function () { - await this.crowdsale.buyTokens(authorized, { value: value, from: authorized }).should.be.fulfilled; - await this.crowdsale.buyTokens(authorized, { value: value, from: unauthorized }).should.be.fulfilled; - }); - - it('should reject payments to not whitelisted (from whichever buyers)', async function () { - await this.crowdsale.send(value).should.be.rejected; - await this.crowdsale.buyTokens(unauthorized, { value: value, from: unauthorized }).should.be.rejected; - await this.crowdsale.buyTokens(unauthorized, { value: value, from: authorized }).should.be.rejected; - }); - - it('should reject payments to addresses removed from whitelist', async function () { - await this.crowdsale.removeFromWhitelist(authorized); - await this.crowdsale.buyTokens(authorized, { value: value, from: authorized }).should.be.rejected; - }); - }); - - describe('reporting whitelisted', function () { - it('should correctly report whitelisted addresses', async function () { - let isAuthorized = await this.crowdsale.whitelist(authorized); - isAuthorized.should.equal(true); - let isntAuthorized = await this.crowdsale.whitelist(unauthorized); - isntAuthorized.should.equal(false); - }); - }); - }); - - describe('many user whitelisting', function () { - beforeEach(async function () { - this.token = await SimpleToken.new(); - this.crowdsale = await WhitelistedCrowdsale.new(rate, wallet, this.token.address); - await this.token.transfer(this.crowdsale.address, tokenSupply); - await this.crowdsale.addManyToWhitelist([authorized, anotherAuthorized]); - }); - - describe('accepting payments', function () { - it('should accept payments to whitelisted (from whichever buyers)', async function () { - await this.crowdsale.buyTokens(authorized, { value: value, from: authorized }).should.be.fulfilled; - await this.crowdsale.buyTokens(authorized, { value: value, from: unauthorized }).should.be.fulfilled; - await this.crowdsale.buyTokens(anotherAuthorized, { value: value, from: authorized }).should.be.fulfilled; - await this.crowdsale.buyTokens(anotherAuthorized, { value: value, from: unauthorized }).should.be.fulfilled; - }); - - it('should reject payments to not whitelisted (with whichever buyers)', async function () { - await this.crowdsale.send(value).should.be.rejected; - await this.crowdsale.buyTokens(unauthorized, { value: value, from: unauthorized }).should.be.rejected; - await this.crowdsale.buyTokens(unauthorized, { value: value, from: authorized }).should.be.rejected; - }); - - it('should reject payments to addresses removed from whitelist', async function () { - await this.crowdsale.removeFromWhitelist(anotherAuthorized); - await this.crowdsale.buyTokens(authorized, { value: value, from: authorized }).should.be.fulfilled; - await this.crowdsale.buyTokens(anotherAuthorized, { value: value, from: authorized }).should.be.rejected; - }); - }); - - describe('reporting whitelisted', function () { - it('should correctly report whitelisted addresses', async function () { - let isAuthorized = await this.crowdsale.whitelist(authorized); - isAuthorized.should.equal(true); - let isAnotherAuthorized = await this.crowdsale.whitelist(anotherAuthorized); - isAnotherAuthorized.should.equal(true); - let isntAuthorized = await this.crowdsale.whitelist(unauthorized); - isntAuthorized.should.equal(false); - }); - }); - }); -}); diff --git a/test/examples/SampleCrowdsale.test.js b/test/examples/SampleCrowdsale.test.js deleted file mode 100644 index 45d0c216e..000000000 --- a/test/examples/SampleCrowdsale.test.js +++ /dev/null @@ -1,126 +0,0 @@ -import ether from '../helpers/ether'; -import { advanceBlock } from '../helpers/advanceToBlock'; -import { increaseTimeTo, duration } from '../helpers/increaseTime'; -import latestTime from '../helpers/latestTime'; -import EVMRevert from '../helpers/EVMRevert'; -import assertRevert from '../helpers/assertRevert'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const SampleCrowdsale = artifacts.require('SampleCrowdsale'); -const SampleCrowdsaleToken = artifacts.require('SampleCrowdsaleToken'); -const RefundVault = artifacts.require('RefundVault'); - -contract('SampleCrowdsale', function ([owner, wallet, investor]) { - const RATE = new BigNumber(10); - const GOAL = ether(10); - const CAP = ether(20); - - before(async function () { - // Advance to the next block to correctly read time in the solidity "now" function interpreted by ganache - await advanceBlock(); - }); - - beforeEach(async function () { - this.openingTime = latestTime() + duration.weeks(1); - this.closingTime = this.openingTime + duration.weeks(1); - this.afterClosingTime = this.closingTime + duration.seconds(1); - - this.token = await SampleCrowdsaleToken.new({ from: owner }); - this.vault = await RefundVault.new(wallet, { from: owner }); - this.crowdsale = await SampleCrowdsale.new( - this.openingTime, this.closingTime, RATE, wallet, CAP, this.token.address, GOAL - ); - await this.token.transferOwnership(this.crowdsale.address); - await this.vault.transferOwnership(this.crowdsale.address); - }); - - it('should create crowdsale with correct parameters', async function () { - this.crowdsale.should.exist; - this.token.should.exist; - - const openingTime = await this.crowdsale.openingTime(); - const closingTime = await this.crowdsale.closingTime(); - const rate = await this.crowdsale.rate(); - const walletAddress = await this.crowdsale.wallet(); - const goal = await this.crowdsale.goal(); - const cap = await this.crowdsale.cap(); - - openingTime.should.be.bignumber.equal(this.openingTime); - closingTime.should.be.bignumber.equal(this.closingTime); - rate.should.be.bignumber.equal(RATE); - walletAddress.should.be.equal(wallet); - goal.should.be.bignumber.equal(GOAL); - cap.should.be.bignumber.equal(CAP); - }); - - it('should not accept payments before start', async function () { - await this.crowdsale.send(ether(1)).should.be.rejectedWith(EVMRevert); - await this.crowdsale.buyTokens(investor, { from: investor, value: ether(1) }).should.be.rejectedWith(EVMRevert); - }); - - it('should accept payments during the sale', async function () { - const investmentAmount = ether(1); - const expectedTokenAmount = RATE.mul(investmentAmount); - - await increaseTimeTo(this.openingTime); - await this.crowdsale.buyTokens(investor, { value: investmentAmount, from: investor }).should.be.fulfilled; - - (await this.token.balanceOf(investor)).should.be.bignumber.equal(expectedTokenAmount); - (await this.token.totalSupply()).should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should reject payments after end', async function () { - await increaseTimeTo(this.afterEnd); - await this.crowdsale.send(ether(1)).should.be.rejectedWith(EVMRevert); - await this.crowdsale.buyTokens(investor, { value: ether(1), from: investor }).should.be.rejectedWith(EVMRevert); - }); - - it('should reject payments over cap', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.send(CAP); - await this.crowdsale.send(1).should.be.rejectedWith(EVMRevert); - }); - - it('should allow finalization and transfer funds to wallet if the goal is reached', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.send(GOAL); - - const beforeFinalization = web3.eth.getBalance(wallet); - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.finalize({ from: owner }); - const afterFinalization = web3.eth.getBalance(wallet); - - afterFinalization.minus(beforeFinalization).should.be.bignumber.equal(GOAL); - }); - - it('should allow refunds if the goal is not reached', async function () { - const balanceBeforeInvestment = web3.eth.getBalance(investor); - - await increaseTimeTo(this.openingTime); - await this.crowdsale.sendTransaction({ value: ether(1), from: investor, gasPrice: 0 }); - await increaseTimeTo(this.afterClosingTime); - - await this.crowdsale.finalize({ from: owner }); - await this.crowdsale.claimRefund({ from: investor, gasPrice: 0 }).should.be.fulfilled; - - const balanceAfterRefund = web3.eth.getBalance(investor); - balanceBeforeInvestment.should.be.bignumber.equal(balanceAfterRefund); - }); - - describe('when goal > cap', function () { - // goal > cap - const HIGH_GOAL = ether(30); - - it('creation reverts', async function () { - await assertRevert(SampleCrowdsale.new( - this.openingTime, this.closingTime, RATE, wallet, CAP, this.token.address, HIGH_GOAL - )); - }); - }); -}); diff --git a/test/examples/SimpleToken.test.js b/test/examples/SimpleToken.test.js deleted file mode 100644 index 3d173ca35..000000000 --- a/test/examples/SimpleToken.test.js +++ /dev/null @@ -1,41 +0,0 @@ -import decodeLogs from '../helpers/decodeLogs'; -const SimpleToken = artifacts.require('SimpleToken'); - -contract('SimpleToken', accounts => { - let token; - const creator = accounts[0]; - - beforeEach(async function () { - token = await SimpleToken.new({ from: creator }); - }); - - it('has a name', async function () { - const name = await token.name(); - assert.equal(name, 'SimpleToken'); - }); - - it('has a symbol', async function () { - const symbol = await token.symbol(); - assert.equal(symbol, 'SIM'); - }); - - it('has 18 decimals', async function () { - const decimals = await token.decimals(); - assert(decimals.eq(18)); - }); - - it('assigns the initial total supply to the creator', async function () { - const totalSupply = await token.totalSupply(); - const creatorBalance = await token.balanceOf(creator); - - assert(creatorBalance.eq(totalSupply)); - - const receipt = web3.eth.getTransactionReceipt(token.transactionHash); - const logs = decodeLogs(receipt.logs, SimpleToken, token.address); - assert.equal(logs.length, 1); - assert.equal(logs[0].event, 'Transfer'); - assert.equal(logs[0].args.from.valueOf(), 0x0); - assert.equal(logs[0].args.to.valueOf(), creator); - assert(logs[0].args.value.eq(totalSupply)); - }); -}); diff --git a/test/library/ECRecovery.test.js b/test/library/ECRecovery.test.js deleted file mode 100644 index 7ea55823f..000000000 --- a/test/library/ECRecovery.test.js +++ /dev/null @@ -1,77 +0,0 @@ - -import { - hashMessage, - signMessage, -} from '../helpers/sign'; -const ECRecoveryMock = artifacts.require('ECRecoveryMock'); - -require('chai') - .use(require('chai-as-promised')) - .should(); - -contract('ECRecovery', function (accounts) { - let ecrecovery; - const TEST_MESSAGE = 'OpenZeppelin'; - - before(async function () { - ecrecovery = await ECRecoveryMock.new(); - }); - - it('recover v0', async function () { - // Signature generated outside ganache with method web3.eth.sign(signer, message) - let signer = '0x2cc1166f6212628a0deef2b33befb2187d35b86c'; - let message = web3.sha3(TEST_MESSAGE); - // eslint-disable-next-line max-len - let signature = '0x5d99b6f7f6d1f73d1a26497f2b1c89b24c0993913f86e9a2d02cd69887d9c94f3c880358579d811b21dd1b7fd9bb01c1d81d10e69f0384e675c32b39643be89200'; - const addrRecovered = await ecrecovery.recover(message, signature); - addrRecovered.should.eq(signer); - }); - - it('recover v1', async function () { - // Signature generated outside ganache with method web3.eth.sign(signer, message) - let signer = '0x1e318623ab09fe6de3c9b8672098464aeda9100e'; - let message = web3.sha3(TEST_MESSAGE); - // eslint-disable-next-line max-len - let signature = '0x331fe75a821c982f9127538858900d87d3ec1f9f737338ad67cad133fa48feff48e6fa0c18abc62e42820f05943e47af3e9fbe306ce74d64094bdf1691ee53e001'; - const addrRecovered = await ecrecovery.recover(message, signature); - addrRecovered.should.eq(signer); - }); - - it('recover using web3.eth.sign()', async function () { - // Create the signature using account[0] - const signature = signMessage(accounts[0], TEST_MESSAGE); - - // Recover the signer address from the generated message and signature. - const addrRecovered = await ecrecovery.recover( - hashMessage(TEST_MESSAGE), - signature - ); - addrRecovered.should.eq(accounts[0]); - }); - - it('recover using web3.eth.sign() should return wrong signer', async function () { - // Create the signature using account[0] - const signature = signMessage(accounts[0], TEST_MESSAGE); - - // Recover the signer address from the generated message and wrong signature. - const addrRecovered = await ecrecovery.recover(hashMessage('Test'), signature); - assert.notEqual(accounts[0], addrRecovered); - }); - - it('recover should fail when a wrong hash is sent', async function () { - // Create the signature using account[0] - let signature = signMessage(accounts[0], TEST_MESSAGE); - - // Recover the signer address from the generated message and wrong signature. - const addrRecovered = await ecrecovery.recover(hashMessage(TEST_MESSAGE).substring(2), signature); - addrRecovered.should.eq('0x0000000000000000000000000000000000000000'); - }); - - context('toEthSignedMessage', () => { - it('should prefix hashes correctly', async function () { - const hashedMessage = web3.sha3(TEST_MESSAGE); - const ethMessage = await ecrecovery.toEthSignedMessageHash(hashedMessage); - ethMessage.should.eq(hashMessage(TEST_MESSAGE)); - }); - }); -}); diff --git a/test/library/Math.test.js b/test/library/Math.test.js deleted file mode 100644 index c671bc85f..000000000 --- a/test/library/Math.test.js +++ /dev/null @@ -1,43 +0,0 @@ -var MathMock = artifacts.require('MathMock'); - -contract('Math', function (accounts) { - let math; - - before(async function () { - math = await MathMock.new(); - }); - - it('returns max64 correctly', async function () { - let a = 5678; - let b = 1234; - await math.max64(a, b); - let result = await math.result64(); - assert.equal(result, a); - }); - - it('returns min64 correctly', async function () { - let a = 5678; - let b = 1234; - await math.min64(a, b); - let result = await math.result64(); - - assert.equal(result, b); - }); - - it('returns max256 correctly', async function () { - let a = 5678; - let b = 1234; - await math.max256(a, b); - let result = await math.result256(); - assert.equal(result, a); - }); - - it('returns min256 correctly', async function () { - let a = 5678; - let b = 1234; - await math.min256(a, b); - let result = await math.result256(); - - assert.equal(result, b); - }); -}); diff --git a/test/library/MerkleProof.test.js b/test/library/MerkleProof.test.js deleted file mode 100644 index 1e8da3c8f..000000000 --- a/test/library/MerkleProof.test.js +++ /dev/null @@ -1,61 +0,0 @@ - -import MerkleTree from '../helpers/merkleTree.js'; -import { sha3, bufferToHex } from 'ethereumjs-util'; - -var MerkleProofWrapper = artifacts.require('MerkleProofWrapper'); - -contract('MerkleProof', function (accounts) { - let merkleProof; - - before(async function () { - merkleProof = await MerkleProofWrapper.new(); - }); - - describe('verifyProof', function () { - it('should return true for a valid Merkle proof', async function () { - const elements = ['a', 'b', 'c', 'd']; - const merkleTree = new MerkleTree(elements); - - const root = merkleTree.getHexRoot(); - - const proof = merkleTree.getHexProof(elements[0]); - - const leaf = bufferToHex(sha3(elements[0])); - - const result = await merkleProof.verifyProof(proof, root, leaf); - assert.isOk(result, 'verifyProof did not return true for a valid proof'); - }); - - it('should return false for an invalid Merkle proof', async function () { - const correctElements = ['a', 'b', 'c']; - const correctMerkleTree = new MerkleTree(correctElements); - - const correctRoot = correctMerkleTree.getHexRoot(); - - const correctLeaf = bufferToHex(sha3(correctElements[0])); - - const badElements = ['d', 'e', 'f']; - const badMerkleTree = new MerkleTree(badElements); - - const badProof = badMerkleTree.getHexProof(badElements[0]); - - const result = await merkleProof.verifyProof(badProof, correctRoot, correctLeaf); - assert.isNotOk(result, 'verifyProof did not return false for an invalid proof'); - }); - - it('should return false for a Merkle proof of invalid length', async function () { - const elements = ['a', 'b', 'c']; - const merkleTree = new MerkleTree(elements); - - const root = merkleTree.getHexRoot(); - - const proof = merkleTree.getHexProof(elements[0]); - const badProof = proof.slice(0, proof.length - 5); - - const leaf = bufferToHex(sha3(elements[0])); - - const result = await merkleProof.verifyProof(badProof, root, leaf); - assert.isNotOk(result, 'verifyProof did not return false for proof of invalid length'); - }); - }); -}); diff --git a/test/lifecycle/Destructible.test.js b/test/lifecycle/Destructible.test.js deleted file mode 100644 index 2757d76cd..000000000 --- a/test/lifecycle/Destructible.test.js +++ /dev/null @@ -1,23 +0,0 @@ - -var Destructible = artifacts.require('Destructible'); -require('../helpers/transactionMined.js'); - -contract('Destructible', function (accounts) { - it('should send balance to owner after destruction', async function () { - let destructible = await Destructible.new({ from: accounts[0], value: web3.toWei('10', 'ether') }); - let owner = await destructible.owner(); - let initBalance = web3.eth.getBalance(owner); - await destructible.destroy({ from: owner }); - let newBalance = web3.eth.getBalance(owner); - assert.isTrue(newBalance > initBalance); - }); - - it('should send balance to recepient after destruction', async function () { - let destructible = await Destructible.new({ from: accounts[0], value: web3.toWei('10', 'ether') }); - let owner = await destructible.owner(); - let initBalance = web3.eth.getBalance(accounts[1]); - await destructible.destroyAndSend(accounts[1], { from: owner }); - let newBalance = web3.eth.getBalance(accounts[1]); - assert.isTrue(newBalance.greaterThan(initBalance)); - }); -}); diff --git a/test/lifecycle/TokenDestructible.test.js b/test/lifecycle/TokenDestructible.test.js deleted file mode 100644 index 8566bf190..000000000 --- a/test/lifecycle/TokenDestructible.test.js +++ /dev/null @@ -1,37 +0,0 @@ - -var TokenDestructible = artifacts.require('TokenDestructible'); -var StandardTokenMock = artifacts.require('StandardTokenMock'); -require('../helpers/transactionMined.js'); - -contract('TokenDestructible', function (accounts) { - let destructible; - - beforeEach(async function () { - destructible = await TokenDestructible.new({ - from: accounts[0], - value: web3.toWei('10', 'ether'), - }); - }); - - it('should send balance to owner after destruction', async function () { - let owner = await destructible.owner(); - let initBalance = web3.eth.getBalance(owner); - await destructible.destroy([], { from: owner }); - let newBalance = web3.eth.getBalance(owner); - assert.isTrue(newBalance > initBalance); - }); - - it('should send tokens to owner after destruction', async function () { - let owner = await destructible.owner(); - let token = await StandardTokenMock.new(destructible.address, 100); - let initContractBalance = await token.balanceOf(destructible.address); - let initOwnerBalance = await token.balanceOf(owner); - assert.equal(initContractBalance, 100); - assert.equal(initOwnerBalance, 0); - await destructible.destroy([token.address], { from: owner }); - let newContractBalance = await token.balanceOf(destructible.address); - let newOwnerBalance = await token.balanceOf(owner); - assert.equal(newContractBalance, 0); - assert.equal(newOwnerBalance, 100); - }); -}); diff --git a/test/mocks/MathMock.sol b/test/mocks/MathMock.sol deleted file mode 100644 index c2c9f3fba..000000000 --- a/test/mocks/MathMock.sol +++ /dev/null @@ -1,26 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../../contracts/math/Math.sol"; - - -contract MathMock { - uint64 public result64; - uint256 public result256; - - function max64(uint64 a, uint64 b) public { - result64 = Math.max64(a, b); - } - - function min64(uint64 a, uint64 b) public { - result64 = Math.min64(a, b); - } - - function max256(uint256 a, uint256 b) public { - result256 = Math.max256(a, b); - } - - function min256(uint256 a, uint256 b) public { - result256 = Math.min256(a, b); - } -} diff --git a/test/ownership/CanReclaimToken.test.js b/test/ownership/CanReclaimToken.test.js deleted file mode 100644 index 6f0f2c671..000000000 --- a/test/ownership/CanReclaimToken.test.js +++ /dev/null @@ -1,35 +0,0 @@ - -import expectThrow from '../helpers/expectThrow'; - -const CanReclaimToken = artifacts.require('CanReclaimToken'); -const BasicTokenMock = artifacts.require('BasicTokenMock'); - -contract('CanReclaimToken', function (accounts) { - let token = null; - let canReclaimToken = null; - - beforeEach(async function () { - // Create contract and token - token = await BasicTokenMock.new(accounts[0], 100); - canReclaimToken = await CanReclaimToken.new(); - // Force token into contract - await token.transfer(canReclaimToken.address, 10); - const startBalance = await token.balanceOf(canReclaimToken.address); - assert.equal(startBalance, 10); - }); - - it('should allow owner to reclaim tokens', async function () { - const ownerStartBalance = await token.balanceOf(accounts[0]); - await canReclaimToken.reclaimToken(token.address); - const ownerFinalBalance = await token.balanceOf(accounts[0]); - const finalBalance = await token.balanceOf(canReclaimToken.address); - assert.equal(finalBalance, 0); - assert.equal(ownerFinalBalance - ownerStartBalance, 10); - }); - - it('should allow only owner to reclaim tokens', async function () { - await expectThrow( - canReclaimToken.reclaimToken(token.address, { from: accounts[1] }), - ); - }); -}); diff --git a/test/ownership/Claimable.test.js b/test/ownership/Claimable.test.js deleted file mode 100644 index 52340fb94..000000000 --- a/test/ownership/Claimable.test.js +++ /dev/null @@ -1,53 +0,0 @@ - -import assertRevert from '../helpers/assertRevert'; - -var Claimable = artifacts.require('Claimable'); - -contract('Claimable', function (accounts) { - let claimable; - - beforeEach(async function () { - claimable = await Claimable.new(); - }); - - it('should have an owner', async function () { - let owner = await claimable.owner(); - assert.isTrue(owner !== 0); - }); - - it('changes pendingOwner after transfer', async function () { - let newOwner = accounts[1]; - await claimable.transferOwnership(newOwner); - let pendingOwner = await claimable.pendingOwner(); - - assert.isTrue(pendingOwner === newOwner); - }); - - it('should prevent to claimOwnership from no pendingOwner', async function () { - await assertRevert(claimable.claimOwnership({ from: accounts[2] })); - }); - - it('should prevent non-owners from transfering', async function () { - const other = accounts[2]; - const owner = await claimable.owner.call(); - - assert.isTrue(owner !== other); - await assertRevert(claimable.transferOwnership(other, { from: other })); - }); - - describe('after initiating a transfer', function () { - let newOwner; - - beforeEach(async function () { - newOwner = accounts[1]; - await claimable.transferOwnership(newOwner); - }); - - it('changes allow pending owner to claim ownership', async function () { - await claimable.claimOwnership({ from: newOwner }); - let owner = await claimable.owner(); - - assert.isTrue(owner === newOwner); - }); - }); -}); diff --git a/test/ownership/Contactable.test.js b/test/ownership/Contactable.test.js deleted file mode 100644 index 901ba4824..000000000 --- a/test/ownership/Contactable.test.js +++ /dev/null @@ -1,28 +0,0 @@ - -var Contactable = artifacts.require('Contactable'); - -contract('Contactable', function (accounts) { - let contactable; - - beforeEach(async function () { - contactable = await Contactable.new(); - }); - - it('should have an empty contact info', async function () { - let info = await contactable.contactInformation(); - assert.isTrue(info === ''); - }); - - describe('after setting the contact information', function () { - let contactInfo = 'contact information'; - - beforeEach(async function () { - await contactable.setContactInformation(contactInfo); - }); - - it('should return the setted contact information', async function () { - let info = await contactable.contactInformation(); - assert.isTrue(info === contactInfo); - }); - }); -}); diff --git a/test/ownership/DelayedClaimable.test.js b/test/ownership/DelayedClaimable.test.js deleted file mode 100644 index 90be7fbc9..000000000 --- a/test/ownership/DelayedClaimable.test.js +++ /dev/null @@ -1,55 +0,0 @@ -import assertRevert from '../helpers/assertRevert'; - -var DelayedClaimable = artifacts.require('DelayedClaimable'); - -contract('DelayedClaimable', function (accounts) { - var delayedClaimable; - - beforeEach(function () { - return DelayedClaimable.new().then(function (deployed) { - delayedClaimable = deployed; - }); - }); - - it('can set claim blocks', async function () { - await delayedClaimable.transferOwnership(accounts[2]); - await delayedClaimable.setLimits(0, 1000); - let end = await delayedClaimable.end(); - assert.equal(end, 1000); - let start = await delayedClaimable.start(); - assert.equal(start, 0); - }); - - it('changes pendingOwner after transfer successful', async function () { - await delayedClaimable.transferOwnership(accounts[2]); - await delayedClaimable.setLimits(0, 1000); - let end = await delayedClaimable.end(); - assert.equal(end, 1000); - let start = await delayedClaimable.start(); - assert.equal(start, 0); - let pendingOwner = await delayedClaimable.pendingOwner(); - assert.equal(pendingOwner, accounts[2]); - await delayedClaimable.claimOwnership({ from: accounts[2] }); - let owner = await delayedClaimable.owner(); - assert.equal(owner, accounts[2]); - }); - - it('changes pendingOwner after transfer fails', async function () { - await delayedClaimable.transferOwnership(accounts[1]); - await delayedClaimable.setLimits(100, 110); - let end = await delayedClaimable.end(); - assert.equal(end, 110); - let start = await delayedClaimable.start(); - assert.equal(start, 100); - let pendingOwner = await delayedClaimable.pendingOwner(); - assert.equal(pendingOwner, accounts[1]); - await assertRevert(delayedClaimable.claimOwnership({ from: accounts[1] })); - let owner = await delayedClaimable.owner(); - assert.isTrue(owner !== accounts[1]); - }); - - it('set end and start invalid values fail', async function () { - await delayedClaimable.transferOwnership(accounts[1]); - await assertRevert(delayedClaimable.setLimits(1001, 1000)); - }); -}); diff --git a/test/ownership/HasNoContracts.test.js b/test/ownership/HasNoContracts.test.js deleted file mode 100644 index f2020a173..000000000 --- a/test/ownership/HasNoContracts.test.js +++ /dev/null @@ -1,33 +0,0 @@ - -import expectThrow from '../helpers/expectThrow'; - -const Ownable = artifacts.require('Ownable'); -const HasNoContracts = artifacts.require('HasNoContracts'); - -contract('HasNoContracts', function (accounts) { - let hasNoContracts = null; - let ownable = null; - - beforeEach(async () => { - // Create contract and token - hasNoContracts = await HasNoContracts.new(); - ownable = await Ownable.new(); - - // Force ownership into contract - await ownable.transferOwnership(hasNoContracts.address); - const owner = await ownable.owner(); - assert.equal(owner, hasNoContracts.address); - }); - - it('should allow owner to reclaim contracts', async function () { - await hasNoContracts.reclaimContract(ownable.address); - const owner = await ownable.owner(); - assert.equal(owner, accounts[0]); - }); - - it('should allow only owner to reclaim contracts', async function () { - await expectThrow( - hasNoContracts.reclaimContract(ownable.address, { from: accounts[1] }), - ); - }); -}); diff --git a/test/ownership/HasNoEther.test.js b/test/ownership/HasNoEther.test.js deleted file mode 100644 index ff95e998f..000000000 --- a/test/ownership/HasNoEther.test.js +++ /dev/null @@ -1,64 +0,0 @@ - -import expectThrow from '../helpers/expectThrow'; -import toPromise from '../helpers/toPromise'; -const HasNoEtherTest = artifacts.require('HasNoEtherTest'); -const ForceEther = artifacts.require('ForceEther'); - -contract('HasNoEther', function (accounts) { - const amount = web3.toWei('1', 'ether'); - - it('should be constructorable', async function () { - await HasNoEtherTest.new(); - }); - - it('should not accept ether in constructor', async function () { - await expectThrow(HasNoEtherTest.new({ value: amount })); - }); - - it('should not accept ether', async function () { - let hasNoEther = await HasNoEtherTest.new(); - - await expectThrow( - toPromise(web3.eth.sendTransaction)({ - from: accounts[1], - to: hasNoEther.address, - value: amount, - }), - ); - }); - - it('should allow owner to reclaim ether', async function () { - // Create contract - let hasNoEther = await HasNoEtherTest.new(); - const startBalance = await web3.eth.getBalance(hasNoEther.address); - assert.equal(startBalance, 0); - - // Force ether into it - let forceEther = await ForceEther.new({ value: amount }); - await forceEther.destroyAndSend(hasNoEther.address); - const forcedBalance = await web3.eth.getBalance(hasNoEther.address); - assert.equal(forcedBalance, amount); - - // Reclaim - const ownerStartBalance = await web3.eth.getBalance(accounts[0]); - await hasNoEther.reclaimEther(); - const ownerFinalBalance = await web3.eth.getBalance(accounts[0]); - const finalBalance = await web3.eth.getBalance(hasNoEther.address); - assert.equal(finalBalance, 0); - assert.isAbove(ownerFinalBalance, ownerStartBalance); - }); - - it('should allow only owner to reclaim ether', async function () { - // Create contract - let hasNoEther = await HasNoEtherTest.new({ from: accounts[0] }); - - // Force ether into it - let forceEther = await ForceEther.new({ value: amount }); - await forceEther.destroyAndSend(hasNoEther.address); - const forcedBalance = await web3.eth.getBalance(hasNoEther.address); - assert.equal(forcedBalance, amount); - - // Reclaim - await expectThrow(hasNoEther.reclaimEther({ from: accounts[1] })); - }); -}); diff --git a/test/ownership/HasNoTokens.test.js b/test/ownership/HasNoTokens.test.js deleted file mode 100644 index e9c14a7f5..000000000 --- a/test/ownership/HasNoTokens.test.js +++ /dev/null @@ -1,40 +0,0 @@ - -import expectThrow from '../helpers/expectThrow'; - -const HasNoTokens = artifacts.require('HasNoTokens'); -const ERC223TokenMock = artifacts.require('ERC223TokenMock'); - -contract('HasNoTokens', function (accounts) { - let hasNoTokens = null; - let token = null; - - beforeEach(async () => { - // Create contract and token - hasNoTokens = await HasNoTokens.new(); - token = await ERC223TokenMock.new(accounts[0], 100); - - // Force token into contract - await token.transfer(hasNoTokens.address, 10); - const startBalance = await token.balanceOf(hasNoTokens.address); - assert.equal(startBalance, 10); - }); - - it('should not accept ERC223 tokens', async function () { - await expectThrow(token.transferERC223(hasNoTokens.address, 10, '')); - }); - - it('should allow owner to reclaim tokens', async function () { - const ownerStartBalance = await token.balanceOf(accounts[0]); - await hasNoTokens.reclaimToken(token.address); - const ownerFinalBalance = await token.balanceOf(accounts[0]); - const finalBalance = await token.balanceOf(hasNoTokens.address); - assert.equal(finalBalance, 0); - assert.equal(ownerFinalBalance - ownerStartBalance, 10); - }); - - it('should allow only owner to reclaim tokens', async function () { - await expectThrow( - hasNoTokens.reclaimToken(token.address, { from: accounts[1] }), - ); - }); -}); diff --git a/test/ownership/Whitelist.test.js b/test/ownership/Whitelist.test.js deleted file mode 100644 index e0ae29f96..000000000 --- a/test/ownership/Whitelist.test.js +++ /dev/null @@ -1,103 +0,0 @@ -import expectThrow from '../helpers/expectThrow'; -import expectEvent from '../helpers/expectEvent'; - -const WhitelistMock = artifacts.require('WhitelistMock'); - -require('chai') - .use(require('chai-as-promised')) - .should(); - -contract('Whitelist', function (accounts) { - let mock; - - const [ - owner, - whitelistedAddress1, - whitelistedAddress2, - anyone, - ] = accounts; - - const whitelistedAddresses = [whitelistedAddress1, whitelistedAddress2]; - - before(async function () { - mock = await WhitelistMock.new(); - }); - - context('in normal conditions', () => { - it('should add address to the whitelist', async function () { - await expectEvent.inTransaction( - mock.addAddressToWhitelist(whitelistedAddress1, { from: owner }), - 'WhitelistedAddressAdded' - ); - const isWhitelisted = await mock.whitelist(whitelistedAddress1); - isWhitelisted.should.be.equal(true); - }); - - it('should add addresses to the whitelist', async function () { - await expectEvent.inTransaction( - mock.addAddressesToWhitelist(whitelistedAddresses, { from: owner }), - 'WhitelistedAddressAdded' - ); - for (let addr of whitelistedAddresses) { - const isWhitelisted = await mock.whitelist(addr); - isWhitelisted.should.be.equal(true); - } - }); - - it('should not announce WhitelistedAddressAdded event if address is already in the whitelist', async function () { - const { logs } = await mock.addAddressToWhitelist(whitelistedAddress1, { from: owner }); - logs.should.be.empty; - }); - - it('should remove address from the whitelist', async function () { - await expectEvent.inTransaction( - mock.removeAddressFromWhitelist(whitelistedAddress1, { from: owner }), - 'WhitelistedAddressRemoved' - ); - let isWhitelisted = await mock.whitelist(whitelistedAddress1); - isWhitelisted.should.be.equal(false); - }); - - it('should remove addresses from the the whitelist', async function () { - await expectEvent.inTransaction( - mock.removeAddressesFromWhitelist(whitelistedAddresses, { from: owner }), - 'WhitelistedAddressRemoved' - ); - for (let addr of whitelistedAddresses) { - const isWhitelisted = await mock.whitelist(addr); - isWhitelisted.should.be.equal(false); - } - }); - - it('should not announce WhitelistedAddressRemoved event if address is not in the whitelist', async function () { - const { logs } = await mock.removeAddressFromWhitelist(whitelistedAddress1, { from: owner }); - logs.should.be.empty; - }); - - it('should allow whitelisted address to call #onlyWhitelistedCanDoThis', async () => { - await mock.addAddressToWhitelist(whitelistedAddress1, { from: owner }); - await mock.onlyWhitelistedCanDoThis({ from: whitelistedAddress1 }) - .should.be.fulfilled; - }); - }); - - context('in adversarial conditions', () => { - it('should not allow "anyone" to add to the whitelist', async () => { - await expectThrow( - mock.addAddressToWhitelist(whitelistedAddress1, { from: anyone }) - ); - }); - - it('should not allow "anyone" to remove from the whitelist', async () => { - await expectThrow( - mock.removeAddressFromWhitelist(whitelistedAddress1, { from: anyone }) - ); - }); - - it('should not allow "anyone" to call #onlyWhitelistedCanDoThis', async () => { - await expectThrow( - mock.onlyWhitelistedCanDoThis({ from: anyone }) - ); - }); - }); -}); diff --git a/test/ownership/rbac/RBAC.test.js b/test/ownership/rbac/RBAC.test.js deleted file mode 100644 index e748efba5..000000000 --- a/test/ownership/rbac/RBAC.test.js +++ /dev/null @@ -1,98 +0,0 @@ -import expectThrow from '../../helpers/expectThrow'; -import expectEvent from '../../helpers/expectEvent'; - -const RBACMock = artifacts.require('RBACMock'); - -require('chai') - .use(require('chai-as-promised')) - .should(); - -const ROLE_ADVISOR = 'advisor'; - -contract('RBAC', function (accounts) { - let mock; - - const [ - admin, - anyone, - futureAdvisor, - ...advisors - ] = accounts; - - before(async () => { - mock = await RBACMock.new(advisors, { from: admin }); - }); - - context('in normal conditions', () => { - it('allows admin to call #onlyAdminsCanDoThis', async () => { - await mock.onlyAdminsCanDoThis({ from: admin }) - .should.be.fulfilled; - }); - it('allows admin to call #onlyAdvisorsCanDoThis', async () => { - await mock.onlyAdvisorsCanDoThis({ from: admin }) - .should.be.fulfilled; - }); - it('allows advisors to call #onlyAdvisorsCanDoThis', async () => { - await mock.onlyAdvisorsCanDoThis({ from: advisors[0] }) - .should.be.fulfilled; - }); - it('allows admin to call #eitherAdminOrAdvisorCanDoThis', async () => { - await mock.eitherAdminOrAdvisorCanDoThis({ from: admin }) - .should.be.fulfilled; - }); - it('allows advisors to call #eitherAdminOrAdvisorCanDoThis', async () => { - await mock.eitherAdminOrAdvisorCanDoThis({ from: advisors[0] }) - .should.be.fulfilled; - }); - it('does not allow admins to call #nobodyCanDoThis', async () => { - await expectThrow( - mock.nobodyCanDoThis({ from: admin }) - ); - }); - it('does not allow advisors to call #nobodyCanDoThis', async () => { - await expectThrow( - mock.nobodyCanDoThis({ from: advisors[0] }) - ); - }); - it('does not allow anyone to call #nobodyCanDoThis', async () => { - await expectThrow( - mock.nobodyCanDoThis({ from: anyone }) - ); - }); - it('allows an admin to remove an advisor\'s role', async () => { - await mock.removeAdvisor(advisors[0], { from: admin }) - .should.be.fulfilled; - }); - it('allows admins to #adminRemoveRole', async () => { - await mock.adminRemoveRole(advisors[3], ROLE_ADVISOR, { from: admin }) - .should.be.fulfilled; - }); - - it('announces a RoleAdded event on addRole', async () => { - await expectEvent.inTransaction( - mock.adminAddRole(futureAdvisor, ROLE_ADVISOR, { from: admin }), - 'RoleAdded' - ); - }); - - it('announces a RoleRemoved event on removeRole', async () => { - await expectEvent.inTransaction( - mock.adminRemoveRole(futureAdvisor, ROLE_ADVISOR, { from: admin }), - 'RoleRemoved' - ); - }); - }); - - context('in adversarial conditions', () => { - it('does not allow an advisor to remove another advisor', async () => { - await expectThrow( - mock.removeAdvisor(advisors[1], { from: advisors[0] }) - ); - }); - it('does not allow "anyone" to remove an advisor', async () => { - await expectThrow( - mock.removeAdvisor(advisors[0], { from: anyone }) - ); - }); - }); -}); diff --git a/test/payment/PullPayment.test.js b/test/payment/PullPayment.test.js deleted file mode 100644 index 8f5a4e41a..000000000 --- a/test/payment/PullPayment.test.js +++ /dev/null @@ -1,71 +0,0 @@ -var PullPaymentMock = artifacts.require('PullPaymentMock'); - -contract('PullPayment', function (accounts) { - let ppce; - let amount = 17 * 1e18; - - beforeEach(async function () { - ppce = await PullPaymentMock.new({ value: amount }); - }); - - it('can\'t call asyncSend externally', async function () { - assert.isUndefined(ppce.asyncSend); - }); - - it('can record an async payment correctly', async function () { - let AMOUNT = 100; - await ppce.callSend(accounts[0], AMOUNT); - let paymentsToAccount0 = await ppce.payments(accounts[0]); - let totalPayments = await ppce.totalPayments(); - - assert.equal(totalPayments, AMOUNT); - assert.equal(paymentsToAccount0, AMOUNT); - }); - - it('can add multiple balances on one account', async function () { - await ppce.callSend(accounts[0], 200); - await ppce.callSend(accounts[0], 300); - let paymentsToAccount0 = await ppce.payments(accounts[0]); - let totalPayments = await ppce.totalPayments(); - - assert.equal(totalPayments, 500); - assert.equal(paymentsToAccount0, 500); - }); - - it('can add balances on multiple accounts', async function () { - await ppce.callSend(accounts[0], 200); - await ppce.callSend(accounts[1], 300); - - let paymentsToAccount0 = await ppce.payments(accounts[0]); - assert.equal(paymentsToAccount0, 200); - - let paymentsToAccount1 = await ppce.payments(accounts[1]); - assert.equal(paymentsToAccount1, 300); - - let totalPayments = await ppce.totalPayments(); - assert.equal(totalPayments, 500); - }); - - it('can withdraw payment', async function () { - let payee = accounts[1]; - let initialBalance = web3.eth.getBalance(payee); - - await ppce.callSend(payee, amount); - - let payment1 = await ppce.payments(payee); - assert.equal(payment1, amount); - - let totalPayments = await ppce.totalPayments(); - assert.equal(totalPayments, amount); - - await ppce.withdrawPayments({ from: payee }); - let payment2 = await ppce.payments(payee); - assert.equal(payment2, 0); - - totalPayments = await ppce.totalPayments(); - assert.equal(totalPayments, 0); - - let balance = web3.eth.getBalance(payee); - assert(Math.abs(balance - initialBalance - amount) < 1e16); - }); -}); diff --git a/test/payment/SplitPayment.test.js b/test/payment/SplitPayment.test.js deleted file mode 100644 index dd18eaeac..000000000 --- a/test/payment/SplitPayment.test.js +++ /dev/null @@ -1,78 +0,0 @@ -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const EVMThrow = require('../helpers/EVMThrow.js'); -const SplitPayment = artifacts.require('SplitPayment'); - -contract('SplitPayment', function ([owner, payee1, payee2, payee3, nonpayee1, payer1]) { - const amount = web3.toWei(1.0, 'ether'); - - beforeEach(async function () { - this.payees = [payee1, payee2, payee3]; - this.shares = [20, 10, 70]; - - this.contract = await SplitPayment.new(this.payees, this.shares); - }); - - it('should accept payments', async function () { - await web3.eth.sendTransaction({ from: owner, to: this.contract.address, value: amount }); - - const balance = web3.eth.getBalance(this.contract.address); - balance.should.be.bignumber.equal(amount); - }); - - it('should store shares if address is payee', async function () { - const shares = await this.contract.shares.call(payee1); - shares.should.be.bignumber.not.equal(0); - }); - - it('should not store shares if address is not payee', async function () { - const shares = await this.contract.shares.call(nonpayee1); - shares.should.be.bignumber.equal(0); - }); - - it('should throw if no funds to claim', async function () { - await this.contract.claim({ from: payee1 }).should.be.rejectedWith(EVMThrow); - }); - - it('should throw if non-payee want to claim', async function () { - await web3.eth.sendTransaction({ from: payer1, to: this.contract.address, value: amount }); - await this.contract.claim({ from: nonpayee1 }).should.be.rejectedWith(EVMThrow); - }); - - it('should distribute funds to payees', async function () { - await web3.eth.sendTransaction({ from: payer1, to: this.contract.address, value: amount }); - - // receive funds - const initBalance = web3.eth.getBalance(this.contract.address); - initBalance.should.be.bignumber.equal(amount); - - // distribute to payees - const initAmount1 = web3.eth.getBalance(payee1); - await this.contract.claim({ from: payee1 }); - const profit1 = web3.eth.getBalance(payee1) - initAmount1; - assert(Math.abs(profit1 - web3.toWei(0.20, 'ether')) < 1e16); - - const initAmount2 = web3.eth.getBalance(payee2); - await this.contract.claim({ from: payee2 }); - const profit2 = web3.eth.getBalance(payee2) - initAmount2; - assert(Math.abs(profit2 - web3.toWei(0.10, 'ether')) < 1e16); - - const initAmount3 = web3.eth.getBalance(payee3); - await this.contract.claim({ from: payee3 }); - const profit3 = web3.eth.getBalance(payee3) - initAmount3; - assert(Math.abs(profit3 - web3.toWei(0.70, 'ether')) < 1e16); - - // end balance should be zero - const endBalance = web3.eth.getBalance(this.contract.address); - endBalance.should.be.bignumber.equal(0); - - // check correct funds released accounting - const totalReleased = await this.contract.totalReleased.call(); - totalReleased.should.be.bignumber.equal(initBalance); - }); -}); diff --git a/test/token/ERC20/CappedToken.test.js b/test/token/ERC20/CappedToken.test.js deleted file mode 100644 index c3fa5af6b..000000000 --- a/test/token/ERC20/CappedToken.test.js +++ /dev/null @@ -1,36 +0,0 @@ - -import expectThrow from '../../helpers/expectThrow'; -import ether from '../../helpers/ether'; - -var CappedToken = artifacts.require('CappedToken'); - -contract('Capped', function (accounts) { - const cap = ether(1000); - - let token; - - beforeEach(async function () { - token = await CappedToken.new(cap); - }); - - it('should start with the correct cap', async function () { - let _cap = await token.cap(); - - assert(cap.eq(_cap)); - }); - - it('should mint when amount is less than cap', async function () { - const result = await token.mint(accounts[0], 100); - assert.equal(result.logs[0].event, 'Mint'); - }); - - it('should fail to mint if the ammount exceeds the cap', async function () { - await token.mint(accounts[0], cap.sub(1)); - await expectThrow(token.mint(accounts[0], 100)); - }); - - it('should fail to mint after cap is reached', async function () { - await token.mint(accounts[0], cap); - await expectThrow(token.mint(accounts[0], 1)); - }); -}); diff --git a/test/token/ERC827/ERC827Token.js b/test/token/ERC827/ERC827Token.js deleted file mode 100644 index f82f3fdf0..000000000 --- a/test/token/ERC827/ERC827Token.js +++ /dev/null @@ -1,374 +0,0 @@ - -import EVMRevert from '../../helpers/EVMRevert'; -var Message = artifacts.require('MessageHelper'); -var ERC827TokenMock = artifacts.require('ERC827TokenMock'); - -var BigNumber = web3.BigNumber; -var _ = require('lodash'); -var ethjsABI = require('ethjs-abi'); -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -contract('ERC827 Token', function (accounts) { - let token; - - function findMethod (abi, name, args) { - for (var i = 0; i < abi.length; i++) { - const methodArgs = _.map(abi[i].inputs, 'type').join(','); - if ((abi[i].name === name) && (methodArgs === args)) { - return abi[i]; - } - } - } - - beforeEach(async function () { - token = await ERC827TokenMock.new(accounts[0], 100); - }); - - it('should return the correct totalSupply after construction', async function () { - let totalSupply = await token.totalSupply(); - - assert.equal(totalSupply, 100); - }); - - it('should return the correct allowance amount after approval', async function () { - let token = await ERC827TokenMock.new(accounts[0], 100); - await token.approve(accounts[1], 100); - let allowance = await token.allowance(accounts[0], accounts[1]); - - assert.equal(allowance, 100); - }); - - it('should return correct balances after transfer', async function () { - await token.transfer(accounts[1], 100); - let balance0 = await token.balanceOf(accounts[0]); - assert.equal(balance0, 0); - - let balance1 = await token.balanceOf(accounts[1]); - assert.equal(balance1, 100); - }); - - it('should throw an error when trying to transfer more than balance', async function () { - await token.transfer(accounts[1], 101).should.be.rejectedWith(EVMRevert); - }); - - it('should return correct balances after transfering from another account', async function () { - await token.approve(accounts[1], 100); - await token.transferFrom(accounts[0], accounts[2], 100, { from: accounts[1] }); - - let balance0 = await token.balanceOf(accounts[0]); - assert.equal(balance0, 0); - - let balance1 = await token.balanceOf(accounts[2]); - assert.equal(balance1, 100); - - let balance2 = await token.balanceOf(accounts[1]); - assert.equal(balance2, 0); - }); - - it('should throw an error when trying to transfer more than allowed', async function () { - await token.approve(accounts[1], 99); - await token.transferFrom( - accounts[0], accounts[2], 100, - { from: accounts[1] } - ).should.be.rejectedWith(EVMRevert); - }); - - it('should throw an error when trying to transferFrom more than _from has', async function () { - let balance0 = await token.balanceOf(accounts[0]); - await token.approve(accounts[1], 99); - await token.transferFrom( - accounts[0], accounts[2], balance0 + 1, - { from: accounts[1] } - ).should.be.rejectedWith(EVMRevert); - }); - - describe('validating allowance updates to spender', function () { - let preApproved; - - it('should start with zero', async function () { - preApproved = await token.allowance(accounts[0], accounts[1]); - assert.equal(preApproved, 0); - }); - - it('should increase by 50 then decrease by 10', async function () { - const abiMethod = findMethod(token.abi, 'increaseApproval', 'address,uint256'); - const increaseApprovalData = ethjsABI.encodeMethod(abiMethod, - [accounts[1], 50] - ); - await token.sendTransaction( - { from: accounts[0], data: increaseApprovalData } - ); - let postIncrease = await token.allowance(accounts[0], accounts[1]); - preApproved.plus(50).should.be.bignumber.equal(postIncrease); - await token.decreaseApproval(accounts[1], 10); - let postDecrease = await token.allowance(accounts[0], accounts[1]); - postIncrease.minus(10).should.be.bignumber.equal(postDecrease); - }); - }); - - it('should increase by 50 then set to 0 when decreasing by more than 50', async function () { - await token.approve(accounts[1], 50); - await token.decreaseApproval(accounts[1], 60); - let postDecrease = await token.allowance(accounts[0], accounts[1]); - postDecrease.should.be.bignumber.equal(0); - }); - - it('should throw an error when trying to transfer to 0x0', async function () { - await token.transfer(0x0, 100).should.be.rejectedWith(EVMRevert); - }); - - it('should throw an error when trying to transferFrom to 0x0', async function () { - await token.approve(accounts[1], 100); - await token.transferFrom(accounts[0], 0x0, 100, { from: accounts[1] }) - .should.be.rejectedWith(EVMRevert); - }); - - describe('Test ERC827 methods', function () { - it( - 'should return correct balances after transfer (with data) and show the event on receiver contract' - , async function () { - const message = await Message.new(); - - const extraData = message.contract.showMessage.getData( - web3.toHex(123456), 666, 'Transfer Done' - ); - const abiMethod = findMethod(token.abi, 'transfer', 'address,uint256,bytes'); - const transferData = ethjsABI.encodeMethod(abiMethod, - [message.contract.address, 100, extraData] - ); - const transaction = await token.sendTransaction( - { from: accounts[0], data: transferData } - ); - - assert.equal(2, transaction.receipt.logs.length); - - new BigNumber(100).should.be.bignumber.equal( - await token.balanceOf(message.contract.address) - ); - }); - - it( - 'should return correct allowance after approve (with data) and show the event on receiver contract' - , async function () { - const message = await Message.new(); - - const extraData = message.contract.showMessage.getData( - web3.toHex(123456), 666, 'Transfer Done' - ); - - const abiMethod = findMethod(token.abi, 'approve', 'address,uint256,bytes'); - const approveData = ethjsABI.encodeMethod(abiMethod, - [message.contract.address, 100, extraData] - ); - const transaction = await token.sendTransaction( - { from: accounts[0], data: approveData } - ); - - assert.equal(2, transaction.receipt.logs.length); - - new BigNumber(100).should.be.bignumber.equal( - await token.allowance(accounts[0], message.contract.address) - ); - }); - - it( - 'should return correct allowance after increaseApproval (with data) and show the event on receiver contract' - , async function () { - const message = await Message.new(); - - const extraData = message.contract.showMessage.getData( - web3.toHex(123456), 666, 'Transfer Done' - ); - - await token.approve(message.contract.address, 10); - new BigNumber(10).should.be.bignumber.equal( - await token.allowance(accounts[0], message.contract.address) - ); - - const abiMethod = findMethod(token.abi, 'increaseApproval', 'address,uint256,bytes'); - const increaseApprovalData = ethjsABI.encodeMethod(abiMethod, - [message.contract.address, 50, extraData] - ); - const transaction = await token.sendTransaction( - { from: accounts[0], data: increaseApprovalData } - ); - - assert.equal(2, transaction.receipt.logs.length); - - new BigNumber(60).should.be.bignumber.equal( - await token.allowance(accounts[0], message.contract.address) - ); - }); - - it( - 'should return correct allowance after decreaseApproval (with data) and show the event on receiver contract' - , async function () { - const message = await Message.new(); - - await token.approve(message.contract.address, 100); - - new BigNumber(100).should.be.bignumber.equal( - await token.allowance(accounts[0], message.contract.address) - ); - - const extraData = message.contract.showMessage.getData( - web3.toHex(123456), 666, 'Transfer Done' - ); - - const abiMethod = findMethod(token.abi, 'decreaseApproval', 'address,uint256,bytes'); - const decreaseApprovalData = ethjsABI.encodeMethod(abiMethod, - [message.contract.address, 60, extraData] - ); - const transaction = await token.sendTransaction( - { from: accounts[0], data: decreaseApprovalData } - ); - - assert.equal(2, transaction.receipt.logs.length); - - new BigNumber(40).should.be.bignumber.equal( - await token.allowance(accounts[0], message.contract.address) - ); - }); - - it( - 'should return correct balances after transferFrom (with data) and show the event on receiver contract' - , async function () { - const message = await Message.new(); - - const extraData = message.contract.showMessage.getData( - web3.toHex(123456), 666, 'Transfer Done' - ); - - await token.approve(accounts[1], 100, { from: accounts[0] }); - - new BigNumber(100).should.be.bignumber.equal( - await token.allowance(accounts[0], accounts[1]) - ); - - const abiMethod = findMethod(token.abi, 'transferFrom', 'address,address,uint256,bytes'); - const transferFromData = ethjsABI.encodeMethod(abiMethod, - [accounts[0], message.contract.address, 100, extraData] - ); - const transaction = await token.sendTransaction( - { from: accounts[1], data: transferFromData } - ); - - assert.equal(2, transaction.receipt.logs.length); - - new BigNumber(100).should.be.bignumber.equal( - await token.balanceOf(message.contract.address) - ); - }); - - it('should fail inside approve (with data)', async function () { - const message = await Message.new(); - - const extraData = message.contract.fail.getData(); - - const abiMethod = findMethod(token.abi, 'approve', 'address,uint256,bytes'); - const approveData = ethjsABI.encodeMethod(abiMethod, - [message.contract.address, 10, extraData] - ); - await token.sendTransaction( - { from: accounts[0], data: approveData } - ).should.be.rejectedWith(EVMRevert); - - // approval should not have gone through so allowance is still 0 - new BigNumber(0).should.be.bignumber - .equal(await token.allowance(accounts[1], message.contract.address)); - }); - - it('should fail inside transfer (with data)', async function () { - const message = await Message.new(); - - const extraData = message.contract.fail.getData(); - - const abiMethod = findMethod(token.abi, 'transfer', 'address,uint256,bytes'); - const transferData = ethjsABI.encodeMethod(abiMethod, - [message.contract.address, 10, extraData] - ); - await token.sendTransaction( - { from: accounts[0], data: transferData } - ).should.be.rejectedWith(EVMRevert); - - // transfer should not have gone through, so balance is still 0 - new BigNumber(0).should.be.bignumber - .equal(await token.balanceOf(message.contract.address)); - }); - - it('should fail inside transferFrom (with data)', async function () { - const message = await Message.new(); - - const extraData = message.contract.fail.getData(); - - await token.approve(accounts[1], 10, { from: accounts[2] }); - - const abiMethod = findMethod(token.abi, 'transferFrom', 'address,address,uint256,bytes'); - const transferFromData = ethjsABI.encodeMethod(abiMethod, - [accounts[2], message.contract.address, 10, extraData] - ); - await token.sendTransaction( - { from: accounts[1], data: transferFromData } - ).should.be.rejectedWith(EVMRevert); - - // transferFrom should have failed so balance is still 0 but allowance is 10 - new BigNumber(10).should.be.bignumber - .equal(await token.allowance(accounts[2], accounts[1])); - new BigNumber(0).should.be.bignumber - .equal(await token.balanceOf(message.contract.address)); - }); - - it('should fail approve (with data) when using token contract address as receiver', async function () { - const message = await Message.new(); - - const extraData = message.contract.showMessage.getData( - web3.toHex(123456), 666, 'Transfer Done' - ); - - const abiMethod = findMethod(token.abi, 'approve', 'address,uint256,bytes'); - const approveData = ethjsABI.encodeMethod(abiMethod, - [token.contract.address, 100, extraData] - ); - await token.sendTransaction( - { from: accounts[0], data: approveData } - ).should.be.rejectedWith(EVMRevert); - }); - - it('should fail transfer (with data) when using token contract address as receiver', async function () { - const message = await Message.new(); - - const extraData = message.contract.showMessage.getData( - web3.toHex(123456), 666, 'Transfer Done' - ); - - const abiMethod = findMethod(token.abi, 'transfer', 'address,uint256,bytes'); - const transferData = ethjsABI.encodeMethod(abiMethod, - [token.contract.address, 100, extraData] - ); - await token.sendTransaction( - { from: accounts[0], data: transferData } - ).should.be.rejectedWith(EVMRevert); - }); - - it('should fail transferFrom (with data) when using token contract address as receiver', async function () { - const message = await Message.new(); - - const extraData = message.contract.showMessage.getData( - web3.toHex(123456), 666, 'Transfer Done' - ); - - await token.approve(accounts[1], 1, { from: accounts[0] }); - - const abiMethod = findMethod(token.abi, 'transferFrom', 'address,address,uint256,bytes'); - const transferFromData = ethjsABI.encodeMethod(abiMethod, - [accounts[0], token.contract.address, 1, extraData] - ); - await token.sendTransaction( - { from: accounts[1], data: transferFromData } - ).should.be.rejectedWith(EVMRevert); - }); - }); -}); From d0ec491b1f5dc517f82addd5afdd65100738ec78 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Wed, 18 Apr 2018 18:10:26 -0300 Subject: [PATCH 02/54] adapt contracts for upgradeability --- contracts/lifecycle/Migrations.sol | 4 ++++ contracts/mocks/DetailedERC20Mock.sol | 4 +++- contracts/mocks/ERC721TokenMock.sol | 6 ++--- contracts/mocks/PausableMock.sol | 2 ++ contracts/mocks/PausableTokenMock.sol | 2 ++ contracts/ownership/Ownable.sol | 8 +++---- contracts/token/ERC20/DetailedERC20.sol | 6 ++--- contracts/token/ERC20/TokenTimelock.sol | 6 ++--- contracts/token/ERC20/TokenVesting.sol | 9 ++++++-- contracts/token/ERC721/ERC721Token.sol | 5 +++-- package-lock.json | 30 ++++++++++++++++--------- package.json | 3 ++- test/ownership/Ownable.test.js | 1 + test/token/ERC20/MintableToken.test.js | 3 ++- test/token/ERC20/TokenTimelock.test.js | 6 +++-- test/token/ERC20/TokenVesting.test.js | 6 +++-- 16 files changed, 66 insertions(+), 35 deletions(-) diff --git a/contracts/lifecycle/Migrations.sol b/contracts/lifecycle/Migrations.sol index b12a39b2d..caf1fd56b 100644 --- a/contracts/lifecycle/Migrations.sol +++ b/contracts/lifecycle/Migrations.sol @@ -10,6 +10,10 @@ import "../ownership/Ownable.sol"; contract Migrations is Ownable { uint256 public lastCompletedMigration; + function Migrations() public { + Ownable.initialize(msg.sender); + } + function setCompleted(uint256 completed) onlyOwner public { lastCompletedMigration = completed; } diff --git a/contracts/mocks/DetailedERC20Mock.sol b/contracts/mocks/DetailedERC20Mock.sol index eb0f8cee0..9ead14d70 100644 --- a/contracts/mocks/DetailedERC20Mock.sol +++ b/contracts/mocks/DetailedERC20Mock.sol @@ -5,5 +5,7 @@ import "../token/ERC20/DetailedERC20.sol"; 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) public { + DetailedERC20.initialize(_name, _symbol, _decimals); + } } diff --git a/contracts/mocks/ERC721TokenMock.sol b/contracts/mocks/ERC721TokenMock.sol index 5fe3668ef..29bfe7439 100644 --- a/contracts/mocks/ERC721TokenMock.sol +++ b/contracts/mocks/ERC721TokenMock.sol @@ -9,9 +9,9 @@ import "../token/ERC721/ERC721Token.sol"; * and a public setter for metadata URI */ contract ERC721TokenMock is ERC721Token { - function ERC721TokenMock(string name, string symbol) public - ERC721Token(name, symbol) - { } + function ERC721TokenMock(string name, string symbol) public { + ERC721Token.initialize(name, symbol); + } function mint(address _to, uint256 _tokenId) public { super._mint(_to, _tokenId); diff --git a/contracts/mocks/PausableMock.sol b/contracts/mocks/PausableMock.sol index e28576b89..2e9022e60 100644 --- a/contracts/mocks/PausableMock.sol +++ b/contracts/mocks/PausableMock.sol @@ -10,6 +10,8 @@ contract PausableMock is Pausable { uint256 public count; function PausableMock() public { + Ownable.initialize(msg.sender); + drasticMeasureTaken = false; count = 0; } diff --git a/contracts/mocks/PausableTokenMock.sol b/contracts/mocks/PausableTokenMock.sol index 24aa6c891..66d79ae3a 100644 --- a/contracts/mocks/PausableTokenMock.sol +++ b/contracts/mocks/PausableTokenMock.sol @@ -7,6 +7,8 @@ import "../token/ERC20/PausableToken.sol"; contract PausableTokenMock is PausableToken { function PausableTokenMock(address initialAccount, uint initialBalance) public { + Ownable.initialize(msg.sender); + balances[initialAccount] = initialBalance; } diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol index 0d08f73dd..28ca7e7e2 100644 --- a/contracts/ownership/Ownable.sol +++ b/contracts/ownership/Ownable.sol @@ -1,24 +1,24 @@ pragma solidity ^0.4.21; +import 'zos-upgradeability/contracts/migrations/Initializable.sol'; /** * @title Ownable * @dev The Ownable contract has an owner address, and provides basic authorization control * functions, this simplifies the implementation of "user permissions". */ -contract Ownable { +contract Ownable is Initializable { address public owner; event OwnershipTransferred(address indexed previousOwner, address indexed newOwner); - /** * @dev The Ownable constructor sets the original `owner` of the contract to the sender * account. */ - function Ownable() public { - owner = msg.sender; + function initialize(address sender) public isInitializer { + owner = sender; } /** diff --git a/contracts/token/ERC20/DetailedERC20.sol b/contracts/token/ERC20/DetailedERC20.sol index a4807fea7..382cf64d3 100644 --- a/contracts/token/ERC20/DetailedERC20.sol +++ b/contracts/token/ERC20/DetailedERC20.sol @@ -1,14 +1,14 @@ pragma solidity ^0.4.21; import "./ERC20.sol"; +import 'zos-upgradeability/contracts/migrations/Initializable.sol'; - -contract DetailedERC20 is ERC20 { +contract DetailedERC20 is Initializable, ERC20 { string public name; string public symbol; uint8 public decimals; - function DetailedERC20(string _name, string _symbol, uint8 _decimals) public { + function initialize(string _name, string _symbol, uint8 _decimals) public isInitializer { name = _name; symbol = _symbol; decimals = _decimals; diff --git a/contracts/token/ERC20/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol index a14d904b5..643dd367d 100644 --- a/contracts/token/ERC20/TokenTimelock.sol +++ b/contracts/token/ERC20/TokenTimelock.sol @@ -1,14 +1,14 @@ pragma solidity ^0.4.21; import "./SafeERC20.sol"; - +import "zos-upgradeability/contracts/migrations/Initializable.sol"; /** * @title TokenTimelock * @dev TokenTimelock is a token holder contract that will allow a * beneficiary to extract the tokens after a given release time */ -contract TokenTimelock { +contract TokenTimelock is Initializable { using SafeERC20 for ERC20Basic; // ERC20 basic token contract being held @@ -20,7 +20,7 @@ contract TokenTimelock { // timestamp when token release is enabled uint256 public releaseTime; - function TokenTimelock(ERC20Basic _token, address _beneficiary, uint256 _releaseTime) public { + function initialize(ERC20Basic _token, address _beneficiary, uint256 _releaseTime) public isInitializer { // solium-disable-next-line security/no-block-members require(_releaseTime > block.timestamp); token = _token; diff --git a/contracts/token/ERC20/TokenVesting.sol b/contracts/token/ERC20/TokenVesting.sol index 8e902eac7..8dcfa3178 100644 --- a/contracts/token/ERC20/TokenVesting.sol +++ b/contracts/token/ERC20/TokenVesting.sol @@ -6,6 +6,7 @@ import "./ERC20Basic.sol"; import "./SafeERC20.sol"; import "../../ownership/Ownable.sol"; import "../../math/SafeMath.sol"; +import 'zos-upgradeability/contracts/migrations/Initializable.sol'; /** @@ -14,7 +15,7 @@ import "../../math/SafeMath.sol"; * typical vesting scheme, with a cliff and vesting period. Optionally revocable by the * owner. */ -contract TokenVesting is Ownable { +contract TokenVesting is Initializable, Ownable { using SafeMath for uint256; using SafeERC20 for ERC20Basic; @@ -42,7 +43,8 @@ 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( + function initialize( + address _sender, address _beneficiary, uint256 _start, uint256 _cliff, @@ -50,7 +52,10 @@ contract TokenVesting is Ownable { bool _revocable ) public + isInitializer { + Ownable.initialize(_sender); + require(_beneficiary != address(0)); require(_cliff <= _duration); diff --git a/contracts/token/ERC721/ERC721Token.sol b/contracts/token/ERC721/ERC721Token.sol index 7e43ec7e9..6d6a7bbb2 100644 --- a/contracts/token/ERC721/ERC721Token.sol +++ b/contracts/token/ERC721/ERC721Token.sol @@ -2,6 +2,7 @@ pragma solidity ^0.4.21; import "./ERC721.sol"; import "./ERC721BasicToken.sol"; +import "zos-upgradeability/contracts/migrations/Initializable.sol"; /** @@ -10,7 +11,7 @@ import "./ERC721BasicToken.sol"; * Moreover, it includes approve all functionality using operator terminology * @dev see https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md */ -contract ERC721Token is ERC721, ERC721BasicToken { +contract ERC721Token is Initializable, ERC721, ERC721BasicToken { // Token name string internal name_; @@ -35,7 +36,7 @@ contract ERC721Token is ERC721, ERC721BasicToken { /** * @dev Constructor function */ - function ERC721Token(string _name, string _symbol) public { + function initialize(string _name, string _symbol) public isInitializer { name_ = _name; symbol_ = _symbol; } diff --git a/package-lock.json b/package-lock.json index 9e56a7db8..c32a5de49 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2755,7 +2755,6 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.2.1.tgz", "integrity": "sha1-4KepOn6BFjqUR3utVu3lJKtt5TM=", - "dev": true, "requires": { "bn.js": "4.11.6", "js-sha3": "0.5.5", @@ -2765,14 +2764,12 @@ "bn.js": { "version": "4.11.6", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", - "dev": true + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" }, "js-sha3": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz", - "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=", - "dev": true + "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=" } } }, @@ -4824,8 +4821,7 @@ "is-hex-prefixed": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz", - "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=", - "dev": true + "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=" }, "is-my-json-valid": { "version": "2.16.0", @@ -6394,7 +6390,6 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/number-to-bn/-/number-to-bn-1.7.0.tgz", "integrity": "sha1-uzYjWS9+X54AMLGXe9QaDFP+HqA=", - "dev": true, "requires": { "bn.js": "4.11.6", "strip-hex-prefix": "1.0.0" @@ -6403,8 +6398,7 @@ "bn.js": { "version": "4.11.6", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", - "dev": true + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" } } }, @@ -8025,7 +8019,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz", "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=", - "dev": true, "requires": { "is-hex-prefixed": "1.0.0" } @@ -9452,6 +9445,21 @@ } } } + }, + "zeppelin-solidity": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/zeppelin-solidity/-/zeppelin-solidity-1.8.0.tgz", + "integrity": "sha512-7Mxq6Y7EES0PSLrRF6v0EVYqBVRRo8hFrr7m3jEs69VbbQ5kpANzizeEdbP1/PWKSOmBOg208qP2vSA0FlzFLA==", + "requires": { + "dotenv": "4.0.0", + "ethjs-abi": "0.2.1" + } + }, + "zos-upgradeability": { + "version": "git://github.com/zeppelinos/upgradeability-lib.git#68cd61fb48d0e4eec7142241448efa40c395bf33", + "requires": { + "zeppelin-solidity": "1.8.0" + } } } } diff --git a/package.json b/package.json index 613b38c8a..ed35a1696 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "truffle-hdwallet-provider": "0.0.3" }, "dependencies": { - "dotenv": "^4.0.0" + "dotenv": "^4.0.0", + "zos-upgradeability": "git://github.com/zeppelinos/upgradeability-lib.git" } } diff --git a/test/ownership/Ownable.test.js b/test/ownership/Ownable.test.js index 209a209b1..23f454289 100644 --- a/test/ownership/Ownable.test.js +++ b/test/ownership/Ownable.test.js @@ -8,6 +8,7 @@ contract('Ownable', function (accounts) { beforeEach(async function () { ownable = await Ownable.new(); + await ownable.initialize(accounts[0]); }); it('should have an owner', async function () { diff --git a/test/token/ERC20/MintableToken.test.js b/test/token/ERC20/MintableToken.test.js index a6b2d268e..8e169e58f 100644 --- a/test/token/ERC20/MintableToken.test.js +++ b/test/token/ERC20/MintableToken.test.js @@ -3,7 +3,8 @@ const MintableToken = artifacts.require('MintableToken'); contract('Mintable', function ([owner, anotherAccount]) { beforeEach(async function () { - this.token = await MintableToken.new({ from: owner }); + this.token = await MintableToken.new(); + await this.token.initialize(owner); }); describe('minting finished', function () { diff --git a/test/token/ERC20/TokenTimelock.test.js b/test/token/ERC20/TokenTimelock.test.js index d99c4b247..a8f2e20d8 100644 --- a/test/token/ERC20/TokenTimelock.test.js +++ b/test/token/ERC20/TokenTimelock.test.js @@ -15,9 +15,11 @@ contract('TokenTimelock', function ([_, owner, beneficiary]) { const amount = new BigNumber(100); beforeEach(async function () { - this.token = await MintableToken.new({ from: owner }); + this.token = await MintableToken.new(); + await this.token.initialize(owner); this.releaseTime = latestTime() + duration.years(1); - this.timelock = await TokenTimelock.new(this.token.address, beneficiary, this.releaseTime); + this.timelock = await TokenTimelock.new(); + await this.timelock.initialize(this.token.address, beneficiary, this.releaseTime); await this.token.mint(this.timelock.address, amount, { from: owner }); }); diff --git a/test/token/ERC20/TokenVesting.test.js b/test/token/ERC20/TokenVesting.test.js index e6ce5c177..82101e4c8 100644 --- a/test/token/ERC20/TokenVesting.test.js +++ b/test/token/ERC20/TokenVesting.test.js @@ -16,13 +16,15 @@ contract('TokenVesting', function ([_, owner, beneficiary]) { const amount = new BigNumber(1000); beforeEach(async function () { - this.token = await MintableToken.new({ from: owner }); + this.token = await MintableToken.new(); + await this.token.initialize(owner); this.start = latestTime() + duration.minutes(1); // +1 minute so it starts after contract instantiation this.cliff = duration.years(1); this.duration = duration.years(2); - this.vesting = await TokenVesting.new(beneficiary, this.start, this.cliff, this.duration, true, { from: owner }); + this.vesting = await TokenVesting.new(); + await this.vesting.initialize(owner, beneficiary, this.start, this.cliff, this.duration, true); await this.token.mint(this.vesting.address, amount, { from: owner }); }); From 03891b00a73d560d59054a463184f19dc70ff277 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Thu, 19 Apr 2018 12:26:12 -0300 Subject: [PATCH 03/54] ignore everything but official contracts for npm --- contracts/.npmignore | 2 ++ package.json | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 contracts/.npmignore diff --git a/contracts/.npmignore b/contracts/.npmignore new file mode 100644 index 000000000..e792d8bc6 --- /dev/null +++ b/contracts/.npmignore @@ -0,0 +1,2 @@ +mocks +examples diff --git a/package.json b/package.json index ed35a1696..84a8eb425 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,9 @@ "name": "zeppelin-solidity", "version": "1.8.0", "description": "Secure Smart Contract library for Solidity", + "files": [ + "contracts" + ], "scripts": { "test": "scripts/test.sh", "lint": "eslint .", From 2010c6b464777118234ca0d0ff2cf64f6dc29411 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Thu, 19 Apr 2018 12:32:56 -0300 Subject: [PATCH 04/54] add prepack step to build contracts --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 84a8eb425..5f210e28c 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,11 @@ "version": "1.8.0", "description": "Secure Smart Contract library for Solidity", "files": [ - "contracts" + "contracts", + "build" ], "scripts": { + "prepack": "truffle compile", "test": "scripts/test.sh", "lint": "eslint .", "lint:fix": "eslint . --fix", From 85225ef6ae7d5057240dab1eedbc9b03803ada8b Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 20 Apr 2018 11:21:53 -0300 Subject: [PATCH 05/54] add mintable erc721 token --- contracts/token/ERC721/MintableERC721Token.sol | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 contracts/token/ERC721/MintableERC721Token.sol diff --git a/contracts/token/ERC721/MintableERC721Token.sol b/contracts/token/ERC721/MintableERC721Token.sol new file mode 100644 index 000000000..6c936f777 --- /dev/null +++ b/contracts/token/ERC721/MintableERC721Token.sol @@ -0,0 +1,13 @@ +pragma solidity ^0.4.21; + +import "./ERC721Token.sol"; +import "../../ownership/Ownable.sol"; + +/** + * @title Mintable ERC721 Token + */ +contract MintableERC721Token is Ownable, ERC721Token { + function mint(address _to, uint256 _tokenId) onlyOwner public { + _mint(_to, _tokenId); + } +} From eff3d7ca8e2791f82046f07b948592edebb6d7c2 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 20 Apr 2018 11:28:56 -0300 Subject: [PATCH 06/54] bump version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 5f210e28c..16eead5ca 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "zeppelin-solidity", - "version": "1.8.0", + "name": "openzeppelin-zos", + "version": "1.9.0-beta", "description": "Secure Smart Contract library for Solidity", "files": [ "contracts", From 89c32f5dd78efe87ae704e2639d6818b55b3fb48 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Wed, 18 Apr 2018 13:39:41 -0300 Subject: [PATCH 07/54] delete contracts and tests not yet in zos --- contracts/Bounty.sol | 72 ---- contracts/DayLimit.sol | 75 ---- contracts/ECRecovery.sol | 76 ---- contracts/LimitBalance.sol | 31 -- contracts/MerkleProof.sol | 35 -- contracts/ReentrancyGuard.sol | 32 -- contracts/access/SignatureBouncer.sol | 90 ----- contracts/crowdsale/Crowdsale.sol | 163 -------- .../distribution/FinalizableCrowdsale.sol | 42 -- .../distribution/PostDeliveryCrowdsale.sol | 37 -- .../distribution/RefundableCrowdsale.sol | 72 ---- .../distribution/utils/RefundVault.sol | 66 ---- .../crowdsale/emission/AllowanceCrowdsale.sol | 42 -- .../crowdsale/emission/MintedCrowdsale.sol | 22 -- .../price/IncreasingPriceCrowdsale.sol | 54 --- .../crowdsale/validation/CappedCrowdsale.sol | 43 -- .../IndividuallyCappedCrowdsale.sol | 76 ---- .../crowdsale/validation/TimedCrowdsale.sol | 58 --- .../validation/WhitelistedCrowdsale.sol | 58 --- contracts/examples/SampleCrowdsale.sol | 55 --- contracts/examples/SimpleSavingsWallet.sol | 40 -- contracts/examples/SimpleToken.sol | 30 -- contracts/lifecycle/Destructible.sol | 25 -- contracts/lifecycle/TokenDestructible.sol | 36 -- contracts/math/Math.sol | 24 -- contracts/mocks/AllowanceCrowdsaleImpl.sol | 21 - contracts/mocks/BouncerMock.sol | 22 -- contracts/mocks/CappedCrowdsaleImpl.sol | 21 - contracts/mocks/DayLimitMock.sol | 25 -- contracts/mocks/ECRecoveryMock.sol | 25 -- contracts/mocks/ERC223TokenMock.sol | 34 -- contracts/mocks/ERC827TokenMock.sol | 15 - contracts/mocks/FinalizableCrowdsaleImpl.sol | 22 -- contracts/mocks/ForceEther.sol | 16 - contracts/mocks/HasNoEtherTest.sol | 12 - .../mocks/IncreasingPriceCrowdsaleImpl.sol | 24 -- .../mocks/IndividuallyCappedCrowdsaleImpl.sol | 19 - contracts/mocks/InsecureTargetBounty.sol | 17 - contracts/mocks/LimitBalanceMock.sol | 13 - contracts/mocks/MathMock.sol | 26 -- contracts/mocks/MerkleProofWrapper.sol | 11 - contracts/mocks/MessageHelper.sol | 25 -- contracts/mocks/MintedCrowdsaleImpl.sol | 19 - contracts/mocks/PostDeliveryCrowdsaleImpl.sol | 22 -- contracts/mocks/PullPaymentMock.sol | 17 - contracts/mocks/RBACMock.sol | 69 ---- contracts/mocks/ReentrancyAttack.sol | 11 - contracts/mocks/ReentrancyMock.sol | 46 --- contracts/mocks/RefundableCrowdsaleImpl.sol | 24 -- contracts/mocks/SecureTargetBounty.sol | 17 - contracts/mocks/TimedCrowdsaleImpl.sol | 22 -- contracts/mocks/WhitelistMock.sol | 14 - contracts/mocks/WhitelistedCrowdsaleImpl.sol | 19 - contracts/ownership/CanReclaimToken.sol | 26 -- contracts/ownership/Claimable.sol | 39 -- contracts/ownership/Contactable.sol | 22 -- contracts/ownership/DelayedClaimable.sol | 40 -- contracts/ownership/HasNoContracts.sol | 22 -- contracts/ownership/HasNoEther.sol | 42 -- contracts/ownership/HasNoTokens.sol | 28 -- contracts/ownership/Heritable.sol | 117 ------ contracts/ownership/NoOwner.sol | 15 - contracts/ownership/Whitelist.sol | 81 ---- contracts/ownership/rbac/RBAC.sol | 108 ----- contracts/ownership/rbac/RBACWithAdmin.sol | 60 --- contracts/ownership/rbac/Roles.sol | 55 --- contracts/payment/PullPayment.sol | 43 -- contracts/payment/SplitPayment.sol | 71 ---- contracts/token/ERC20/CappedToken.sol | 31 -- contracts/token/ERC721/DeprecatedERC721.sol | 15 - contracts/token/ERC827/ERC827.sol | 25 -- contracts/token/ERC827/ERC827Token.sol | 139 ------- test/Bounty.test.js | 111 ------ test/DayLimit.test.js | 88 ----- test/Heritable.test.js | 136 ------- test/LimitBalance.test.js | 47 --- test/ReentrancyGuard.test.js | 31 -- test/SimpleSavingsWallet.test.js | 33 -- test/access/SignatureBouncer.test.js | 119 ------ test/crowdsale/AllowanceCrowdsale.test.js | 77 ---- test/crowdsale/CappedCrowdsale.test.js | 69 ---- test/crowdsale/Crowdsale.test.js | 81 ---- test/crowdsale/FinalizableCrowdsale.test.js | 62 --- .../IncreasingPriceCrowdsale.test.js | 92 ----- .../IndividuallyCappedCrowdsale.test.js | 107 ----- test/crowdsale/MintedCrowdsale.test.js | 61 --- test/crowdsale/PostDeliveryCrowdsale.test.js | 67 ---- test/crowdsale/RefundVault.test.js | 59 --- test/crowdsale/RefundableCrowdsale.test.js | 82 ---- test/crowdsale/TimedCrowdsale.test.js | 62 --- test/crowdsale/WhitelistedCrowdsale.test.js | 93 ----- test/examples/SampleCrowdsale.test.js | 126 ------ test/examples/SimpleToken.test.js | 41 -- test/library/ECRecovery.test.js | 77 ---- test/library/Math.test.js | 43 -- test/library/MerkleProof.test.js | 61 --- test/lifecycle/Destructible.test.js | 23 -- test/lifecycle/TokenDestructible.test.js | 37 -- test/ownership/CanReclaimToken.test.js | 35 -- test/ownership/Claimable.test.js | 53 --- test/ownership/Contactable.test.js | 28 -- test/ownership/DelayedClaimable.test.js | 55 --- test/ownership/HasNoContracts.test.js | 33 -- test/ownership/HasNoEther.test.js | 64 --- test/ownership/HasNoTokens.test.js | 40 -- test/ownership/Whitelist.test.js | 103 ----- test/ownership/rbac/RBAC.test.js | 98 ----- test/payment/PullPayment.test.js | 71 ---- test/payment/SplitPayment.test.js | 78 ---- test/token/ERC20/CappedToken.test.js | 36 -- test/token/ERC827/ERC827Token.js | 374 ------------------ 111 files changed, 5914 deletions(-) delete mode 100644 contracts/Bounty.sol delete mode 100644 contracts/DayLimit.sol delete mode 100644 contracts/ECRecovery.sol delete mode 100644 contracts/LimitBalance.sol delete mode 100644 contracts/MerkleProof.sol delete mode 100644 contracts/ReentrancyGuard.sol delete mode 100644 contracts/access/SignatureBouncer.sol delete mode 100644 contracts/crowdsale/Crowdsale.sol delete mode 100644 contracts/crowdsale/distribution/FinalizableCrowdsale.sol delete mode 100644 contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol delete mode 100644 contracts/crowdsale/distribution/RefundableCrowdsale.sol delete mode 100644 contracts/crowdsale/distribution/utils/RefundVault.sol delete mode 100644 contracts/crowdsale/emission/AllowanceCrowdsale.sol delete mode 100644 contracts/crowdsale/emission/MintedCrowdsale.sol delete mode 100644 contracts/crowdsale/price/IncreasingPriceCrowdsale.sol delete mode 100644 contracts/crowdsale/validation/CappedCrowdsale.sol delete mode 100644 contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol delete mode 100644 contracts/crowdsale/validation/TimedCrowdsale.sol delete mode 100644 contracts/crowdsale/validation/WhitelistedCrowdsale.sol delete mode 100644 contracts/examples/SampleCrowdsale.sol delete mode 100644 contracts/examples/SimpleSavingsWallet.sol delete mode 100644 contracts/examples/SimpleToken.sol delete mode 100644 contracts/lifecycle/Destructible.sol delete mode 100644 contracts/lifecycle/TokenDestructible.sol delete mode 100644 contracts/math/Math.sol delete mode 100644 contracts/mocks/AllowanceCrowdsaleImpl.sol delete mode 100644 contracts/mocks/BouncerMock.sol delete mode 100644 contracts/mocks/CappedCrowdsaleImpl.sol delete mode 100644 contracts/mocks/DayLimitMock.sol delete mode 100644 contracts/mocks/ECRecoveryMock.sol delete mode 100644 contracts/mocks/ERC223TokenMock.sol delete mode 100644 contracts/mocks/ERC827TokenMock.sol delete mode 100644 contracts/mocks/FinalizableCrowdsaleImpl.sol delete mode 100644 contracts/mocks/ForceEther.sol delete mode 100644 contracts/mocks/HasNoEtherTest.sol delete mode 100644 contracts/mocks/IncreasingPriceCrowdsaleImpl.sol delete mode 100644 contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol delete mode 100644 contracts/mocks/InsecureTargetBounty.sol delete mode 100644 contracts/mocks/LimitBalanceMock.sol delete mode 100644 contracts/mocks/MathMock.sol delete mode 100644 contracts/mocks/MerkleProofWrapper.sol delete mode 100644 contracts/mocks/MessageHelper.sol delete mode 100644 contracts/mocks/MintedCrowdsaleImpl.sol delete mode 100644 contracts/mocks/PostDeliveryCrowdsaleImpl.sol delete mode 100644 contracts/mocks/PullPaymentMock.sol delete mode 100644 contracts/mocks/RBACMock.sol delete mode 100644 contracts/mocks/ReentrancyAttack.sol delete mode 100644 contracts/mocks/ReentrancyMock.sol delete mode 100644 contracts/mocks/RefundableCrowdsaleImpl.sol delete mode 100644 contracts/mocks/SecureTargetBounty.sol delete mode 100644 contracts/mocks/TimedCrowdsaleImpl.sol delete mode 100644 contracts/mocks/WhitelistMock.sol delete mode 100644 contracts/mocks/WhitelistedCrowdsaleImpl.sol delete mode 100644 contracts/ownership/CanReclaimToken.sol delete mode 100644 contracts/ownership/Claimable.sol delete mode 100644 contracts/ownership/Contactable.sol delete mode 100644 contracts/ownership/DelayedClaimable.sol delete mode 100644 contracts/ownership/HasNoContracts.sol delete mode 100644 contracts/ownership/HasNoEther.sol delete mode 100644 contracts/ownership/HasNoTokens.sol delete mode 100644 contracts/ownership/Heritable.sol delete mode 100644 contracts/ownership/NoOwner.sol delete mode 100644 contracts/ownership/Whitelist.sol delete mode 100644 contracts/ownership/rbac/RBAC.sol delete mode 100644 contracts/ownership/rbac/RBACWithAdmin.sol delete mode 100644 contracts/ownership/rbac/Roles.sol delete mode 100644 contracts/payment/PullPayment.sol delete mode 100644 contracts/payment/SplitPayment.sol delete mode 100644 contracts/token/ERC20/CappedToken.sol delete mode 100644 contracts/token/ERC721/DeprecatedERC721.sol delete mode 100644 contracts/token/ERC827/ERC827.sol delete mode 100644 contracts/token/ERC827/ERC827Token.sol delete mode 100644 test/Bounty.test.js delete mode 100644 test/DayLimit.test.js delete mode 100644 test/Heritable.test.js delete mode 100644 test/LimitBalance.test.js delete mode 100644 test/ReentrancyGuard.test.js delete mode 100644 test/SimpleSavingsWallet.test.js delete mode 100644 test/access/SignatureBouncer.test.js delete mode 100644 test/crowdsale/AllowanceCrowdsale.test.js delete mode 100644 test/crowdsale/CappedCrowdsale.test.js delete mode 100644 test/crowdsale/Crowdsale.test.js delete mode 100644 test/crowdsale/FinalizableCrowdsale.test.js delete mode 100644 test/crowdsale/IncreasingPriceCrowdsale.test.js delete mode 100644 test/crowdsale/IndividuallyCappedCrowdsale.test.js delete mode 100644 test/crowdsale/MintedCrowdsale.test.js delete mode 100644 test/crowdsale/PostDeliveryCrowdsale.test.js delete mode 100644 test/crowdsale/RefundVault.test.js delete mode 100644 test/crowdsale/RefundableCrowdsale.test.js delete mode 100644 test/crowdsale/TimedCrowdsale.test.js delete mode 100644 test/crowdsale/WhitelistedCrowdsale.test.js delete mode 100644 test/examples/SampleCrowdsale.test.js delete mode 100644 test/examples/SimpleToken.test.js delete mode 100644 test/library/ECRecovery.test.js delete mode 100644 test/library/Math.test.js delete mode 100644 test/library/MerkleProof.test.js delete mode 100644 test/lifecycle/Destructible.test.js delete mode 100644 test/lifecycle/TokenDestructible.test.js delete mode 100644 test/ownership/CanReclaimToken.test.js delete mode 100644 test/ownership/Claimable.test.js delete mode 100644 test/ownership/Contactable.test.js delete mode 100644 test/ownership/DelayedClaimable.test.js delete mode 100644 test/ownership/HasNoContracts.test.js delete mode 100644 test/ownership/HasNoEther.test.js delete mode 100644 test/ownership/HasNoTokens.test.js delete mode 100644 test/ownership/Whitelist.test.js delete mode 100644 test/ownership/rbac/RBAC.test.js delete mode 100644 test/payment/PullPayment.test.js delete mode 100644 test/payment/SplitPayment.test.js delete mode 100644 test/token/ERC20/CappedToken.test.js delete mode 100644 test/token/ERC827/ERC827Token.js diff --git a/contracts/Bounty.sol b/contracts/Bounty.sol deleted file mode 100644 index 2f9879d96..000000000 --- a/contracts/Bounty.sol +++ /dev/null @@ -1,72 +0,0 @@ -pragma solidity ^0.4.21; - - -import "./payment/PullPayment.sol"; -import "./lifecycle/Destructible.sol"; - - -/** - * @title Bounty - * @dev This bounty will pay out to a researcher if they break invariant logic of the contract. - */ -contract Bounty is PullPayment, Destructible { - bool public claimed; - mapping(address => address) public researchers; - - event TargetCreated(address createdAddress); - - /** - * @dev Fallback function allowing the contract to receive funds, if they haven't already been claimed. - */ - function() external payable { - require(!claimed); - } - - /** - * @dev Create and deploy the target contract (extension of Target contract), and sets the - * msg.sender as a researcher - * @return A target contract - */ - function createTarget() public returns(Target) { - Target target = Target(deployContract()); - researchers[target] = msg.sender; - emit TargetCreated(target); - return target; - } - - /** - * @dev Sends the contract funds to the researcher that proved the contract is broken. - * @param target contract - */ - function claim(Target target) public { - address researcher = researchers[target]; - require(researcher != 0); - // Check Target contract invariants - require(!target.checkInvariant()); - asyncSend(researcher, address(this).balance); - claimed = true; - } - - /** - * @dev Internal function to deploy the target contract. - * @return A target contract address - */ - function deployContract() internal returns(address); - -} - - -/** - * @title Target - * @dev Your main contract should inherit from this class and implement the checkInvariant method. - */ -contract Target { - - /** - * @dev Checks all values a contract assumes to be true all the time. If this function returns - * false, the contract is broken in some way and is in an inconsistent state. - * In order to win the bounty, security researchers will try to cause this broken state. - * @return True if all invariant values are correct, false otherwise. - */ - function checkInvariant() public returns(bool); -} diff --git a/contracts/DayLimit.sol b/contracts/DayLimit.sol deleted file mode 100644 index 0bfa9b6d0..000000000 --- a/contracts/DayLimit.sol +++ /dev/null @@ -1,75 +0,0 @@ -pragma solidity ^0.4.21; - - -/** - * @title DayLimit - * @dev Base contract that enables methods to be protected by placing a linear limit (specifiable) - * on a particular resource per calendar day. Is multiowned to allow the limit to be altered. - */ -contract DayLimit { - - uint256 public dailyLimit; - uint256 public spentToday; - uint256 public lastDay; - - /** - * @dev Constructor that sets the passed value as a dailyLimit. - * @param _limit uint256 to represent the daily limit. - */ - function DayLimit(uint256 _limit) public { - dailyLimit = _limit; - lastDay = today(); - } - - /** - * @dev sets the daily limit. Does not alter the amount already spent today. - * @param _newLimit uint256 to represent the new limit. - */ - function _setDailyLimit(uint256 _newLimit) internal { - dailyLimit = _newLimit; - } - - /** - * @dev Resets the amount already spent today. - */ - function _resetSpentToday() internal { - spentToday = 0; - } - - /** - * @dev Checks to see if there is enough resource to spend today. If true, the resource may be expended. - * @param _value uint256 representing the amount of resource to spend. - * @return A boolean that is True if the resource was spent and false otherwise. - */ - function underLimit(uint256 _value) internal returns (bool) { - // reset the spend limit if we're on a different day to last time. - if (today() > lastDay) { - spentToday = 0; - lastDay = today(); - } - // check to see if there's enough left - if so, subtract and return true. - // overflow protection // dailyLimit check - if (spentToday + _value >= spentToday && spentToday + _value <= dailyLimit) { - spentToday += _value; - return true; - } - return false; - } - - /** - * @dev Private function to determine today's index - * @return uint256 of today's index. - */ - function today() private view returns (uint256) { - // solium-disable-next-line security/no-block-members - return block.timestamp / 1 days; - } - - /** - * @dev Simple modifier for daily limit. - */ - modifier limitedDaily(uint256 _value) { - require(underLimit(_value)); - _; - } -} diff --git a/contracts/ECRecovery.sol b/contracts/ECRecovery.sol deleted file mode 100644 index b2076f0e3..000000000 --- a/contracts/ECRecovery.sol +++ /dev/null @@ -1,76 +0,0 @@ -pragma solidity ^0.4.21; - - -/** - * @title Eliptic curve signature operations - * - * @dev Based on https://gist.github.com/axic/5b33912c6f61ae6fd96d6c4a47afde6d - * - * TODO Remove this library once solidity supports passing a signature to ecrecover. - * See https://github.com/ethereum/solidity/issues/864 - * - */ - -library ECRecovery { - - /** - * @dev Recover signer address from a message by using their signature - * @param hash bytes32 message, the hash is the signed message. What is recovered is the signer address. - * @param sig bytes signature, the signature is generated using web3.eth.sign() - */ - function recover(bytes32 hash, bytes sig) - internal - pure - returns (address) - { - bytes32 r; - bytes32 s; - uint8 v; - - // Check the signature length - if (sig.length != 65) { - return (address(0)); - } - - // Divide the signature in r, s and v variables - // ecrecover takes the signature parameters, and the only way to get them - // currently is to use assembly. - // solium-disable-next-line security/no-inline-assembly - assembly { - r := mload(add(sig, 32)) - s := mload(add(sig, 64)) - v := byte(0, mload(add(sig, 96))) - } - - // Version of signature should be 27 or 28, but 0 and 1 are also possible versions - if (v < 27) { - v += 27; - } - - // If the version is correct return the signer address - if (v != 27 && v != 28) { - return (address(0)); - } else { - // solium-disable-next-line arg-overflow - return ecrecover(hash, v, r, s); - } - } - - /** - * toEthSignedMessageHash - * @dev prefix a bytes32 value with "\x19Ethereum Signed Message:" - * @dev and hash the result - */ - function toEthSignedMessageHash(bytes32 hash) - internal - pure - returns (bytes32) - { - // 32 is the length in bytes of hash, - // enforced by the type signature above - return keccak256( - "\x19Ethereum Signed Message:\n32", - hash - ); - } -} diff --git a/contracts/LimitBalance.sol b/contracts/LimitBalance.sol deleted file mode 100644 index e3f28cac1..000000000 --- a/contracts/LimitBalance.sol +++ /dev/null @@ -1,31 +0,0 @@ -pragma solidity ^0.4.21; - - -/** - * @title LimitBalance - * @dev Simple contract to limit the balance of child contract. - * @dev Note this doesn't prevent other contracts to send funds by using selfdestruct(address); - * @dev See: https://github.com/ConsenSys/smart-contract-best-practices#remember-that-ether-can-be-forcibly-sent-to-an-account - */ -contract LimitBalance { - - uint256 public limit; - - /** - * @dev Constructor that sets the passed value as a limit. - * @param _limit uint256 to represent the limit. - */ - function LimitBalance(uint256 _limit) public { - limit = _limit; - } - - /** - * @dev Checks if limit was reached. Case true, it throws. - */ - modifier limitedPayable() { - require(address(this).balance <= limit); - _; - - } - -} diff --git a/contracts/MerkleProof.sol b/contracts/MerkleProof.sol deleted file mode 100644 index a7000c6f2..000000000 --- a/contracts/MerkleProof.sol +++ /dev/null @@ -1,35 +0,0 @@ -pragma solidity ^0.4.21; - - -/* - * @title MerkleProof - * @dev Merkle proof verification - * @note Based on https://github.com/ameensol/merkle-tree-solidity/blob/master/src/MerkleProof.sol - */ -library MerkleProof { - /* - * @dev Verifies a Merkle proof proving the existence of a leaf in a Merkle tree. Assumes that each pair of leaves - * and each pair of pre-images is sorted. - * @param _proof Merkle proof containing sibling hashes on the branch from the leaf to the root of the Merkle tree - * @param _root Merkle root - * @param _leaf Leaf of Merkle tree - */ - function verifyProof(bytes32[] _proof, bytes32 _root, bytes32 _leaf) internal pure returns (bool) { - bytes32 computedHash = _leaf; - - for (uint256 i = 0; i < _proof.length; i++) { - bytes32 proofElement = _proof[i]; - - if (computedHash < proofElement) { - // Hash(current computed hash + current element of the proof) - computedHash = keccak256(computedHash, proofElement); - } else { - // Hash(current element of the proof + current computed hash) - computedHash = keccak256(proofElement, computedHash); - } - } - - // Check if the computed hash (root) is equal to the provided root - return computedHash == _root; - } -} diff --git a/contracts/ReentrancyGuard.sol b/contracts/ReentrancyGuard.sol deleted file mode 100644 index 1b55ceebc..000000000 --- a/contracts/ReentrancyGuard.sol +++ /dev/null @@ -1,32 +0,0 @@ -pragma solidity ^0.4.21; - - -/** - * @title Helps contracts guard agains reentrancy attacks. - * @author Remco Bloemen - * @notice If you mark a function `nonReentrant`, you should also - * mark it `external`. - */ -contract ReentrancyGuard { - - /** - * @dev We use a single lock for the whole contract. - */ - bool private reentrancyLock = false; - - /** - * @dev Prevents a contract from calling itself, directly or indirectly. - * @notice If you mark a function `nonReentrant`, you should also - * mark it `external`. Calling one nonReentrant function from - * another is not supported. Instead, you can implement a - * `private` function doing the actual work, and a `external` - * wrapper marked as `nonReentrant`. - */ - modifier nonReentrant() { - require(!reentrancyLock); - reentrancyLock = true; - _; - reentrancyLock = false; - } - -} diff --git a/contracts/access/SignatureBouncer.sol b/contracts/access/SignatureBouncer.sol deleted file mode 100644 index ad0267de1..000000000 --- a/contracts/access/SignatureBouncer.sol +++ /dev/null @@ -1,90 +0,0 @@ -pragma solidity ^0.4.18; - -import "../ownership/Ownable.sol"; -import "../ownership/rbac/RBAC.sol"; -import "../ECRecovery.sol"; - -/** - * @title SignatureBouncer - * @author PhABC and Shrugs - * @dev Bouncer allows users to submit a signature as a permission to do an action. - * @dev If the signature is from one of the authorized bouncer addresses, the signature - * @dev is valid. The owner of the contract adds/removes bouncers. - * @dev Bouncer addresses can be individual servers signing grants or different - * @dev users within a decentralized club that have permission to invite other members. - * @dev - * @dev This technique is useful for whitelists and airdrops; instead of putting all - * @dev valid addresses on-chain, simply sign a grant of the form - * @dev keccak256(`:contractAddress` + `:granteeAddress`) using a valid bouncer address. - * @dev Then restrict access to your crowdsale/whitelist/airdrop using the - * @dev `onlyValidSignature` modifier (or implement your own using isValidSignature). - * @dev - * @dev See the tests Bouncer.test.js for specific usage examples. - */ -contract SignatureBouncer is Ownable, RBAC { - using ECRecovery for bytes32; - - string public constant ROLE_BOUNCER = "bouncer"; - - /** - * @dev requires that a valid signature of a bouncer was provided - */ - modifier onlyValidSignature(bytes _sig) - { - require(isValidSignature(msg.sender, _sig)); - _; - } - - /** - * @dev allows the owner to add additional bouncer addresses - */ - function addBouncer(address _bouncer) - onlyOwner - public - { - require(_bouncer != address(0)); - addRole(_bouncer, ROLE_BOUNCER); - } - - /** - * @dev allows the owner to remove bouncer addresses - */ - function removeBouncer(address _bouncer) - onlyOwner - public - { - require(_bouncer != address(0)); - removeRole(_bouncer, ROLE_BOUNCER); - } - - /** - * @dev is the signature of `this + sender` from a bouncer? - * @return bool - */ - function isValidSignature(address _address, bytes _sig) - internal - view - returns (bool) - { - return isValidDataHash( - keccak256(address(this), _address), - _sig - ); - } - - /** - * @dev internal function to convert a hash to an eth signed message - * @dev and then recover the signature and check it against the bouncer role - * @return bool - */ - function isValidDataHash(bytes32 hash, bytes _sig) - internal - view - returns (bool) - { - address signer = hash - .toEthSignedMessageHash() - .recover(_sig); - return hasRole(signer, ROLE_BOUNCER); - } -} diff --git a/contracts/crowdsale/Crowdsale.sol b/contracts/crowdsale/Crowdsale.sol deleted file mode 100644 index cbb59eabc..000000000 --- a/contracts/crowdsale/Crowdsale.sol +++ /dev/null @@ -1,163 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/ERC20.sol"; -import "../math/SafeMath.sol"; - - -/** - * @title Crowdsale - * @dev Crowdsale is a base contract for managing a token crowdsale, - * allowing investors to purchase tokens with ether. This contract implements - * such functionality in its most fundamental form and can be extended to provide additional - * functionality and/or custom behavior. - * The external interface represents the basic interface for purchasing tokens, and conform - * the base architecture for crowdsales. They are *not* intended to be modified / overriden. - * The internal interface conforms the extensible and modifiable surface of crowdsales. Override - * the methods to add functionality. Consider using 'super' where appropiate to concatenate - * behavior. - */ -contract Crowdsale { - using SafeMath for uint256; - - // The token being sold - ERC20 public token; - - // Address where funds are collected - address public wallet; - - // How many token units a buyer gets per wei - uint256 public rate; - - // Amount of wei raised - uint256 public weiRaised; - - /** - * Event for token purchase logging - * @param purchaser who paid for the tokens - * @param beneficiary who got the tokens - * @param value weis paid for purchase - * @param amount amount of tokens purchased - */ - event TokenPurchase(address indexed purchaser, address indexed beneficiary, uint256 value, uint256 amount); - - /** - * @param _rate Number of token units a buyer gets per wei - * @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 { - require(_rate > 0); - require(_wallet != address(0)); - require(_token != address(0)); - - rate = _rate; - wallet = _wallet; - token = _token; - } - - // ----------------------------------------- - // Crowdsale external interface - // ----------------------------------------- - - /** - * @dev fallback function ***DO NOT OVERRIDE*** - */ - function () external payable { - buyTokens(msg.sender); - } - - /** - * @dev low level token purchase ***DO NOT OVERRIDE*** - * @param _beneficiary Address performing the token purchase - */ - function buyTokens(address _beneficiary) public payable { - - uint256 weiAmount = msg.value; - _preValidatePurchase(_beneficiary, weiAmount); - - // calculate token amount to be created - uint256 tokens = _getTokenAmount(weiAmount); - - // update state - weiRaised = weiRaised.add(weiAmount); - - _processPurchase(_beneficiary, tokens); - emit TokenPurchase( - msg.sender, - _beneficiary, - weiAmount, - tokens - ); - - _updatePurchasingState(_beneficiary, weiAmount); - - _forwardFunds(); - _postValidatePurchase(_beneficiary, weiAmount); - } - - // ----------------------------------------- - // Internal interface (extensible) - // ----------------------------------------- - - /** - * @dev Validation of an incoming purchase. Use require statements to revert state when conditions are not met. Use super to concatenate validations. - * @param _beneficiary Address performing the token purchase - * @param _weiAmount Value in wei involved in the purchase - */ - function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal { - require(_beneficiary != address(0)); - require(_weiAmount != 0); - } - - /** - * @dev Validation of an executed purchase. Observe state and use revert statements to undo rollback when valid conditions are not met. - * @param _beneficiary Address performing the token purchase - * @param _weiAmount Value in wei involved in the purchase - */ - function _postValidatePurchase(address _beneficiary, uint256 _weiAmount) internal { - // optional override - } - - /** - * @dev Source of tokens. Override this method to modify the way in which the crowdsale ultimately gets and sends its tokens. - * @param _beneficiary Address performing the token purchase - * @param _tokenAmount Number of tokens to be emitted - */ - function _deliverTokens(address _beneficiary, uint256 _tokenAmount) internal { - token.transfer(_beneficiary, _tokenAmount); - } - - /** - * @dev Executed when a purchase has been validated and is ready to be executed. Not necessarily emits/sends tokens. - * @param _beneficiary Address receiving the tokens - * @param _tokenAmount Number of tokens to be purchased - */ - function _processPurchase(address _beneficiary, uint256 _tokenAmount) internal { - _deliverTokens(_beneficiary, _tokenAmount); - } - - /** - * @dev Override for extensions that require an internal state to check for validity (current user contributions, etc.) - * @param _beneficiary Address receiving the tokens - * @param _weiAmount Value in wei involved in the purchase - */ - function _updatePurchasingState(address _beneficiary, uint256 _weiAmount) internal { - // optional override - } - - /** - * @dev Override to extend the way in which ether is converted to tokens. - * @param _weiAmount Value in wei to be converted into tokens - * @return Number of tokens that can be purchased with the specified _weiAmount - */ - function _getTokenAmount(uint256 _weiAmount) internal view returns (uint256) { - return _weiAmount.mul(rate); - } - - /** - * @dev Determines how ETH is stored/forwarded on purchases. - */ - function _forwardFunds() internal { - wallet.transfer(msg.value); - } -} diff --git a/contracts/crowdsale/distribution/FinalizableCrowdsale.sol b/contracts/crowdsale/distribution/FinalizableCrowdsale.sol deleted file mode 100644 index d15d4f62b..000000000 --- a/contracts/crowdsale/distribution/FinalizableCrowdsale.sol +++ /dev/null @@ -1,42 +0,0 @@ -pragma solidity ^0.4.21; - -import "../../math/SafeMath.sol"; -import "../../ownership/Ownable.sol"; -import "../validation/TimedCrowdsale.sol"; - - -/** - * @title FinalizableCrowdsale - * @dev Extension of Crowdsale where an owner can do extra work - * after finishing. - */ -contract FinalizableCrowdsale is TimedCrowdsale, Ownable { - using SafeMath for uint256; - - bool public isFinalized = false; - - event Finalized(); - - /** - * @dev Must be called after crowdsale ends, to do some extra finalization - * work. Calls the contract's finalization function. - */ - function finalize() onlyOwner public { - require(!isFinalized); - require(hasClosed()); - - finalization(); - emit Finalized(); - - isFinalized = true; - } - - /** - * @dev Can be overridden to add finalization logic. The overriding function - * should call super.finalization() to ensure the chain of finalization is - * executed entirely. - */ - function finalization() internal { - } - -} diff --git a/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol b/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol deleted file mode 100644 index ac5daff99..000000000 --- a/contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol +++ /dev/null @@ -1,37 +0,0 @@ -pragma solidity ^0.4.21; - -import "../validation/TimedCrowdsale.sol"; -import "../../token/ERC20/ERC20.sol"; -import "../../math/SafeMath.sol"; - - -/** - * @title PostDeliveryCrowdsale - * @dev Crowdsale that locks tokens from withdrawal until it ends. - */ -contract PostDeliveryCrowdsale is TimedCrowdsale { - using SafeMath for uint256; - - mapping(address => uint256) public balances; - - /** - * @dev Withdraw tokens only after crowdsale ends. - */ - function withdrawTokens() public { - require(hasClosed()); - uint256 amount = balances[msg.sender]; - require(amount > 0); - balances[msg.sender] = 0; - _deliverTokens(msg.sender, amount); - } - - /** - * @dev Overrides parent by storing balances instead of issuing tokens right away. - * @param _beneficiary Token purchaser - * @param _tokenAmount Amount of tokens purchased - */ - function _processPurchase(address _beneficiary, uint256 _tokenAmount) internal { - balances[_beneficiary] = balances[_beneficiary].add(_tokenAmount); - } - -} diff --git a/contracts/crowdsale/distribution/RefundableCrowdsale.sol b/contracts/crowdsale/distribution/RefundableCrowdsale.sol deleted file mode 100644 index 9b3819ea4..000000000 --- a/contracts/crowdsale/distribution/RefundableCrowdsale.sol +++ /dev/null @@ -1,72 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../../math/SafeMath.sol"; -import "./FinalizableCrowdsale.sol"; -import "./utils/RefundVault.sol"; - - -/** - * @title RefundableCrowdsale - * @dev Extension of Crowdsale contract that adds a funding goal, and - * the possibility of users getting a refund if goal is not met. - * Uses a RefundVault as the crowdsale's vault. - */ -contract RefundableCrowdsale is FinalizableCrowdsale { - using SafeMath for uint256; - - // minimum amount of funds to be raised in weis - uint256 public goal; - - // refund vault used to hold funds while crowdsale is running - RefundVault public vault; - - /** - * @dev Constructor, creates RefundVault. - * @param _goal Funding goal - */ - function RefundableCrowdsale(uint256 _goal) public { - require(_goal > 0); - vault = new RefundVault(wallet); - goal = _goal; - } - - /** - * @dev Investors can claim refunds here if crowdsale is unsuccessful - */ - function claimRefund() public { - require(isFinalized); - require(!goalReached()); - - vault.refund(msg.sender); - } - - /** - * @dev Checks whether funding goal was reached. - * @return Whether funding goal was reached - */ - function goalReached() public view returns (bool) { - return weiRaised >= goal; - } - - /** - * @dev vault finalization task, called when owner calls finalize() - */ - function finalization() internal { - if (goalReached()) { - vault.close(); - } else { - vault.enableRefunds(); - } - - super.finalization(); - } - - /** - * @dev Overrides Crowdsale fund forwarding, sending funds to vault. - */ - function _forwardFunds() internal { - vault.deposit.value(msg.value)(msg.sender); - } - -} diff --git a/contracts/crowdsale/distribution/utils/RefundVault.sol b/contracts/crowdsale/distribution/utils/RefundVault.sol deleted file mode 100644 index 17a69b08c..000000000 --- a/contracts/crowdsale/distribution/utils/RefundVault.sol +++ /dev/null @@ -1,66 +0,0 @@ -pragma solidity ^0.4.21; - -import "../../../math/SafeMath.sol"; -import "../../../ownership/Ownable.sol"; - - -/** - * @title RefundVault - * @dev This contract is used for storing funds while a crowdsale - * is in progress. Supports refunding the money if crowdsale fails, - * and forwarding it if crowdsale is successful. - */ -contract RefundVault is Ownable { - using SafeMath for uint256; - - enum State { Active, Refunding, Closed } - - mapping (address => uint256) public deposited; - address public wallet; - State public state; - - event Closed(); - event RefundsEnabled(); - event Refunded(address indexed beneficiary, uint256 weiAmount); - - /** - * @param _wallet Vault address - */ - function RefundVault(address _wallet) public { - require(_wallet != address(0)); - wallet = _wallet; - state = State.Active; - } - - /** - * @param investor Investor address - */ - function deposit(address investor) onlyOwner public payable { - require(state == State.Active); - deposited[investor] = deposited[investor].add(msg.value); - } - - function close() onlyOwner public { - require(state == State.Active); - state = State.Closed; - emit Closed(); - wallet.transfer(address(this).balance); - } - - function enableRefunds() onlyOwner public { - require(state == State.Active); - state = State.Refunding; - emit RefundsEnabled(); - } - - /** - * @param investor Investor address - */ - function refund(address investor) public { - require(state == State.Refunding); - uint256 depositedValue = deposited[investor]; - deposited[investor] = 0; - investor.transfer(depositedValue); - emit Refunded(investor, depositedValue); - } -} diff --git a/contracts/crowdsale/emission/AllowanceCrowdsale.sol b/contracts/crowdsale/emission/AllowanceCrowdsale.sol deleted file mode 100644 index ae8fe5992..000000000 --- a/contracts/crowdsale/emission/AllowanceCrowdsale.sol +++ /dev/null @@ -1,42 +0,0 @@ -pragma solidity ^0.4.21; - -import "../Crowdsale.sol"; -import "../../token/ERC20/ERC20.sol"; -import "../../math/SafeMath.sol"; - - -/** - * @title AllowanceCrowdsale - * @dev Extension of Crowdsale where tokens are held by a wallet, which approves an allowance to the crowdsale. - */ -contract AllowanceCrowdsale is Crowdsale { - using SafeMath for uint256; - - address public tokenWallet; - - /** - * @dev Constructor, takes token wallet address. - * @param _tokenWallet Address holding the tokens, which has approved allowance to the crowdsale - */ - function AllowanceCrowdsale(address _tokenWallet) public { - require(_tokenWallet != address(0)); - tokenWallet = _tokenWallet; - } - - /** - * @dev Checks the amount of tokens left in the allowance. - * @return Amount of tokens left in the allowance - */ - function remainingTokens() public view returns (uint256) { - return token.allowance(tokenWallet, this); - } - - /** - * @dev Overrides parent behavior by transferring tokens from wallet. - * @param _beneficiary Token purchaser - * @param _tokenAmount Amount of tokens purchased - */ - function _deliverTokens(address _beneficiary, uint256 _tokenAmount) internal { - token.transferFrom(tokenWallet, _beneficiary, _tokenAmount); - } -} diff --git a/contracts/crowdsale/emission/MintedCrowdsale.sol b/contracts/crowdsale/emission/MintedCrowdsale.sol deleted file mode 100644 index 4d30de156..000000000 --- a/contracts/crowdsale/emission/MintedCrowdsale.sol +++ /dev/null @@ -1,22 +0,0 @@ -pragma solidity ^0.4.21; - -import "../Crowdsale.sol"; -import "../../token/ERC20/MintableToken.sol"; - - -/** - * @title MintedCrowdsale - * @dev Extension of Crowdsale contract whose tokens are minted in each purchase. - * Token ownership should be transferred to MintedCrowdsale for minting. - */ -contract MintedCrowdsale is Crowdsale { - - /** - * @dev Overrides delivery by minting tokens upon purchase. - * @param _beneficiary Token purchaser - * @param _tokenAmount Number of tokens to be minted - */ - function _deliverTokens(address _beneficiary, uint256 _tokenAmount) internal { - require(MintableToken(token).mint(_beneficiary, _tokenAmount)); - } -} diff --git a/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol b/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol deleted file mode 100644 index c9f773bf4..000000000 --- a/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol +++ /dev/null @@ -1,54 +0,0 @@ -pragma solidity ^0.4.21; - -import "../validation/TimedCrowdsale.sol"; -import "../../math/SafeMath.sol"; - - -/** - * @title IncreasingPriceCrowdsale - * @dev Extension of Crowdsale contract that increases the price of tokens linearly in time. - * Note that what should be provided to the constructor is the initial and final _rates_, that is, - * the amount of tokens per wei contributed. Thus, the initial rate must be greater than the final rate. - */ -contract IncreasingPriceCrowdsale is TimedCrowdsale { - using SafeMath for uint256; - - uint256 public initialRate; - uint256 public finalRate; - - /** - * @dev Constructor, takes intial and final rates of tokens received per wei contributed. - * @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 { - require(_initialRate >= _finalRate); - require(_finalRate > 0); - initialRate = _initialRate; - finalRate = _finalRate; - } - - /** - * @dev Returns the rate of tokens per wei at the present time. - * Note that, as price _increases_ with time, the rate _decreases_. - * @return The number of tokens a buyer gets per wei at a given time - */ - function getCurrentRate() public view returns (uint256) { - // solium-disable-next-line security/no-block-members - uint256 elapsedTime = block.timestamp.sub(openingTime); - uint256 timeRange = closingTime.sub(openingTime); - uint256 rateRange = initialRate.sub(finalRate); - return initialRate.sub(elapsedTime.mul(rateRange).div(timeRange)); - } - - /** - * @dev Overrides parent method taking into account variable rate. - * @param _weiAmount The value in wei to be converted into tokens - * @return The number of tokens _weiAmount wei will buy at present time - */ - function _getTokenAmount(uint256 _weiAmount) internal view returns (uint256) { - uint256 currentRate = getCurrentRate(); - return currentRate.mul(_weiAmount); - } - -} diff --git a/contracts/crowdsale/validation/CappedCrowdsale.sol b/contracts/crowdsale/validation/CappedCrowdsale.sol deleted file mode 100644 index 0b899665a..000000000 --- a/contracts/crowdsale/validation/CappedCrowdsale.sol +++ /dev/null @@ -1,43 +0,0 @@ -pragma solidity ^0.4.21; - -import "../../math/SafeMath.sol"; -import "../Crowdsale.sol"; - - -/** - * @title CappedCrowdsale - * @dev Crowdsale with a limit for total contributions. - */ -contract CappedCrowdsale is Crowdsale { - using SafeMath for uint256; - - uint256 public cap; - - /** - * @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 { - require(_cap > 0); - cap = _cap; - } - - /** - * @dev Checks whether the cap has been reached. - * @return Whether the cap was reached - */ - function capReached() public view returns (bool) { - return weiRaised >= cap; - } - - /** - * @dev Extend parent behavior requiring purchase to respect the funding cap. - * @param _beneficiary Token purchaser - * @param _weiAmount Amount of wei contributed - */ - function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal { - super._preValidatePurchase(_beneficiary, _weiAmount); - require(weiRaised.add(_weiAmount) <= cap); - } - -} diff --git a/contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol b/contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol deleted file mode 100644 index ee363deb8..000000000 --- a/contracts/crowdsale/validation/IndividuallyCappedCrowdsale.sol +++ /dev/null @@ -1,76 +0,0 @@ -pragma solidity ^0.4.21; - -import "../../math/SafeMath.sol"; -import "../Crowdsale.sol"; -import "../../ownership/Ownable.sol"; - - -/** - * @title IndividuallyCappedCrowdsale - * @dev Crowdsale with per-user caps. - */ -contract IndividuallyCappedCrowdsale is Crowdsale, Ownable { - using SafeMath for uint256; - - mapping(address => uint256) public contributions; - mapping(address => uint256) public caps; - - /** - * @dev Sets a specific user's maximum contribution. - * @param _beneficiary Address to be capped - * @param _cap Wei limit for individual contribution - */ - function setUserCap(address _beneficiary, uint256 _cap) external onlyOwner { - caps[_beneficiary] = _cap; - } - - /** - * @dev Sets a group of users' maximum contribution. - * @param _beneficiaries List of addresses to be capped - * @param _cap Wei limit for individual contribution - */ - function setGroupCap(address[] _beneficiaries, uint256 _cap) external onlyOwner { - for (uint256 i = 0; i < _beneficiaries.length; i++) { - caps[_beneficiaries[i]] = _cap; - } - } - - /** - * @dev Returns the cap of a specific user. - * @param _beneficiary Address whose cap is to be checked - * @return Current cap for individual user - */ - function getUserCap(address _beneficiary) public view returns (uint256) { - return caps[_beneficiary]; - } - - /** - * @dev Returns the amount contributed so far by a sepecific user. - * @param _beneficiary Address of contributor - * @return User contribution so far - */ - function getUserContribution(address _beneficiary) public view returns (uint256) { - return contributions[_beneficiary]; - } - - /** - * @dev Extend parent behavior requiring purchase to respect the user's funding cap. - * @param _beneficiary Token purchaser - * @param _weiAmount Amount of wei contributed - */ - function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal { - super._preValidatePurchase(_beneficiary, _weiAmount); - require(contributions[_beneficiary].add(_weiAmount) <= caps[_beneficiary]); - } - - /** - * @dev Extend parent behavior to update user contributions - * @param _beneficiary Token purchaser - * @param _weiAmount Amount of wei contributed - */ - function _updatePurchasingState(address _beneficiary, uint256 _weiAmount) internal { - super._updatePurchasingState(_beneficiary, _weiAmount); - contributions[_beneficiary] = contributions[_beneficiary].add(_weiAmount); - } - -} diff --git a/contracts/crowdsale/validation/TimedCrowdsale.sol b/contracts/crowdsale/validation/TimedCrowdsale.sol deleted file mode 100644 index 9977990a7..000000000 --- a/contracts/crowdsale/validation/TimedCrowdsale.sol +++ /dev/null @@ -1,58 +0,0 @@ -pragma solidity ^0.4.21; - -import "../../math/SafeMath.sol"; -import "../Crowdsale.sol"; - - -/** - * @title TimedCrowdsale - * @dev Crowdsale accepting contributions only within a time frame. - */ -contract TimedCrowdsale is Crowdsale { - using SafeMath for uint256; - - uint256 public openingTime; - uint256 public closingTime; - - /** - * @dev Reverts if not in crowdsale time range. - */ - modifier onlyWhileOpen { - // solium-disable-next-line security/no-block-members - require(block.timestamp >= openingTime && block.timestamp <= closingTime); - _; - } - - /** - * @dev Constructor, takes crowdsale opening and closing times. - * @param _openingTime Crowdsale opening time - * @param _closingTime Crowdsale closing time - */ - function TimedCrowdsale(uint256 _openingTime, uint256 _closingTime) public { - // solium-disable-next-line security/no-block-members - require(_openingTime >= block.timestamp); - require(_closingTime >= _openingTime); - - openingTime = _openingTime; - closingTime = _closingTime; - } - - /** - * @dev Checks whether the period in which the crowdsale is open has already elapsed. - * @return Whether crowdsale period has elapsed - */ - function hasClosed() public view returns (bool) { - // solium-disable-next-line security/no-block-members - return block.timestamp > closingTime; - } - - /** - * @dev Extend parent behavior requiring to be within contributing period - * @param _beneficiary Token purchaser - * @param _weiAmount Amount of wei contributed - */ - function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal onlyWhileOpen { - super._preValidatePurchase(_beneficiary, _weiAmount); - } - -} diff --git a/contracts/crowdsale/validation/WhitelistedCrowdsale.sol b/contracts/crowdsale/validation/WhitelistedCrowdsale.sol deleted file mode 100644 index bbccd58a4..000000000 --- a/contracts/crowdsale/validation/WhitelistedCrowdsale.sol +++ /dev/null @@ -1,58 +0,0 @@ -pragma solidity ^0.4.21; - -import "../Crowdsale.sol"; -import "../../ownership/Ownable.sol"; - - -/** - * @title WhitelistedCrowdsale - * @dev Crowdsale in which only whitelisted users can contribute. - */ -contract WhitelistedCrowdsale is Crowdsale, Ownable { - - mapping(address => bool) public whitelist; - - /** - * @dev Reverts if beneficiary is not whitelisted. Can be used when extending this contract. - */ - modifier isWhitelisted(address _beneficiary) { - require(whitelist[_beneficiary]); - _; - } - - /** - * @dev Adds single address to whitelist. - * @param _beneficiary Address to be added to the whitelist - */ - function addToWhitelist(address _beneficiary) external onlyOwner { - whitelist[_beneficiary] = true; - } - - /** - * @dev Adds list of addresses to whitelist. Not overloaded due to limitations with truffle testing. - * @param _beneficiaries Addresses to be added to the whitelist - */ - function addManyToWhitelist(address[] _beneficiaries) external onlyOwner { - for (uint256 i = 0; i < _beneficiaries.length; i++) { - whitelist[_beneficiaries[i]] = true; - } - } - - /** - * @dev Removes single address from whitelist. - * @param _beneficiary Address to be removed to the whitelist - */ - function removeFromWhitelist(address _beneficiary) external onlyOwner { - whitelist[_beneficiary] = false; - } - - /** - * @dev Extend parent behavior requiring beneficiary to be in whitelist. - * @param _beneficiary Token beneficiary - * @param _weiAmount Amount of wei contributed - */ - function _preValidatePurchase(address _beneficiary, uint256 _weiAmount) internal isWhitelisted(_beneficiary) { - super._preValidatePurchase(_beneficiary, _weiAmount); - } - -} diff --git a/contracts/examples/SampleCrowdsale.sol b/contracts/examples/SampleCrowdsale.sol deleted file mode 100644 index 8067a5aa9..000000000 --- a/contracts/examples/SampleCrowdsale.sol +++ /dev/null @@ -1,55 +0,0 @@ -pragma solidity ^0.4.21; - -import "../crowdsale/validation/CappedCrowdsale.sol"; -import "../crowdsale/distribution/RefundableCrowdsale.sol"; -import "../crowdsale/emission/MintedCrowdsale.sol"; -import "../token/ERC20/MintableToken.sol"; - - -/** - * @title SampleCrowdsaleToken - * @dev Very simple ERC20 Token that can be minted. - * It is meant to be used in a crowdsale contract. - */ -contract SampleCrowdsaleToken is MintableToken { - - string public constant name = "Sample Crowdsale Token"; // solium-disable-line uppercase - string public constant symbol = "SCT"; // solium-disable-line uppercase - uint8 public constant decimals = 18; // solium-disable-line uppercase - -} - - -/** - * @title SampleCrowdsale - * @dev This is an example of a fully fledged crowdsale. - * The way to add new features to a base crowdsale is by multiple inheritance. - * In this example we are providing following extensions: - * CappedCrowdsale - sets a max boundary for raised funds - * RefundableCrowdsale - set a min goal to be reached and returns funds if it's not met - * - * After adding multiple features it's good practice to run integration tests - * to ensure that subcontracts works together as intended. - */ -contract SampleCrowdsale is CappedCrowdsale, RefundableCrowdsale, MintedCrowdsale { - - function SampleCrowdsale( - uint256 _openingTime, - uint256 _closingTime, - uint256 _rate, - address _wallet, - uint256 _cap, - MintableToken _token, - uint256 _goal - ) - public - Crowdsale(_rate, _wallet, _token) - CappedCrowdsale(_cap) - TimedCrowdsale(_openingTime, _closingTime) - RefundableCrowdsale(_goal) - { - //As goal needs to be met for a successful crowdsale - //the value needs to less or equal than a cap which is limit for accepted funds - require(_goal <= _cap); - } -} diff --git a/contracts/examples/SimpleSavingsWallet.sol b/contracts/examples/SimpleSavingsWallet.sol deleted file mode 100644 index ea02acec2..000000000 --- a/contracts/examples/SimpleSavingsWallet.sol +++ /dev/null @@ -1,40 +0,0 @@ -pragma solidity ^0.4.21; - -import "../ownership/Heritable.sol"; - - -/** - * @title SimpleSavingsWallet - * @dev Simplest form of savings wallet whose ownership can be claimed by a heir - * if owner dies. - * In this example, we take a very simple savings wallet providing two operations - * (to send and receive funds) and extend its capabilities by making it Heritable. - * The account that creates the contract is set as owner, who has the authority to - * choose an heir account. Heir account can reclaim the contract ownership in the - * case that the owner dies. - */ -contract SimpleSavingsWallet is Heritable { - - event Sent(address indexed payee, uint256 amount, uint256 balance); - event Received(address indexed payer, uint256 amount, uint256 balance); - - - function SimpleSavingsWallet(uint256 _heartbeatTimeout) Heritable(_heartbeatTimeout) public {} - - /** - * @dev wallet can receive funds. - */ - function () public payable { - emit Received(msg.sender, msg.value, address(this).balance); - } - - /** - * @dev wallet can send funds - */ - function sendTo(address payee, uint256 amount) public onlyOwner { - require(payee != 0 && payee != address(this)); - require(amount > 0); - payee.transfer(amount); - emit Sent(payee, amount, address(this).balance); - } -} diff --git a/contracts/examples/SimpleToken.sol b/contracts/examples/SimpleToken.sol deleted file mode 100644 index a394f9dc7..000000000 --- a/contracts/examples/SimpleToken.sol +++ /dev/null @@ -1,30 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../token/ERC20/StandardToken.sol"; - - -/** - * @title SimpleToken - * @dev Very simple ERC20 Token example, where all tokens are pre-assigned to the creator. - * Note they can later distribute these tokens as they wish using `transfer` and other - * `StandardToken` functions. - */ -contract SimpleToken is StandardToken { - - string public constant name = "SimpleToken"; // solium-disable-line uppercase - string public constant symbol = "SIM"; // solium-disable-line uppercase - uint8 public constant decimals = 18; // solium-disable-line uppercase - - uint256 public constant INITIAL_SUPPLY = 10000 * (10 ** uint256(decimals)); - - /** - * @dev Constructor that gives msg.sender all of existing tokens. - */ - function SimpleToken() public { - totalSupply_ = INITIAL_SUPPLY; - balances[msg.sender] = INITIAL_SUPPLY; - emit Transfer(0x0, msg.sender, INITIAL_SUPPLY); - } - -} diff --git a/contracts/lifecycle/Destructible.sol b/contracts/lifecycle/Destructible.sol deleted file mode 100644 index cfb288d4e..000000000 --- a/contracts/lifecycle/Destructible.sol +++ /dev/null @@ -1,25 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../ownership/Ownable.sol"; - - -/** - * @title Destructible - * @dev Base contract that can be destroyed by owner. All funds in contract will be sent to the owner. - */ -contract Destructible is Ownable { - - function Destructible() public payable { } - - /** - * @dev Transfers the current balance to the owner and terminates the contract. - */ - function destroy() onlyOwner public { - selfdestruct(owner); - } - - function destroyAndSend(address _recipient) onlyOwner public { - selfdestruct(_recipient); - } -} diff --git a/contracts/lifecycle/TokenDestructible.sol b/contracts/lifecycle/TokenDestructible.sol deleted file mode 100644 index 6ebe9c015..000000000 --- a/contracts/lifecycle/TokenDestructible.sol +++ /dev/null @@ -1,36 +0,0 @@ -pragma solidity ^0.4.21; - -import "../ownership/Ownable.sol"; -import "../token/ERC20/ERC20Basic.sol"; - - -/** - * @title TokenDestructible: - * @author Remco Bloemen - * @dev Base contract that can be destroyed by owner. All funds in contract including - * listed tokens will be sent to the owner. - */ -contract TokenDestructible is Ownable { - - function TokenDestructible() public payable { } - - /** - * @notice Terminate contract and refund to owner - * @param tokens List of addresses of ERC20 or ERC20Basic token contracts to - refund. - * @notice The called token contracts could try to re-enter this contract. Only - supply token contracts you trust. - */ - function destroy(address[] tokens) onlyOwner public { - - // Transfer tokens to owner - for (uint256 i = 0; i < tokens.length; i++) { - ERC20Basic token = ERC20Basic(tokens[i]); - uint256 balance = token.balanceOf(this); - token.transfer(owner, balance); - } - - // Transfer Eth to owner and terminate contract - selfdestruct(owner); - } -} diff --git a/contracts/math/Math.sol b/contracts/math/Math.sol deleted file mode 100644 index 0532ecb30..000000000 --- a/contracts/math/Math.sol +++ /dev/null @@ -1,24 +0,0 @@ -pragma solidity ^0.4.21; - - -/** - * @title Math - * @dev Assorted math operations - */ -library Math { - function max64(uint64 a, uint64 b) internal pure returns (uint64) { - return a >= b ? a : b; - } - - function min64(uint64 a, uint64 b) internal pure returns (uint64) { - return a < b ? a : b; - } - - function max256(uint256 a, uint256 b) internal pure returns (uint256) { - return a >= b ? a : b; - } - - function min256(uint256 a, uint256 b) internal pure returns (uint256) { - return a < b ? a : b; - } -} diff --git a/contracts/mocks/AllowanceCrowdsaleImpl.sol b/contracts/mocks/AllowanceCrowdsaleImpl.sol deleted file mode 100644 index e3ffabed3..000000000 --- a/contracts/mocks/AllowanceCrowdsaleImpl.sol +++ /dev/null @@ -1,21 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/ERC20.sol"; -import "../crowdsale/emission/AllowanceCrowdsale.sol"; - - -contract AllowanceCrowdsaleImpl is AllowanceCrowdsale { - - function AllowanceCrowdsaleImpl ( - uint256 _rate, - address _wallet, - ERC20 _token, - address _tokenWallet - ) - public - Crowdsale(_rate, _wallet, _token) - AllowanceCrowdsale(_tokenWallet) - { - } - -} diff --git a/contracts/mocks/BouncerMock.sol b/contracts/mocks/BouncerMock.sol deleted file mode 100644 index 2add95874..000000000 --- a/contracts/mocks/BouncerMock.sol +++ /dev/null @@ -1,22 +0,0 @@ -pragma solidity ^0.4.18; - -import "../access/SignatureBouncer.sol"; - - -contract SignatureBouncerMock is SignatureBouncer { - function checkValidSignature(address _address, bytes _sig) - public - view - returns (bool) - { - return isValidSignature(_address, _sig); - } - - function onlyWithValidSignature(bytes _sig) - onlyValidSignature(_sig) - public - view - { - - } -} diff --git a/contracts/mocks/CappedCrowdsaleImpl.sol b/contracts/mocks/CappedCrowdsaleImpl.sol deleted file mode 100644 index 5666d4fd9..000000000 --- a/contracts/mocks/CappedCrowdsaleImpl.sol +++ /dev/null @@ -1,21 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/ERC20.sol"; -import "../crowdsale/validation/CappedCrowdsale.sol"; - - -contract CappedCrowdsaleImpl is CappedCrowdsale { - - function CappedCrowdsaleImpl ( - uint256 _rate, - address _wallet, - ERC20 _token, - uint256 _cap - ) - public - Crowdsale(_rate, _wallet, _token) - CappedCrowdsale(_cap) - { - } - -} diff --git a/contracts/mocks/DayLimitMock.sol b/contracts/mocks/DayLimitMock.sol deleted file mode 100644 index 0081966b6..000000000 --- a/contracts/mocks/DayLimitMock.sol +++ /dev/null @@ -1,25 +0,0 @@ -pragma solidity ^0.4.21; - -import "../../contracts/DayLimit.sol"; - - -contract DayLimitMock is DayLimit { - uint256 public totalSpending; - - function DayLimitMock(uint256 _value) public DayLimit(_value) { - totalSpending = 0; - } - - function attemptSpend(uint256 _value) external limitedDaily(_value) { - totalSpending += _value; - } - - function setDailyLimit(uint256 _newLimit) external { - _setDailyLimit(_newLimit); - } - - function resetSpentToday() external { - _resetSpentToday(); - } - -} diff --git a/contracts/mocks/ECRecoveryMock.sol b/contracts/mocks/ECRecoveryMock.sol deleted file mode 100644 index 091055161..000000000 --- a/contracts/mocks/ECRecoveryMock.sol +++ /dev/null @@ -1,25 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../ECRecovery.sol"; - - -contract ECRecoveryMock { - using ECRecovery for bytes32; - - function recover(bytes32 hash, bytes sig) - public - pure - returns (address) - { - return hash.recover(sig); - } - - function toEthSignedMessageHash(bytes32 hash) - public - pure - returns (bytes32) - { - return hash.toEthSignedMessageHash(); - } -} diff --git a/contracts/mocks/ERC223TokenMock.sol b/contracts/mocks/ERC223TokenMock.sol deleted file mode 100644 index fbe47fcc8..000000000 --- a/contracts/mocks/ERC223TokenMock.sol +++ /dev/null @@ -1,34 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/BasicToken.sol"; - - -contract ERC223ContractInterface { - function tokenFallback(address _from, uint256 _value, bytes _data) external; -} - - -contract ERC223TokenMock is BasicToken { - - function ERC223TokenMock(address initialAccount, uint256 initialBalance) public { - balances[initialAccount] = initialBalance; - totalSupply_ = initialBalance; - } - - // ERC223 compatible transfer function (except the name) - function transferERC223(address _to, uint256 _value, bytes _data) public - returns (bool success) - { - transfer(_to, _value); - bool isContract = false; - // solium-disable-next-line security/no-inline-assembly - assembly { - isContract := not(iszero(extcodesize(_to))) - } - if (isContract) { - ERC223ContractInterface receiver = ERC223ContractInterface(_to); - receiver.tokenFallback(msg.sender, _value, _data); - } - return true; - } -} diff --git a/contracts/mocks/ERC827TokenMock.sol b/contracts/mocks/ERC827TokenMock.sol deleted file mode 100644 index 1107a73e7..000000000 --- a/contracts/mocks/ERC827TokenMock.sol +++ /dev/null @@ -1,15 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../token/ERC827/ERC827Token.sol"; - - -// mock class using ERC827 Token -contract ERC827TokenMock is ERC827Token { - - function ERC827TokenMock(address initialAccount, uint256 initialBalance) public { - balances[initialAccount] = initialBalance; - totalSupply_ = initialBalance; - } - -} diff --git a/contracts/mocks/FinalizableCrowdsaleImpl.sol b/contracts/mocks/FinalizableCrowdsaleImpl.sol deleted file mode 100644 index 82d0a5500..000000000 --- a/contracts/mocks/FinalizableCrowdsaleImpl.sol +++ /dev/null @@ -1,22 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/MintableToken.sol"; -import "../crowdsale/distribution/FinalizableCrowdsale.sol"; - - -contract FinalizableCrowdsaleImpl is FinalizableCrowdsale { - - function FinalizableCrowdsaleImpl ( - uint256 _openingTime, - uint256 _closingTime, - uint256 _rate, - address _wallet, - MintableToken _token - ) - public - Crowdsale(_rate, _wallet, _token) - TimedCrowdsale(_openingTime, _closingTime) - { - } - -} diff --git a/contracts/mocks/ForceEther.sol b/contracts/mocks/ForceEther.sol deleted file mode 100644 index 7bbbf85fa..000000000 --- a/contracts/mocks/ForceEther.sol +++ /dev/null @@ -1,16 +0,0 @@ -pragma solidity ^0.4.21; - - -// @title Force Ether into a contract. -// @notice even -// if the contract is not payable. -// @notice To use, construct the contract with the target as argument. -// @author Remco Bloemen -contract ForceEther { - - function ForceEther() public payable { } - - function destroyAndSend(address _recipient) public { - selfdestruct(_recipient); - } -} diff --git a/contracts/mocks/HasNoEtherTest.sol b/contracts/mocks/HasNoEtherTest.sol deleted file mode 100644 index bbf9dfdb4..000000000 --- a/contracts/mocks/HasNoEtherTest.sol +++ /dev/null @@ -1,12 +0,0 @@ -pragma solidity ^0.4.21; - -import "../../contracts/ownership/HasNoEther.sol"; - - -contract HasNoEtherTest is HasNoEther { - - // Constructor with explicit payable — should still fail - function HasNoEtherTest() public payable { - } - -} diff --git a/contracts/mocks/IncreasingPriceCrowdsaleImpl.sol b/contracts/mocks/IncreasingPriceCrowdsaleImpl.sol deleted file mode 100644 index ea1466122..000000000 --- a/contracts/mocks/IncreasingPriceCrowdsaleImpl.sol +++ /dev/null @@ -1,24 +0,0 @@ -pragma solidity ^0.4.21; - -import "../crowdsale/price/IncreasingPriceCrowdsale.sol"; -import "../math/SafeMath.sol"; - - -contract IncreasingPriceCrowdsaleImpl is IncreasingPriceCrowdsale { - - function IncreasingPriceCrowdsaleImpl ( - uint256 _openingTime, - uint256 _closingTime, - address _wallet, - ERC20 _token, - uint256 _initialRate, - uint256 _finalRate - ) - public - Crowdsale(_initialRate, _wallet, _token) - TimedCrowdsale(_openingTime, _closingTime) - IncreasingPriceCrowdsale(_initialRate, _finalRate) - { - } - -} diff --git a/contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol b/contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol deleted file mode 100644 index 7ac944d0b..000000000 --- a/contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol +++ /dev/null @@ -1,19 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/ERC20.sol"; -import "../crowdsale/validation/IndividuallyCappedCrowdsale.sol"; - - -contract IndividuallyCappedCrowdsaleImpl is IndividuallyCappedCrowdsale { - - function IndividuallyCappedCrowdsaleImpl ( - uint256 _rate, - address _wallet, - ERC20 _token - ) - public - Crowdsale(_rate, _wallet, _token) - { - } - -} diff --git a/contracts/mocks/InsecureTargetBounty.sol b/contracts/mocks/InsecureTargetBounty.sol deleted file mode 100644 index 74bc531b2..000000000 --- a/contracts/mocks/InsecureTargetBounty.sol +++ /dev/null @@ -1,17 +0,0 @@ -pragma solidity ^0.4.21; - -import {Bounty, Target} from "../../contracts/Bounty.sol"; - - -contract InsecureTargetMock is Target { - function checkInvariant() public returns(bool) { - return false; - } -} - - -contract InsecureTargetBounty is Bounty { - function deployContract() internal returns (address) { - return new InsecureTargetMock(); - } -} diff --git a/contracts/mocks/LimitBalanceMock.sol b/contracts/mocks/LimitBalanceMock.sol deleted file mode 100644 index a5ed18c5c..000000000 --- a/contracts/mocks/LimitBalanceMock.sol +++ /dev/null @@ -1,13 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../LimitBalance.sol"; - - -// mock class using LimitBalance -contract LimitBalanceMock is LimitBalance(1000) { - - function limitedDeposit() public payable limitedPayable { - } - -} diff --git a/contracts/mocks/MathMock.sol b/contracts/mocks/MathMock.sol deleted file mode 100644 index c2c9f3fba..000000000 --- a/contracts/mocks/MathMock.sol +++ /dev/null @@ -1,26 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../../contracts/math/Math.sol"; - - -contract MathMock { - uint64 public result64; - uint256 public result256; - - function max64(uint64 a, uint64 b) public { - result64 = Math.max64(a, b); - } - - function min64(uint64 a, uint64 b) public { - result64 = Math.min64(a, b); - } - - function max256(uint256 a, uint256 b) public { - result256 = Math.max256(a, b); - } - - function min256(uint256 a, uint256 b) public { - result256 = Math.min256(a, b); - } -} diff --git a/contracts/mocks/MerkleProofWrapper.sol b/contracts/mocks/MerkleProofWrapper.sol deleted file mode 100644 index aa830e63a..000000000 --- a/contracts/mocks/MerkleProofWrapper.sol +++ /dev/null @@ -1,11 +0,0 @@ -pragma solidity ^0.4.21; - -import { MerkleProof } from "../MerkleProof.sol"; - - -contract MerkleProofWrapper { - - function verifyProof(bytes32[] _proof, bytes32 _root, bytes32 _leaf) public pure returns (bool) { - return MerkleProof.verifyProof(_proof, _root, _leaf); - } -} diff --git a/contracts/mocks/MessageHelper.sol b/contracts/mocks/MessageHelper.sol deleted file mode 100644 index b44b6496a..000000000 --- a/contracts/mocks/MessageHelper.sol +++ /dev/null @@ -1,25 +0,0 @@ -pragma solidity ^0.4.21; - - -contract MessageHelper { - - event Show(bytes32 b32, uint256 number, string text); - - function showMessage( bytes32 message, uint256 number, string text ) public returns (bool) { - emit Show(message, number, text); - return true; - } - - function fail() public { - require(false); - } - - function call(address to, bytes data) public returns (bool) { - // solium-disable-next-line security/no-low-level-calls - if (to.call(data)) - return true; - else - return false; - } - -} diff --git a/contracts/mocks/MintedCrowdsaleImpl.sol b/contracts/mocks/MintedCrowdsaleImpl.sol deleted file mode 100644 index f6999b021..000000000 --- a/contracts/mocks/MintedCrowdsaleImpl.sol +++ /dev/null @@ -1,19 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/MintableToken.sol"; -import "../crowdsale/emission/MintedCrowdsale.sol"; - - -contract MintedCrowdsaleImpl is MintedCrowdsale { - - function MintedCrowdsaleImpl ( - uint256 _rate, - address _wallet, - MintableToken _token - ) - public - Crowdsale(_rate, _wallet, _token) - { - } - -} diff --git a/contracts/mocks/PostDeliveryCrowdsaleImpl.sol b/contracts/mocks/PostDeliveryCrowdsaleImpl.sol deleted file mode 100644 index 09db38067..000000000 --- a/contracts/mocks/PostDeliveryCrowdsaleImpl.sol +++ /dev/null @@ -1,22 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/ERC20.sol"; -import "../crowdsale/distribution/PostDeliveryCrowdsale.sol"; - - -contract PostDeliveryCrowdsaleImpl is PostDeliveryCrowdsale { - - function PostDeliveryCrowdsaleImpl ( - uint256 _openingTime, - uint256 _closingTime, - uint256 _rate, - address _wallet, - ERC20 _token - ) - public - TimedCrowdsale(_openingTime, _closingTime) - Crowdsale(_rate, _wallet, _token) - { - } - -} diff --git a/contracts/mocks/PullPaymentMock.sol b/contracts/mocks/PullPaymentMock.sol deleted file mode 100644 index fb4a1231b..000000000 --- a/contracts/mocks/PullPaymentMock.sol +++ /dev/null @@ -1,17 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../payment/PullPayment.sol"; - - -// mock class using PullPayment -contract PullPaymentMock is PullPayment { - - function PullPaymentMock() public payable { } - - // test helper function to call asyncSend - function callSend(address dest, uint256 amount) public { - asyncSend(dest, amount); - } - -} diff --git a/contracts/mocks/RBACMock.sol b/contracts/mocks/RBACMock.sol deleted file mode 100644 index 7dfa2a985..000000000 --- a/contracts/mocks/RBACMock.sol +++ /dev/null @@ -1,69 +0,0 @@ -pragma solidity ^0.4.21; - -import "../ownership/rbac/RBACWithAdmin.sol"; - - -contract RBACMock is RBACWithAdmin { - - string constant ROLE_ADVISOR = "advisor"; - - modifier onlyAdminOrAdvisor() - { - require( - hasRole(msg.sender, ROLE_ADMIN) || - hasRole(msg.sender, ROLE_ADVISOR) - ); - _; - } - - function RBACMock(address[] _advisors) - public - { - addRole(msg.sender, ROLE_ADVISOR); - - for (uint256 i = 0; i < _advisors.length; i++) { - addRole(_advisors[i], ROLE_ADVISOR); - } - } - - function onlyAdminsCanDoThis() - onlyAdmin - view - external - { - } - - function onlyAdvisorsCanDoThis() - onlyRole(ROLE_ADVISOR) - view - external - { - } - - function eitherAdminOrAdvisorCanDoThis() - onlyAdminOrAdvisor - view - external - { - } - - function nobodyCanDoThis() - onlyRole("unknown") - view - external - { - } - - // admins can remove advisor's role - function removeAdvisor(address _addr) - onlyAdmin - public - { - // revert if the user isn't an advisor - // (perhaps you want to soft-fail here instead?) - checkRole(_addr, ROLE_ADVISOR); - - // remove the advisor's role - removeRole(_addr, ROLE_ADVISOR); - } -} diff --git a/contracts/mocks/ReentrancyAttack.sol b/contracts/mocks/ReentrancyAttack.sol deleted file mode 100644 index 5caebb1d6..000000000 --- a/contracts/mocks/ReentrancyAttack.sol +++ /dev/null @@ -1,11 +0,0 @@ -pragma solidity ^0.4.21; - - -contract ReentrancyAttack { - - function callSender(bytes4 data) public { - // solium-disable-next-line security/no-low-level-calls - require(msg.sender.call(data)); - } - -} diff --git a/contracts/mocks/ReentrancyMock.sol b/contracts/mocks/ReentrancyMock.sol deleted file mode 100644 index 72f4a284f..000000000 --- a/contracts/mocks/ReentrancyMock.sol +++ /dev/null @@ -1,46 +0,0 @@ -pragma solidity ^0.4.21; - -import "../ReentrancyGuard.sol"; -import "./ReentrancyAttack.sol"; - - -contract ReentrancyMock is ReentrancyGuard { - - uint256 public counter; - - function ReentrancyMock() public { - counter = 0; - } - - function callback() external nonReentrant { - count(); - } - - function countLocalRecursive(uint256 n) public nonReentrant { - if (n > 0) { - count(); - countLocalRecursive(n - 1); - } - } - - function countThisRecursive(uint256 n) public nonReentrant { - bytes4 func = bytes4(keccak256("countThisRecursive(uint256)")); - if (n > 0) { - count(); - // solium-disable-next-line security/no-low-level-calls - bool result = address(this).call(func, n - 1); - require(result == true); - } - } - - function countAndCall(ReentrancyAttack attacker) public nonReentrant { - count(); - bytes4 func = bytes4(keccak256("callback()")); - attacker.callSender(func); - } - - function count() private { - counter += 1; - } - -} diff --git a/contracts/mocks/RefundableCrowdsaleImpl.sol b/contracts/mocks/RefundableCrowdsaleImpl.sol deleted file mode 100644 index 08ee14512..000000000 --- a/contracts/mocks/RefundableCrowdsaleImpl.sol +++ /dev/null @@ -1,24 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/MintableToken.sol"; -import "../crowdsale/distribution/RefundableCrowdsale.sol"; - - -contract RefundableCrowdsaleImpl is RefundableCrowdsale { - - function RefundableCrowdsaleImpl ( - uint256 _openingTime, - uint256 _closingTime, - uint256 _rate, - address _wallet, - MintableToken _token, - uint256 _goal - ) - public - Crowdsale(_rate, _wallet, _token) - TimedCrowdsale(_openingTime, _closingTime) - RefundableCrowdsale(_goal) - { - } - -} diff --git a/contracts/mocks/SecureTargetBounty.sol b/contracts/mocks/SecureTargetBounty.sol deleted file mode 100644 index 1b69176a1..000000000 --- a/contracts/mocks/SecureTargetBounty.sol +++ /dev/null @@ -1,17 +0,0 @@ -pragma solidity ^0.4.21; - -import {Bounty, Target} from "../../contracts/Bounty.sol"; - - -contract SecureTargetMock is Target { - function checkInvariant() public returns(bool) { - return true; - } -} - - -contract SecureTargetBounty is Bounty { - function deployContract() internal returns (address) { - return new SecureTargetMock(); - } -} diff --git a/contracts/mocks/TimedCrowdsaleImpl.sol b/contracts/mocks/TimedCrowdsaleImpl.sol deleted file mode 100644 index b66566239..000000000 --- a/contracts/mocks/TimedCrowdsaleImpl.sol +++ /dev/null @@ -1,22 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/ERC20.sol"; -import "../crowdsale/validation/TimedCrowdsale.sol"; - - -contract TimedCrowdsaleImpl is TimedCrowdsale { - - function TimedCrowdsaleImpl ( - uint256 _openingTime, - uint256 _closingTime, - uint256 _rate, - address _wallet, - ERC20 _token - ) - public - Crowdsale(_rate, _wallet, _token) - TimedCrowdsale(_openingTime, _closingTime) - { - } - -} diff --git a/contracts/mocks/WhitelistMock.sol b/contracts/mocks/WhitelistMock.sol deleted file mode 100644 index 9c50405b0..000000000 --- a/contracts/mocks/WhitelistMock.sol +++ /dev/null @@ -1,14 +0,0 @@ -pragma solidity ^0.4.21; - -import "../ownership/Whitelist.sol"; - - -contract WhitelistMock is Whitelist { - - function onlyWhitelistedCanDoThis() - onlyWhitelisted - view - external - { - } -} diff --git a/contracts/mocks/WhitelistedCrowdsaleImpl.sol b/contracts/mocks/WhitelistedCrowdsaleImpl.sol deleted file mode 100644 index 16dc45434..000000000 --- a/contracts/mocks/WhitelistedCrowdsaleImpl.sol +++ /dev/null @@ -1,19 +0,0 @@ -pragma solidity ^0.4.21; - -import "../token/ERC20/ERC20.sol"; -import "../crowdsale/validation/WhitelistedCrowdsale.sol"; - - -contract WhitelistedCrowdsaleImpl is WhitelistedCrowdsale { - - function WhitelistedCrowdsaleImpl ( - uint256 _rate, - address _wallet, - ERC20 _token - ) - public - Crowdsale(_rate, _wallet, _token) - { - } - -} diff --git a/contracts/ownership/CanReclaimToken.sol b/contracts/ownership/CanReclaimToken.sol deleted file mode 100644 index 474baae4e..000000000 --- a/contracts/ownership/CanReclaimToken.sol +++ /dev/null @@ -1,26 +0,0 @@ -pragma solidity ^0.4.21; - -import "./Ownable.sol"; -import "../token/ERC20/ERC20Basic.sol"; -import "../token/ERC20/SafeERC20.sol"; - - -/** - * @title Contracts that should be able to recover tokens - * @author SylTi - * @dev This allow a contract to recover any ERC20 token received in a contract by transferring the balance to the contract owner. - * This will prevent any accidental loss of tokens. - */ -contract CanReclaimToken is Ownable { - using SafeERC20 for ERC20Basic; - - /** - * @dev Reclaim all ERC20Basic compatible tokens - * @param token ERC20Basic The address of the token contract - */ - function reclaimToken(ERC20Basic token) external onlyOwner { - uint256 balance = token.balanceOf(this); - token.safeTransfer(owner, balance); - } - -} diff --git a/contracts/ownership/Claimable.sol b/contracts/ownership/Claimable.sol deleted file mode 100644 index f1ebd76dd..000000000 --- a/contracts/ownership/Claimable.sol +++ /dev/null @@ -1,39 +0,0 @@ -pragma solidity ^0.4.21; - - -import "./Ownable.sol"; - - -/** - * @title Claimable - * @dev Extension for the Ownable contract, where the ownership needs to be claimed. - * This allows the new owner to accept the transfer. - */ -contract Claimable is Ownable { - address public pendingOwner; - - /** - * @dev Modifier throws if called by any account other than the pendingOwner. - */ - modifier onlyPendingOwner() { - require(msg.sender == pendingOwner); - _; - } - - /** - * @dev Allows the current owner to set the pendingOwner address. - * @param newOwner The address to transfer ownership to. - */ - function transferOwnership(address newOwner) onlyOwner public { - pendingOwner = newOwner; - } - - /** - * @dev Allows the pendingOwner address to finalize the transfer. - */ - function claimOwnership() onlyPendingOwner public { - emit OwnershipTransferred(owner, pendingOwner); - owner = pendingOwner; - pendingOwner = address(0); - } -} diff --git a/contracts/ownership/Contactable.sol b/contracts/ownership/Contactable.sol deleted file mode 100644 index adeeaa02a..000000000 --- a/contracts/ownership/Contactable.sol +++ /dev/null @@ -1,22 +0,0 @@ -pragma solidity ^0.4.21; - -import "./Ownable.sol"; - - -/** - * @title Contactable token - * @dev Basic version of a contactable contract, allowing the owner to provide a string with their - * contact information. - */ -contract Contactable is Ownable { - - string public contactInformation; - - /** - * @dev Allows the owner to set a string with their contact information. - * @param info The contact information to attach to the contract. - */ - function setContactInformation(string info) onlyOwner public { - contactInformation = info; - } -} diff --git a/contracts/ownership/DelayedClaimable.sol b/contracts/ownership/DelayedClaimable.sol deleted file mode 100644 index f221afb56..000000000 --- a/contracts/ownership/DelayedClaimable.sol +++ /dev/null @@ -1,40 +0,0 @@ -pragma solidity ^0.4.21; - -import "./Claimable.sol"; - - -/** - * @title DelayedClaimable - * @dev Extension for the Claimable contract, where the ownership needs to be claimed before/after - * a certain block number. - */ -contract DelayedClaimable is Claimable { - - uint256 public end; - uint256 public start; - - /** - * @dev Used to specify the time period during which a pending - * owner can claim ownership. - * @param _start The earliest time ownership can be claimed. - * @param _end The latest time ownership can be claimed. - */ - function setLimits(uint256 _start, uint256 _end) onlyOwner public { - require(_start <= _end); - end = _end; - start = _start; - } - - /** - * @dev Allows the pendingOwner address to finalize the transfer, as long as it is called within - * the specified start and end time. - */ - function claimOwnership() onlyPendingOwner public { - require((block.number <= end) && (block.number >= start)); - emit OwnershipTransferred(owner, pendingOwner); - owner = pendingOwner; - pendingOwner = address(0); - end = 0; - } - -} diff --git a/contracts/ownership/HasNoContracts.sol b/contracts/ownership/HasNoContracts.sol deleted file mode 100644 index 19e8d0ff9..000000000 --- a/contracts/ownership/HasNoContracts.sol +++ /dev/null @@ -1,22 +0,0 @@ -pragma solidity ^0.4.21; - -import "./Ownable.sol"; - - -/** - * @title Contracts that should not own Contracts - * @author Remco Bloemen - * @dev Should contracts (anything Ownable) end up being owned by this contract, it allows the owner - * of this contract to reclaim ownership of the contracts. - */ -contract HasNoContracts is Ownable { - - /** - * @dev Reclaim ownership of Ownable contracts - * @param contractAddr The address of the Ownable to be reclaimed. - */ - function reclaimContract(address contractAddr) external onlyOwner { - Ownable contractInst = Ownable(contractAddr); - contractInst.transferOwnership(owner); - } -} diff --git a/contracts/ownership/HasNoEther.sol b/contracts/ownership/HasNoEther.sol deleted file mode 100644 index 8808e2fc3..000000000 --- a/contracts/ownership/HasNoEther.sol +++ /dev/null @@ -1,42 +0,0 @@ -pragma solidity ^0.4.21; - -import "./Ownable.sol"; - - -/** - * @title Contracts that should not own Ether - * @author Remco Bloemen - * @dev This tries to block incoming ether to prevent accidental loss of Ether. Should Ether end up - * in the contract, it will allow the owner to reclaim this ether. - * @notice Ether can still be sent to this contract by: - * calling functions labeled `payable` - * `selfdestruct(contract_address)` - * mining directly to the contract address - */ -contract HasNoEther is Ownable { - - /** - * @dev Constructor that rejects incoming Ether - * @dev The `payable` flag is added so we can access `msg.value` without compiler warning. If we - * leave out payable, then Solidity will allow inheriting contracts to implement a payable - * 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 { - require(msg.value == 0); - } - - /** - * @dev Disallows direct send by settings a default function without the `payable` flag. - */ - function() external { - } - - /** - * @dev Transfer all Ether held by the contract to the owner. - */ - function reclaimEther() external onlyOwner { - // solium-disable-next-line security/no-send - assert(owner.send(address(this).balance)); - } -} diff --git a/contracts/ownership/HasNoTokens.sol b/contracts/ownership/HasNoTokens.sol deleted file mode 100644 index eaede63ae..000000000 --- a/contracts/ownership/HasNoTokens.sol +++ /dev/null @@ -1,28 +0,0 @@ -pragma solidity ^0.4.21; - -import "./CanReclaimToken.sol"; - - -/** - * @title Contracts that should not own Tokens - * @author Remco Bloemen - * @dev This blocks incoming ERC223 tokens to prevent accidental loss of tokens. - * Should tokens (any ERC20Basic compatible) end up in the contract, it allows the - * owner to reclaim the tokens. - */ -contract HasNoTokens is CanReclaimToken { - - /** - * @dev Reject all ERC223 compatible tokens - * @param from_ address The address that is transferring the tokens - * @param value_ uint256 the amount of the specified token - * @param data_ Bytes The data passed from the caller. - */ - function tokenFallback(address from_, uint256 value_, bytes data_) external { - from_; - value_; - data_; - revert(); - } - -} diff --git a/contracts/ownership/Heritable.sol b/contracts/ownership/Heritable.sol deleted file mode 100644 index 3b592a0a5..000000000 --- a/contracts/ownership/Heritable.sol +++ /dev/null @@ -1,117 +0,0 @@ -pragma solidity ^0.4.21; - - -import "./Ownable.sol"; - - -/** - * @title Heritable - * @dev The Heritable contract provides ownership transfer capabilities, in the - * case that the current owner stops "heartbeating". Only the heir can pronounce the - * owner's death. - */ -contract Heritable is Ownable { - address private heir_; - - // Time window the owner has to notify they are alive. - uint256 private heartbeatTimeout_; - - // Timestamp of the owner's death, as pronounced by the heir. - uint256 private timeOfDeath_; - - event HeirChanged(address indexed owner, address indexed newHeir); - event OwnerHeartbeated(address indexed owner); - event OwnerProclaimedDead(address indexed owner, address indexed heir, uint256 timeOfDeath); - event HeirOwnershipClaimed(address indexed previousOwner, address indexed newOwner); - - - /** - * @dev Throw an exception if called by any account other than the heir's. - */ - modifier onlyHeir() { - require(msg.sender == heir_); - _; - } - - - /** - * @notice Create a new Heritable Contract with heir address 0x0. - * @param _heartbeatTimeout time available for the owner to notify they are alive, - * before the heir can take ownership. - */ - function Heritable(uint256 _heartbeatTimeout) public { - setHeartbeatTimeout(_heartbeatTimeout); - } - - function setHeir(address newHeir) public onlyOwner { - require(newHeir != owner); - heartbeat(); - emit HeirChanged(owner, newHeir); - heir_ = newHeir; - } - - /** - * @dev Use these getter functions to access the internal variables in - * an inherited contract. - */ - function heir() public view returns(address) { - return heir_; - } - - function heartbeatTimeout() public view returns(uint256) { - return heartbeatTimeout_; - } - - function timeOfDeath() public view returns(uint256) { - return timeOfDeath_; - } - - /** - * @dev set heir = 0x0 - */ - function removeHeir() public onlyOwner { - heartbeat(); - heir_ = 0; - } - - /** - * @dev Heir can pronounce the owners death. To claim the ownership, they will - * have to wait for `heartbeatTimeout` seconds. - */ - function proclaimDeath() public onlyHeir { - require(ownerLives()); - emit OwnerProclaimedDead(owner, heir_, timeOfDeath_); - // solium-disable-next-line security/no-block-members - timeOfDeath_ = block.timestamp; - } - - /** - * @dev Owner can send a heartbeat if they were mistakenly pronounced dead. - */ - function heartbeat() public onlyOwner { - emit OwnerHeartbeated(owner); - timeOfDeath_ = 0; - } - - /** - * @dev Allows heir to transfer ownership only if heartbeat has timed out. - */ - function claimHeirOwnership() public onlyHeir { - require(!ownerLives()); - // solium-disable-next-line security/no-block-members - require(block.timestamp >= timeOfDeath_ + heartbeatTimeout_); - emit OwnershipTransferred(owner, heir_); - emit HeirOwnershipClaimed(owner, heir_); - owner = heir_; - timeOfDeath_ = 0; - } - - function setHeartbeatTimeout(uint256 newHeartbeatTimeout) internal onlyOwner { - require(ownerLives()); - heartbeatTimeout_ = newHeartbeatTimeout; - } - - function ownerLives() internal view returns (bool) { - return timeOfDeath_ == 0; - } -} diff --git a/contracts/ownership/NoOwner.sol b/contracts/ownership/NoOwner.sol deleted file mode 100644 index 9b4c7c93b..000000000 --- a/contracts/ownership/NoOwner.sol +++ /dev/null @@ -1,15 +0,0 @@ -pragma solidity ^0.4.21; - -import "./HasNoEther.sol"; -import "./HasNoTokens.sol"; -import "./HasNoContracts.sol"; - - -/** - * @title Base contract for contracts that should not own things. - * @author Remco Bloemen - * @dev Solves a class of errors where a contract accidentally becomes owner of Ether, Tokens or - * Owned contracts. See respective base contracts for details. - */ -contract NoOwner is HasNoEther, HasNoTokens, HasNoContracts { -} diff --git a/contracts/ownership/Whitelist.sol b/contracts/ownership/Whitelist.sol deleted file mode 100644 index 4d6e2a70a..000000000 --- a/contracts/ownership/Whitelist.sol +++ /dev/null @@ -1,81 +0,0 @@ -pragma solidity ^0.4.21; - - -import "./Ownable.sol"; - - -/** - * @title Whitelist - * @dev The Whitelist contract has a whitelist of addresses, and provides basic authorization control functions. - * @dev This simplifies the implementation of "user permissions". - */ -contract Whitelist is Ownable { - mapping(address => bool) public whitelist; - - event WhitelistedAddressAdded(address addr); - event WhitelistedAddressRemoved(address addr); - - /** - * @dev Throws if called by any account that's not whitelisted. - */ - modifier onlyWhitelisted() { - require(whitelist[msg.sender]); - _; - } - - /** - * @dev add an address to the whitelist - * @param addr address - * @return true if the address was added to the whitelist, false if the address was already in the whitelist - */ - function addAddressToWhitelist(address addr) onlyOwner public returns(bool success) { - if (!whitelist[addr]) { - whitelist[addr] = true; - emit WhitelistedAddressAdded(addr); - success = true; - } - } - - /** - * @dev add addresses to the whitelist - * @param addrs addresses - * @return true if at least one address was added to the whitelist, - * false if all addresses were already in the whitelist - */ - function addAddressesToWhitelist(address[] addrs) onlyOwner public returns(bool success) { - for (uint256 i = 0; i < addrs.length; i++) { - if (addAddressToWhitelist(addrs[i])) { - success = true; - } - } - } - - /** - * @dev remove an address from the whitelist - * @param addr address - * @return true if the address was removed from the whitelist, - * false if the address wasn't in the whitelist in the first place - */ - function removeAddressFromWhitelist(address addr) onlyOwner public returns(bool success) { - if (whitelist[addr]) { - whitelist[addr] = false; - emit WhitelistedAddressRemoved(addr); - success = true; - } - } - - /** - * @dev remove addresses from the whitelist - * @param addrs addresses - * @return true if at least one address was removed from the whitelist, - * false if all addresses weren't in the whitelist in the first place - */ - function removeAddressesFromWhitelist(address[] addrs) onlyOwner public returns(bool success) { - for (uint256 i = 0; i < addrs.length; i++) { - if (removeAddressFromWhitelist(addrs[i])) { - success = true; - } - } - } - -} diff --git a/contracts/ownership/rbac/RBAC.sol b/contracts/ownership/rbac/RBAC.sol deleted file mode 100644 index 998d334f8..000000000 --- a/contracts/ownership/rbac/RBAC.sol +++ /dev/null @@ -1,108 +0,0 @@ -pragma solidity ^0.4.21; - -import "./Roles.sol"; - - -/** - * @title RBAC (Role-Based Access Control) - * @author Matt Condon (@Shrugs) - * @dev Stores and provides setters and getters for roles and addresses. - * @dev Supports unlimited numbers of roles and addresses. - * @dev See //contracts/mocks/RBACMock.sol for an example of usage. - * This RBAC method uses strings to key roles. It may be beneficial - * for you to write your own implementation of this interface using Enums or similar. - * It's also recommended that you define constants in the contract, like ROLE_ADMIN below, - * to avoid typos. - */ -contract RBAC { - using Roles for Roles.Role; - - mapping (string => Roles.Role) private roles; - - event RoleAdded(address addr, string roleName); - event RoleRemoved(address addr, string roleName); - - /** - * @dev reverts if addr does not have role - * @param addr address - * @param roleName the name of the role - * // reverts - */ - function checkRole(address addr, string roleName) - view - public - { - roles[roleName].check(addr); - } - - /** - * @dev determine if addr has role - * @param addr address - * @param roleName the name of the role - * @return bool - */ - function hasRole(address addr, string roleName) - view - public - returns (bool) - { - return roles[roleName].has(addr); - } - - /** - * @dev add a role to an address - * @param addr address - * @param roleName the name of the role - */ - function addRole(address addr, string roleName) - internal - { - roles[roleName].add(addr); - emit RoleAdded(addr, roleName); - } - - /** - * @dev remove a role from an address - * @param addr address - * @param roleName the name of the role - */ - function removeRole(address addr, string roleName) - internal - { - roles[roleName].remove(addr); - emit RoleRemoved(addr, roleName); - } - - /** - * @dev modifier to scope access to a single role (uses msg.sender as addr) - * @param roleName the name of the role - * // reverts - */ - modifier onlyRole(string roleName) - { - checkRole(msg.sender, roleName); - _; - } - - /** - * @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 - * // reverts - * - * @TODO - when solidity supports dynamic arrays as arguments to modifiers, provide this - * see: https://github.com/ethereum/solidity/issues/2467 - */ - // modifier onlyRoles(string[] roleNames) { - // bool hasAnyRole = false; - // for (uint8 i = 0; i < roleNames.length; i++) { - // if (hasRole(msg.sender, roleNames[i])) { - // hasAnyRole = true; - // break; - // } - // } - - // require(hasAnyRole); - - // _; - // } -} diff --git a/contracts/ownership/rbac/RBACWithAdmin.sol b/contracts/ownership/rbac/RBACWithAdmin.sol deleted file mode 100644 index 90eb187a1..000000000 --- a/contracts/ownership/rbac/RBACWithAdmin.sol +++ /dev/null @@ -1,60 +0,0 @@ -pragma solidity ^0.4.21; - -import "./RBAC.sol"; - - -/** - * @title RBACWithAdmin - * @author Matt Condon (@Shrugs) - * @dev It's recommended that you define constants in the contract, - * @dev like ROLE_ADMIN below, to avoid typos. - */ -contract RBACWithAdmin is RBAC { - /** - * A constant role name for indicating admins. - */ - string public constant ROLE_ADMIN = "admin"; - - /** - * @dev modifier to scope access to admins - * // reverts - */ - modifier onlyAdmin() - { - checkRole(msg.sender, ROLE_ADMIN); - _; - } - - /** - * @dev constructor. Sets msg.sender as admin by default - */ - function RBACWithAdmin() - public - { - addRole(msg.sender, ROLE_ADMIN); - } - - /** - * @dev add a role to an address - * @param addr address - * @param roleName the name of the role - */ - function adminAddRole(address addr, string roleName) - onlyAdmin - public - { - addRole(addr, roleName); - } - - /** - * @dev remove a role from an address - * @param addr address - * @param roleName the name of the role - */ - function adminRemoveRole(address addr, string roleName) - onlyAdmin - public - { - removeRole(addr, roleName); - } -} diff --git a/contracts/ownership/rbac/Roles.sol b/contracts/ownership/rbac/Roles.sol deleted file mode 100644 index c9dbd73af..000000000 --- a/contracts/ownership/rbac/Roles.sol +++ /dev/null @@ -1,55 +0,0 @@ -pragma solidity ^0.4.21; - - -/** - * @title Roles - * @author Francisco Giordano (@frangio) - * @dev Library for managing addresses assigned to a Role. - * See RBAC.sol for example usage. - */ -library Roles { - struct Role { - mapping (address => bool) bearer; - } - - /** - * @dev give an address access to this role - */ - function add(Role storage role, address addr) - internal - { - role.bearer[addr] = true; - } - - /** - * @dev remove an address' access to this role - */ - function remove(Role storage role, address addr) - internal - { - role.bearer[addr] = false; - } - - /** - * @dev check if an address has this role - * // reverts - */ - function check(Role storage role, address addr) - view - internal - { - require(has(role, addr)); - } - - /** - * @dev check if an address has this role - * @return bool - */ - function has(Role storage role, address addr) - view - internal - returns (bool) - { - return role.bearer[addr]; - } -} diff --git a/contracts/payment/PullPayment.sol b/contracts/payment/PullPayment.sol deleted file mode 100644 index 030e971b3..000000000 --- a/contracts/payment/PullPayment.sol +++ /dev/null @@ -1,43 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../math/SafeMath.sol"; - - -/** - * @title PullPayment - * @dev Base contract supporting async send for pull payments. Inherit from this - * contract and use asyncSend instead of send or transfer. - */ -contract PullPayment { - using SafeMath for uint256; - - mapping(address => uint256) public payments; - uint256 public totalPayments; - - /** - * @dev Withdraw accumulated balance, called by payee. - */ - function withdrawPayments() public { - address payee = msg.sender; - uint256 payment = payments[payee]; - - require(payment != 0); - require(address(this).balance >= payment); - - totalPayments = totalPayments.sub(payment); - payments[payee] = 0; - - payee.transfer(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); - } -} diff --git a/contracts/payment/SplitPayment.sol b/contracts/payment/SplitPayment.sol deleted file mode 100644 index 019eba694..000000000 --- a/contracts/payment/SplitPayment.sol +++ /dev/null @@ -1,71 +0,0 @@ -pragma solidity ^0.4.21; - -import "../math/SafeMath.sol"; - - -/** - * @title SplitPayment - * @dev Base contract that supports multiple payees claiming funds sent to this contract - * according to the proportion they own. - */ -contract SplitPayment { - using SafeMath for uint256; - - uint256 public totalShares = 0; - uint256 public totalReleased = 0; - - mapping(address => uint256) public shares; - mapping(address => uint256) public released; - address[] public payees; - - /** - * @dev Constructor - */ - function SplitPayment(address[] _payees, uint256[] _shares) public payable { - require(_payees.length == _shares.length); - - for (uint256 i = 0; i < _payees.length; i++) { - addPayee(_payees[i], _shares[i]); - } - } - - /** - * @dev payable fallback - */ - function () public payable {} - - /** - * @dev Claim your share of the balance. - */ - function claim() public { - address payee = msg.sender; - - require(shares[payee] > 0); - - uint256 totalReceived = address(this).balance.add(totalReleased); - uint256 payment = totalReceived.mul(shares[payee]).div(totalShares).sub(released[payee]); - - require(payment != 0); - require(address(this).balance >= payment); - - released[payee] = released[payee].add(payment); - totalReleased = totalReleased.add(payment); - - payee.transfer(payment); - } - - /** - * @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 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); - } -} diff --git a/contracts/token/ERC20/CappedToken.sol b/contracts/token/ERC20/CappedToken.sol deleted file mode 100644 index 47cd4fb4d..000000000 --- a/contracts/token/ERC20/CappedToken.sol +++ /dev/null @@ -1,31 +0,0 @@ -pragma solidity ^0.4.21; - -import "./MintableToken.sol"; - - -/** - * @title Capped token - * @dev Mintable token with a token cap. - */ -contract CappedToken is MintableToken { - - uint256 public cap; - - function CappedToken(uint256 _cap) public { - require(_cap > 0); - cap = _cap; - } - - /** - * @dev Function to mint tokens - * @param _to The address that will receive the minted tokens. - * @param _amount The amount of tokens to mint. - * @return A boolean that indicates if the operation was successful. - */ - function mint(address _to, uint256 _amount) onlyOwner canMint public returns (bool) { - require(totalSupply_.add(_amount) <= cap); - - return super.mint(_to, _amount); - } - -} diff --git a/contracts/token/ERC721/DeprecatedERC721.sol b/contracts/token/ERC721/DeprecatedERC721.sol deleted file mode 100644 index fa9d9a3d3..000000000 --- a/contracts/token/ERC721/DeprecatedERC721.sol +++ /dev/null @@ -1,15 +0,0 @@ -pragma solidity ^0.4.21; - -import "./ERC721.sol"; - - -/** - * @title ERC-721 methods shipped in OpenZeppelin v1.7.0, removed in the latest version of the standard - * @dev Only use this interface for compatibility with previously deployed contracts - * @dev Use ERC721 for interacting with new contracts which are standard-compliant - */ -contract DeprecatedERC721 is ERC721 { - function takeOwnership(uint256 _tokenId) public; - function transfer(address _to, uint256 _tokenId) public; - function tokensOf(address _owner) public view returns (uint256[]); -} diff --git a/contracts/token/ERC827/ERC827.sol b/contracts/token/ERC827/ERC827.sol deleted file mode 100644 index a0ee18036..000000000 --- a/contracts/token/ERC827/ERC827.sol +++ /dev/null @@ -1,25 +0,0 @@ -pragma solidity ^0.4.21; - - -import "../ERC20/ERC20.sol"; - - -/** - * @title ERC827 interface, an extension of ERC20 token standard - * - * @dev Interface of a ERC827 token, following the ERC20 standard with extra - * @dev methods to transfer value and data and execute calls in transfers and - * @dev approvals. - */ -contract ERC827 is ERC20 { - function approve(address _spender, uint256 _value, bytes _data) public returns (bool); - function transfer(address _to, uint256 _value, bytes _data) public returns (bool); - function transferFrom( - address _from, - address _to, - uint256 _value, - bytes _data - ) - public - returns (bool); -} diff --git a/contracts/token/ERC827/ERC827Token.sol b/contracts/token/ERC827/ERC827Token.sol deleted file mode 100644 index 28dbfceea..000000000 --- a/contracts/token/ERC827/ERC827Token.sol +++ /dev/null @@ -1,139 +0,0 @@ -/* solium-disable security/no-low-level-calls */ - -pragma solidity ^0.4.21; - -import "./ERC827.sol"; -import "../ERC20/StandardToken.sol"; - - -/** - * @title ERC827, an extension of ERC20 token standard - * - * @dev Implementation the ERC827, following the ERC20 standard with extra - * @dev methods to transfer value and data and execute calls in transfers and - * @dev approvals. - * - * @dev Uses OpenZeppelin StandardToken. - */ -contract ERC827Token is ERC827, StandardToken { - - /** - * @dev Addition to ERC20 token methods. It allows to - * @dev approve the transfer of value and execute a call with the sent data. - * - * @dev Beware that changing an allowance with this method brings the risk that - * @dev someone may use both the old and the new allowance by unfortunate - * @dev transaction ordering. One possible solution to mitigate this race condition - * @dev is to first reduce the spender's allowance to 0 and set the desired value - * @dev afterwards: - * @dev https://github.com/ethereum/EIPs/issues/20#issuecomment-263524729 - * - * @param _spender The address that will spend the funds. - * @param _value The amount of tokens to be spent. - * @param _data ABI-encoded contract call to call `_to` address. - * - * @return true if the call function was executed successfully - */ - function approve(address _spender, uint256 _value, bytes _data) public returns (bool) { - require(_spender != address(this)); - - super.approve(_spender, _value); - - require(_spender.call(_data)); - - return true; - } - - /** - * @dev Addition to ERC20 token methods. Transfer tokens to a specified - * @dev address and execute a call with the sent data on the same transaction - * - * @param _to address The address which you want to transfer to - * @param _value uint256 the amout of tokens to be transfered - * @param _data ABI-encoded contract call to call `_to` address. - * - * @return true if the call function was executed successfully - */ - function transfer(address _to, uint256 _value, bytes _data) public returns (bool) { - require(_to != address(this)); - - super.transfer(_to, _value); - - require(_to.call(_data)); - return true; - } - - /** - * @dev Addition to ERC20 token methods. Transfer tokens from one address to - * @dev another and make a contract call on the same transaction - * - * @param _from The address which you want to send tokens from - * @param _to The address which you want to transfer to - * @param _value The amout of tokens to be transferred - * @param _data ABI-encoded contract call to call `_to` address. - * - * @return true if the call function was executed successfully - */ - function transferFrom( - address _from, - address _to, - uint256 _value, - bytes _data - ) - public returns (bool) - { - require(_to != address(this)); - - super.transferFrom(_from, _to, _value); - - require(_to.call(_data)); - return true; - } - - /** - * @dev Addition to StandardToken methods. Increase the amount of tokens that - * @dev an owner allowed to a spender and execute a call with the sent data. - * - * @dev approve should be called when allowed[_spender] == 0. To increment - * @dev allowed value is better to use this function to avoid 2 calls (and wait until - * @dev the first transaction is mined) - * @dev From MonolithDAO Token.sol - * - * @param _spender The address which will spend the funds. - * @param _addedValue The amount of tokens to increase the allowance by. - * @param _data ABI-encoded contract call to call `_spender` address. - */ - function increaseApproval(address _spender, uint _addedValue, bytes _data) public returns (bool) { - require(_spender != address(this)); - - super.increaseApproval(_spender, _addedValue); - - require(_spender.call(_data)); - - return true; - } - - /** - * @dev Addition to StandardToken methods. Decrease the amount of tokens that - * @dev an owner allowed to a spender and execute a call with the sent data. - * - * @dev approve should be called when allowed[_spender] == 0. To decrement - * @dev allowed value is better to use this function to avoid 2 calls (and wait until - * @dev the first transaction is mined) - * @dev From MonolithDAO Token.sol - * - * @param _spender The address which will spend the funds. - * @param _subtractedValue The amount of tokens to decrease the allowance by. - * @param _data ABI-encoded contract call to call `_spender` address. - */ - function decreaseApproval(address _spender, uint _subtractedValue, bytes _data) public returns (bool) { - require(_spender != address(this)); - - super.decreaseApproval(_spender, _subtractedValue); - - require(_spender.call(_data)); - - return true; - } - -} diff --git a/test/Bounty.test.js b/test/Bounty.test.js deleted file mode 100644 index b440f399c..000000000 --- a/test/Bounty.test.js +++ /dev/null @@ -1,111 +0,0 @@ - -let sendReward = function (sender, receiver, value) { - web3.eth.sendTransaction({ - from: sender, - to: receiver, - value: value, - }); -}; -var SecureTargetBounty = artifacts.require('SecureTargetBounty'); -var InsecureTargetBounty = artifacts.require('InsecureTargetBounty'); - -function awaitEvent (event, handler) { - return new Promise((resolve, reject) => { - function wrappedHandler (...args) { - Promise.resolve(handler(...args)).then(resolve).catch(reject); - } - - event.watch(wrappedHandler); - }); -} - -contract('Bounty', function (accounts) { - it('sets reward', async function () { - let owner = accounts[0]; - let reward = web3.toWei(1, 'ether'); - let bounty = await SecureTargetBounty.new(); - sendReward(owner, bounty.address, reward); - - assert.equal(reward, web3.eth.getBalance(bounty.address).toNumber()); - }); - - it('empties itself when destroyed', async function () { - let owner = accounts[0]; - let reward = web3.toWei(1, 'ether'); - let bounty = await SecureTargetBounty.new(); - sendReward(owner, bounty.address, reward); - - assert.equal(reward, web3.eth.getBalance(bounty.address).toNumber()); - - await bounty.destroy(); - assert.equal(0, web3.eth.getBalance(bounty.address).toNumber()); - }); - - describe('Against secure contract', function () { - it('cannot claim reward', async function () { - let owner = accounts[0]; - let researcher = accounts[1]; - let reward = web3.toWei(1, 'ether'); - let bounty = await SecureTargetBounty.new(); - let event = bounty.TargetCreated({}); - - let watcher = async function (err, result) { - event.stopWatching(); - if (err) { throw err; } - - var targetAddress = result.args.createdAddress; - sendReward(owner, bounty.address, reward); - - assert.equal(reward, - web3.eth.getBalance(bounty.address).toNumber()); - - try { - await bounty.claim(targetAddress, { from: researcher }); - assert.isTrue(false); // should never reach here - } catch (error) { - let reClaimedBounty = await bounty.claimed.call(); - assert.isFalse(reClaimedBounty); - } - try { - await bounty.withdrawPayments({ from: researcher }); - assert.isTrue(false); // should never reach here - } catch (err) { - assert.equal(reward, - web3.eth.getBalance(bounty.address).toNumber()); - } - }; - await bounty.createTarget({ from: researcher }); - await awaitEvent(event, watcher); - }); - }); - - describe('Against broken contract', function () { - it('claims reward', async function () { - let owner = accounts[0]; - let researcher = accounts[1]; - let reward = web3.toWei(1, 'ether'); - let bounty = await InsecureTargetBounty.new(); - let event = bounty.TargetCreated({}); - - let watcher = async function (err, result) { - event.stopWatching(); - if (err) { throw err; } - let targetAddress = result.args.createdAddress; - sendReward(owner, bounty.address, reward); - - assert.equal(reward, web3.eth.getBalance(bounty.address).toNumber()); - - await bounty.claim(targetAddress, { from: researcher }); - let claim = await bounty.claimed.call(); - - assert.isTrue(claim); - - await bounty.withdrawPayments({ from: researcher }); - - assert.equal(0, web3.eth.getBalance(bounty.address).toNumber()); - }; - await bounty.createTarget({ from: researcher }); - await awaitEvent(event, watcher); - }); - }); -}); diff --git a/test/DayLimit.test.js b/test/DayLimit.test.js deleted file mode 100644 index ab2aa903f..000000000 --- a/test/DayLimit.test.js +++ /dev/null @@ -1,88 +0,0 @@ - -import latestTime from './helpers/latestTime'; -import { increaseTimeTo, duration } from './helpers/increaseTime'; - -import assertRevert from './helpers/assertRevert'; - -const DayLimitMock = artifacts.require('DayLimitMock'); - -contract('DayLimit', function (accounts) { - let dayLimit; - let initLimit = 10; - - beforeEach(async function () { - this.startTime = latestTime(); - dayLimit = await DayLimitMock.new(initLimit); - }); - - it('should construct with the passed daily limit', async function () { - let dailyLimit = await dayLimit.dailyLimit(); - assert.equal(initLimit, dailyLimit); - }); - - it('should be able to spend if daily limit is not reached', async function () { - await dayLimit.attemptSpend(8); - let spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 8); - - await dayLimit.attemptSpend(2); - spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 10); - }); - - it('should prevent spending if daily limit is reached', async function () { - await dayLimit.attemptSpend(8); - let spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 8); - await assertRevert(dayLimit.attemptSpend(3)); - }); - - it('should allow spending if daily limit is reached and then set higher', async function () { - await dayLimit.attemptSpend(8); - let spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 8); - - await assertRevert(dayLimit.attemptSpend(3)); - spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 8); - - await dayLimit.setDailyLimit(15); - await dayLimit.attemptSpend(3); - spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 11); - }); - - it('should allow spending if daily limit is reached and then amount spent is reset', async function () { - await dayLimit.attemptSpend(8); - let spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 8); - - await assertRevert(dayLimit.attemptSpend(3)); - spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 8); - - await dayLimit.resetSpentToday(); - await dayLimit.attemptSpend(3); - spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 3); - }); - - it('should allow spending if daily limit is reached and then the next has come', async function () { - let limit = 10; - let dayLimit = await DayLimitMock.new(limit); - - await dayLimit.attemptSpend(8); - let spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 8); - - await assertRevert(dayLimit.attemptSpend(3)); - spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 8); - - await increaseTimeTo(this.startTime + duration.days(1)); - - await dayLimit.attemptSpend(3); - spentToday = await dayLimit.spentToday(); - assert.equal(spentToday, 3); - }); -}); diff --git a/test/Heritable.test.js b/test/Heritable.test.js deleted file mode 100644 index 2124a5279..000000000 --- a/test/Heritable.test.js +++ /dev/null @@ -1,136 +0,0 @@ -import increaseTime from './helpers/increaseTime'; -import expectThrow from './helpers/expectThrow'; -import assertRevert from './helpers/assertRevert'; - -const NULL_ADDRESS = '0x0000000000000000000000000000000000000000'; - -const Heritable = artifacts.require('Heritable'); - -contract('Heritable', function (accounts) { - let heritable; - let owner; - - beforeEach(async function () { - heritable = await Heritable.new(4141); - owner = await heritable.owner(); - }); - - it('should start off with an owner, but without heir', async function () { - const heir = await heritable.heir(); - - assert.equal(typeof (owner), 'string'); - assert.equal(typeof (heir), 'string'); - assert.notStrictEqual( - owner, NULL_ADDRESS, - 'Owner shouldn\'t be the null address' - ); - assert.isTrue( - heir === NULL_ADDRESS, - 'Heir should be the null address' - ); - }); - - it('only owner should set heir', async function () { - const newHeir = accounts[1]; - const someRandomAddress = accounts[2]; - assert.isTrue(owner !== someRandomAddress); - - await heritable.setHeir(newHeir, { from: owner }); - await expectThrow(heritable.setHeir(newHeir, { from: someRandomAddress })); - }); - - it('owner can\'t be heir', async function () { - await assertRevert(heritable.setHeir(owner, { from: owner })); - }); - - it('owner can remove heir', async function () { - const newHeir = accounts[1]; - await heritable.setHeir(newHeir, { from: owner }); - let heir = await heritable.heir(); - - assert.notStrictEqual(heir, NULL_ADDRESS); - await heritable.removeHeir(); - heir = await heritable.heir(); - assert.isTrue(heir === NULL_ADDRESS); - }); - - it('heir can claim ownership only if owner is dead and timeout was reached', async function () { - const heir = accounts[1]; - await heritable.setHeir(heir, { from: owner }); - await expectThrow(heritable.claimHeirOwnership({ from: heir })); - - await heritable.proclaimDeath({ from: heir }); - await increaseTime(1); - await expectThrow(heritable.claimHeirOwnership({ from: heir })); - - await increaseTime(4141); - await heritable.claimHeirOwnership({ from: heir }); - assert.isTrue(await heritable.heir() === heir); - }); - - it('only heir can proclaim death', async function () { - const someRandomAddress = accounts[2]; - await assertRevert(heritable.proclaimDeath({ from: owner })); - await assertRevert(heritable.proclaimDeath({ from: someRandomAddress })); - }); - - it('heir can\'t proclaim death if owner is death', async function () { - const heir = accounts[1]; - await heritable.setHeir(heir, { from: owner }); - await heritable.proclaimDeath({ from: heir }); - await assertRevert(heritable.proclaimDeath({ from: heir })); - }); - - it('heir can\'t claim ownership if owner heartbeats', async function () { - const heir = accounts[1]; - await heritable.setHeir(heir, { from: owner }); - - await heritable.proclaimDeath({ from: heir }); - await heritable.heartbeat({ from: owner }); - await expectThrow(heritable.claimHeirOwnership({ from: heir })); - - await heritable.proclaimDeath({ from: heir }); - await increaseTime(4141); - await heritable.heartbeat({ from: owner }); - await expectThrow(heritable.claimHeirOwnership({ from: heir })); - }); - - it('should log events appropriately', async function () { - const heir = accounts[1]; - - const setHeirLogs = (await heritable.setHeir(heir, { from: owner })).logs; - const setHeirEvent = setHeirLogs.find(e => e.event === 'HeirChanged'); - - assert.isTrue(setHeirEvent.args.owner === owner); - assert.isTrue(setHeirEvent.args.newHeir === heir); - - const heartbeatLogs = (await heritable.heartbeat({ from: owner })).logs; - const heartbeatEvent = heartbeatLogs.find(e => e.event === 'OwnerHeartbeated'); - - assert.isTrue(heartbeatEvent.args.owner === owner); - - const proclaimDeathLogs = (await heritable.proclaimDeath({ from: heir })).logs; - const ownerDeadEvent = proclaimDeathLogs.find(e => e.event === 'OwnerProclaimedDead'); - - assert.isTrue(ownerDeadEvent.args.owner === owner); - assert.isTrue(ownerDeadEvent.args.heir === heir); - - await increaseTime(4141); - const claimHeirOwnershipLogs = (await heritable.claimHeirOwnership({ from: heir })).logs; - const ownershipTransferredEvent = claimHeirOwnershipLogs.find(e => e.event === 'OwnershipTransferred'); - const heirOwnershipClaimedEvent = claimHeirOwnershipLogs.find(e => e.event === 'HeirOwnershipClaimed'); - - assert.isTrue(ownershipTransferredEvent.args.previousOwner === owner); - assert.isTrue(ownershipTransferredEvent.args.newOwner === heir); - assert.isTrue(heirOwnershipClaimedEvent.args.previousOwner === owner); - assert.isTrue(heirOwnershipClaimedEvent.args.newOwner === heir); - }); - - it('timeOfDeath can be queried', async function () { - assert.equal(await heritable.timeOfDeath(), 0); - }); - - it('heartbeatTimeout can be queried', async function () { - assert.equal(await heritable.heartbeatTimeout(), 4141); - }); -}); diff --git a/test/LimitBalance.test.js b/test/LimitBalance.test.js deleted file mode 100644 index 9df8b0dc8..000000000 --- a/test/LimitBalance.test.js +++ /dev/null @@ -1,47 +0,0 @@ -import assertRevert from './helpers/assertRevert'; -var LimitBalanceMock = artifacts.require('LimitBalanceMock'); - -contract('LimitBalance', function (accounts) { - let lb; - - beforeEach(async function () { - lb = await LimitBalanceMock.new(); - }); - - let LIMIT = 1000; - - it('should expose limit', async function () { - let limit = await lb.limit(); - assert.equal(limit, LIMIT); - }); - - it('should allow sending below limit', async function () { - let amount = 1; - await lb.limitedDeposit({ value: amount }); - - assert.equal(web3.eth.getBalance(lb.address), amount); - }); - - it('shouldnt allow sending above limit', async function () { - let amount = 1110; - await assertRevert(lb.limitedDeposit({ value: amount })); - }); - - it('should allow multiple sends below limit', async function () { - let amount = 500; - await lb.limitedDeposit({ value: amount }); - - assert.equal(web3.eth.getBalance(lb.address), amount); - - await lb.limitedDeposit({ value: amount }); - assert.equal(web3.eth.getBalance(lb.address), amount * 2); - }); - - it('shouldnt allow multiple sends above limit', async function () { - let amount = 500; - await lb.limitedDeposit({ value: amount }); - - assert.equal(web3.eth.getBalance(lb.address), amount); - await assertRevert(lb.limitedDeposit({ value: amount + 1 })); - }); -}); diff --git a/test/ReentrancyGuard.test.js b/test/ReentrancyGuard.test.js deleted file mode 100644 index 0e32cf369..000000000 --- a/test/ReentrancyGuard.test.js +++ /dev/null @@ -1,31 +0,0 @@ - -import expectThrow from './helpers/expectThrow'; -const ReentrancyMock = artifacts.require('ReentrancyMock'); -const ReentrancyAttack = artifacts.require('ReentrancyAttack'); - -contract('ReentrancyGuard', function (accounts) { - let reentrancyMock; - - beforeEach(async function () { - reentrancyMock = await ReentrancyMock.new(); - let initialCounter = await reentrancyMock.counter(); - assert.equal(initialCounter, 0); - }); - - it('should not allow remote callback', async function () { - let attacker = await ReentrancyAttack.new(); - await expectThrow(reentrancyMock.countAndCall(attacker.address)); - }); - - // The following are more side-effects than intended behaviour: - // I put them here as documentation, and to monitor any changes - // in the side-effects. - - it('should not allow local recursion', async function () { - await expectThrow(reentrancyMock.countLocalRecursive(10)); - }); - - it('should not allow indirect local recursion', async function () { - await expectThrow(reentrancyMock.countThisRecursive(10)); - }); -}); diff --git a/test/SimpleSavingsWallet.test.js b/test/SimpleSavingsWallet.test.js deleted file mode 100644 index 07787c2de..000000000 --- a/test/SimpleSavingsWallet.test.js +++ /dev/null @@ -1,33 +0,0 @@ - -import expectThrow from './helpers/expectThrow'; - -const SimpleSavingsWallet = artifacts.require('SimpleSavingsWallet'); - -contract('SimpleSavingsWallet', function (accounts) { - let savingsWallet; - let owner; - - const paymentAmount = 4242; - - beforeEach(async function () { - savingsWallet = await SimpleSavingsWallet.new(4141); - owner = await savingsWallet.owner(); - }); - - it('should receive funds', async function () { - await web3.eth.sendTransaction({ from: owner, to: savingsWallet.address, value: paymentAmount }); - assert.isTrue((new web3.BigNumber(paymentAmount)).equals(web3.eth.getBalance(savingsWallet.address))); - }); - - it('owner can send funds', async function () { - // Receive payment so we have some money to spend. - await web3.eth.sendTransaction({ from: accounts[9], to: savingsWallet.address, value: 1000000 }); - await expectThrow(savingsWallet.sendTo(0, paymentAmount, { from: owner })); - await expectThrow(savingsWallet.sendTo(savingsWallet.address, paymentAmount, { from: owner })); - await expectThrow(savingsWallet.sendTo(accounts[1], 0, { from: owner })); - - const balance = web3.eth.getBalance(accounts[1]); - await savingsWallet.sendTo(accounts[1], paymentAmount, { from: owner }); - assert.isTrue(balance.plus(paymentAmount).equals(web3.eth.getBalance(accounts[1]))); - }); -}); diff --git a/test/access/SignatureBouncer.test.js b/test/access/SignatureBouncer.test.js deleted file mode 100644 index 472a41226..000000000 --- a/test/access/SignatureBouncer.test.js +++ /dev/null @@ -1,119 +0,0 @@ - -import assertRevert from '../helpers/assertRevert'; -import { signHex } from '../helpers/sign'; - -const Bouncer = artifacts.require('SignatureBouncerMock'); - -require('chai') - .use(require('chai-as-promised')) - .should(); - -export const getSigner = (contract, signer, data = '') => (addr) => { - // via: https://github.com/OpenZeppelin/zeppelin-solidity/pull/812/files - const message = contract.address.substr(2) + addr.substr(2) + data; - // ^ substr to remove `0x` because in solidity the address is a set of byes, not a string `0xabcd` - return signHex(signer, message); -}; - -contract('Bouncer', ([_, owner, authorizedUser, anyone, bouncerAddress, newBouncer]) => { - before(async function () { - this.bouncer = await Bouncer.new({ from: owner }); - this.roleBouncer = await this.bouncer.ROLE_BOUNCER(); - this.genSig = getSigner(this.bouncer, bouncerAddress); - }); - - it('should have a default owner of self', async function () { - const theOwner = await this.bouncer.owner(); - theOwner.should.eq(owner); - }); - - it('should allow owner to add a bouncer', async function () { - await this.bouncer.addBouncer(bouncerAddress, { from: owner }); - const hasRole = await this.bouncer.hasRole(bouncerAddress, this.roleBouncer); - hasRole.should.eq(true); - }); - - it('should not allow anyone to add a bouncer', async function () { - await assertRevert( - this.bouncer.addBouncer(bouncerAddress, { from: anyone }) - ); - }); - - context('modifiers', () => { - it('should allow valid signature for sender', async function () { - await this.bouncer.onlyWithValidSignature( - this.genSig(authorizedUser), - { from: authorizedUser } - ); - }); - it('should not allow invalid signature for sender', async function () { - await assertRevert( - this.bouncer.onlyWithValidSignature( - 'abcd', - { from: authorizedUser } - ) - ); - }); - }); - - context('signatures', () => { - it('should accept valid message for valid user', async function () { - const isValid = await this.bouncer.checkValidSignature( - authorizedUser, - this.genSig(authorizedUser) - ); - isValid.should.eq(true); - }); - it('should not accept invalid message for valid user', async function () { - const isValid = await this.bouncer.checkValidSignature( - authorizedUser, - this.genSig(anyone) - ); - isValid.should.eq(false); - }); - it('should not accept invalid message for invalid user', async function () { - const isValid = await this.bouncer.checkValidSignature( - anyone, - 'abcd' - ); - isValid.should.eq(false); - }); - it('should not accept valid message for invalid user', async function () { - const isValid = await this.bouncer.checkValidSignature( - anyone, - this.genSig(authorizedUser) - ); - isValid.should.eq(false); - }); - }); - - context('management', () => { - it('should not allow anyone to add bouncers', async function () { - await assertRevert( - this.bouncer.addBouncer(newBouncer, { from: anyone }) - ); - }); - - it('should be able to add bouncers', async function () { - await this.bouncer.addBouncer(newBouncer, { from: owner }) - .should.be.fulfilled; - }); - - it('should not allow adding invalid address', async function () { - await assertRevert( - this.bouncer.addBouncer('0x0', { from: owner }) - ); - }); - - it('should not allow anyone to remove bouncer', async function () { - await assertRevert( - this.bouncer.removeBouncer(newBouncer, { from: anyone }) - ); - }); - - it('should be able to remove bouncers', async function () { - await this.bouncer.removeBouncer(newBouncer, { from: owner }) - .should.be.fulfilled; - }); - }); -}); diff --git a/test/crowdsale/AllowanceCrowdsale.test.js b/test/crowdsale/AllowanceCrowdsale.test.js deleted file mode 100644 index 44799010a..000000000 --- a/test/crowdsale/AllowanceCrowdsale.test.js +++ /dev/null @@ -1,77 +0,0 @@ -import ether from '../helpers/ether'; -import assertRevert from '../helpers/assertRevert'; - -const BigNumber = web3.BigNumber; - -const should = require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const AllowanceCrowdsale = artifacts.require('AllowanceCrowdsaleImpl'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('AllowanceCrowdsale', function ([_, investor, wallet, purchaser, tokenWallet]) { - const rate = new BigNumber(1); - const value = ether(0.42); - const expectedTokenAmount = rate.mul(value); - const tokenAllowance = new BigNumber('1e22'); - const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'; - - beforeEach(async function () { - this.token = await SimpleToken.new({ from: tokenWallet }); - this.crowdsale = await AllowanceCrowdsale.new(rate, wallet, this.token.address, tokenWallet); - await this.token.approve(this.crowdsale.address, tokenAllowance, { from: tokenWallet }); - }); - - describe('accepting payments', function () { - it('should accept sends', async function () { - await this.crowdsale.send(value).should.be.fulfilled; - }); - - it('should accept payments', async function () { - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }).should.be.fulfilled; - }); - }); - - describe('high-level purchase', function () { - it('should log purchase', async function () { - const { logs } = await this.crowdsale.sendTransaction({ value: value, from: investor }); - const event = logs.find(e => e.event === 'TokenPurchase'); - should.exist(event); - event.args.purchaser.should.equal(investor); - event.args.beneficiary.should.equal(investor); - event.args.value.should.be.bignumber.equal(value); - event.args.amount.should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should assign tokens to sender', async function () { - await this.crowdsale.sendTransaction({ value: value, from: investor }); - let balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should forward funds to wallet', async function () { - const pre = web3.eth.getBalance(wallet); - await this.crowdsale.sendTransaction({ value, from: investor }); - const post = web3.eth.getBalance(wallet); - post.minus(pre).should.be.bignumber.equal(value); - }); - }); - - describe('check remaining allowance', function () { - it('should report correct allowace left', async function () { - let remainingAllowance = tokenAllowance - expectedTokenAmount; - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }); - let tokensRemaining = await this.crowdsale.remainingTokens(); - tokensRemaining.should.be.bignumber.equal(remainingAllowance); - }); - }); - - describe('when token wallet is different from token address', function () { - it('creation reverts', async function () { - this.token = await SimpleToken.new({ from: tokenWallet }); - await assertRevert(AllowanceCrowdsale.new(rate, wallet, this.token.address, ZERO_ADDRESS)); - }); - }); -}); diff --git a/test/crowdsale/CappedCrowdsale.test.js b/test/crowdsale/CappedCrowdsale.test.js deleted file mode 100644 index a3dd9660f..000000000 --- a/test/crowdsale/CappedCrowdsale.test.js +++ /dev/null @@ -1,69 +0,0 @@ -import ether from '../helpers/ether'; -import EVMRevert from '../helpers/EVMRevert'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const CappedCrowdsale = artifacts.require('CappedCrowdsaleImpl'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('CappedCrowdsale', function ([_, wallet]) { - const rate = new BigNumber(1); - const cap = ether(100); - const lessThanCap = ether(60); - const tokenSupply = new BigNumber('1e22'); - - beforeEach(async function () { - this.token = await SimpleToken.new(); - this.crowdsale = await CappedCrowdsale.new(rate, wallet, this.token.address, cap); - await this.token.transfer(this.crowdsale.address, tokenSupply); - }); - - describe('creating a valid crowdsale', function () { - it('should fail with zero cap', async function () { - await CappedCrowdsale.new(rate, wallet, 0, this.token.address).should.be.rejectedWith(EVMRevert); - }); - }); - - describe('accepting payments', function () { - it('should accept payments within cap', async function () { - await this.crowdsale.send(cap.minus(lessThanCap)).should.be.fulfilled; - await this.crowdsale.send(lessThanCap).should.be.fulfilled; - }); - - it('should reject payments outside cap', async function () { - await this.crowdsale.send(cap); - await this.crowdsale.send(1).should.be.rejectedWith(EVMRevert); - }); - - it('should reject payments that exceed cap', async function () { - await this.crowdsale.send(cap.plus(1)).should.be.rejectedWith(EVMRevert); - }); - }); - - describe('ending', function () { - it('should not reach cap if sent under cap', async function () { - let capReached = await this.crowdsale.capReached(); - capReached.should.equal(false); - await this.crowdsale.send(lessThanCap); - capReached = await this.crowdsale.capReached(); - capReached.should.equal(false); - }); - - it('should not reach cap if sent just under cap', async function () { - await this.crowdsale.send(cap.minus(1)); - let capReached = await this.crowdsale.capReached(); - capReached.should.equal(false); - }); - - it('should reach cap if cap sent', async function () { - await this.crowdsale.send(cap); - let capReached = await this.crowdsale.capReached(); - capReached.should.equal(true); - }); - }); -}); diff --git a/test/crowdsale/Crowdsale.test.js b/test/crowdsale/Crowdsale.test.js deleted file mode 100644 index 4053dca37..000000000 --- a/test/crowdsale/Crowdsale.test.js +++ /dev/null @@ -1,81 +0,0 @@ -import ether from '../helpers/ether'; - -const BigNumber = web3.BigNumber; - -const should = require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const Crowdsale = artifacts.require('Crowdsale'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('Crowdsale', function ([_, investor, wallet, purchaser]) { - const rate = new BigNumber(1); - const value = ether(42); - const tokenSupply = new BigNumber('1e22'); - const expectedTokenAmount = rate.mul(value); - - beforeEach(async function () { - this.token = await SimpleToken.new(); - this.crowdsale = await Crowdsale.new(rate, wallet, this.token.address); - await this.token.transfer(this.crowdsale.address, tokenSupply); - }); - - describe('accepting payments', function () { - it('should accept payments', async function () { - await this.crowdsale.send(value).should.be.fulfilled; - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }).should.be.fulfilled; - }); - }); - - describe('high-level purchase', function () { - it('should log purchase', async function () { - const { logs } = await this.crowdsale.sendTransaction({ value: value, from: investor }); - const event = logs.find(e => e.event === 'TokenPurchase'); - should.exist(event); - event.args.purchaser.should.equal(investor); - event.args.beneficiary.should.equal(investor); - event.args.value.should.be.bignumber.equal(value); - event.args.amount.should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should assign tokens to sender', async function () { - await this.crowdsale.sendTransaction({ value: value, from: investor }); - let balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should forward funds to wallet', async function () { - const pre = web3.eth.getBalance(wallet); - await this.crowdsale.sendTransaction({ value, from: investor }); - const post = web3.eth.getBalance(wallet); - post.minus(pre).should.be.bignumber.equal(value); - }); - }); - - describe('low-level purchase', function () { - it('should log purchase', async function () { - const { logs } = await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }); - const event = logs.find(e => e.event === 'TokenPurchase'); - should.exist(event); - event.args.purchaser.should.equal(purchaser); - event.args.beneficiary.should.equal(investor); - event.args.value.should.be.bignumber.equal(value); - event.args.amount.should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should assign tokens to beneficiary', async function () { - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - const balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should forward funds to wallet', async function () { - const pre = web3.eth.getBalance(wallet); - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - const post = web3.eth.getBalance(wallet); - post.minus(pre).should.be.bignumber.equal(value); - }); - }); -}); diff --git a/test/crowdsale/FinalizableCrowdsale.test.js b/test/crowdsale/FinalizableCrowdsale.test.js deleted file mode 100644 index 9a6c16a6f..000000000 --- a/test/crowdsale/FinalizableCrowdsale.test.js +++ /dev/null @@ -1,62 +0,0 @@ -import { advanceBlock } from '../helpers/advanceToBlock'; -import { increaseTimeTo, duration } from '../helpers/increaseTime'; -import latestTime from '../helpers/latestTime'; -import EVMRevert from '../helpers/EVMRevert'; - -const BigNumber = web3.BigNumber; - -const should = require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const FinalizableCrowdsale = artifacts.require('FinalizableCrowdsaleImpl'); -const MintableToken = artifacts.require('MintableToken'); - -contract('FinalizableCrowdsale', function ([_, owner, wallet, thirdparty]) { - const rate = new BigNumber(1000); - - before(async function () { - // Advance to the next block to correctly read time in the solidity "now" function interpreted by ganache - await advanceBlock(); - }); - - beforeEach(async function () { - this.openingTime = latestTime() + duration.weeks(1); - this.closingTime = this.openingTime + duration.weeks(1); - this.afterClosingTime = this.closingTime + duration.seconds(1); - - this.token = await MintableToken.new(); - this.crowdsale = await FinalizableCrowdsale.new( - this.openingTime, this.closingTime, rate, wallet, this.token.address, { from: owner } - ); - await this.token.transferOwnership(this.crowdsale.address); - }); - - it('cannot be finalized before ending', async function () { - await this.crowdsale.finalize({ from: owner }).should.be.rejectedWith(EVMRevert); - }); - - it('cannot be finalized by third party after ending', async function () { - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.finalize({ from: thirdparty }).should.be.rejectedWith(EVMRevert); - }); - - it('can be finalized by owner after ending', async function () { - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.finalize({ from: owner }).should.be.fulfilled; - }); - - it('cannot be finalized twice', async function () { - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.finalize({ from: owner }); - await this.crowdsale.finalize({ from: owner }).should.be.rejectedWith(EVMRevert); - }); - - it('logs finalized', async function () { - await increaseTimeTo(this.afterClosingTime); - const { logs } = await this.crowdsale.finalize({ from: owner }); - const event = logs.find(e => e.event === 'Finalized'); - should.exist(event); - }); -}); diff --git a/test/crowdsale/IncreasingPriceCrowdsale.test.js b/test/crowdsale/IncreasingPriceCrowdsale.test.js deleted file mode 100644 index 76f82ab02..000000000 --- a/test/crowdsale/IncreasingPriceCrowdsale.test.js +++ /dev/null @@ -1,92 +0,0 @@ -import ether from '../helpers/ether'; -import { advanceBlock } from '../helpers/advanceToBlock'; -import { increaseTimeTo, duration } from '../helpers/increaseTime'; -import latestTime from '../helpers/latestTime'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const IncreasingPriceCrowdsale = artifacts.require('IncreasingPriceCrowdsaleImpl'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('IncreasingPriceCrowdsale', function ([_, investor, wallet, purchaser]) { - const value = ether(1); - const tokenSupply = new BigNumber('1e22'); - - describe('rate during crowdsale should change at a fixed step every block', async function () { - let balance; - const initialRate = new BigNumber(9166); - const finalRate = new BigNumber(5500); - const rateAtTime150 = new BigNumber(9166); - const rateAtTime300 = new BigNumber(9165); - const rateAtTime1500 = new BigNumber(9157); - const rateAtTime30 = new BigNumber(9166); - const rateAtTime150000 = new BigNumber(8257); - const rateAtTime450000 = new BigNumber(6439); - - beforeEach(async function () { - await advanceBlock(); - this.startTime = latestTime() + duration.weeks(1); - this.closingTime = this.startTime + duration.weeks(1); - this.afterClosingTime = this.closingTime + duration.seconds(1); - this.token = await SimpleToken.new(); - this.crowdsale = await IncreasingPriceCrowdsale.new( - this.startTime, this.closingTime, wallet, this.token.address, initialRate, finalRate - ); - await this.token.transfer(this.crowdsale.address, tokenSupply); - }); - - it('at start', async function () { - await increaseTimeTo(this.startTime); - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(value.mul(initialRate)); - }); - - it('at time 150', async function () { - await increaseTimeTo(this.startTime + 150); - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(value.mul(rateAtTime150)); - }); - - it('at time 300', async function () { - await increaseTimeTo(this.startTime + 300); - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(value.mul(rateAtTime300)); - }); - - it('at time 1500', async function () { - await increaseTimeTo(this.startTime + 1500); - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(value.mul(rateAtTime1500)); - }); - - it('at time 30', async function () { - await increaseTimeTo(this.startTime + 30); - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(value.mul(rateAtTime30)); - }); - - it('at time 150000', async function () { - await increaseTimeTo(this.startTime + 150000); - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(value.mul(rateAtTime150000)); - }); - - it('at time 450000', async function () { - await increaseTimeTo(this.startTime + 450000); - await this.crowdsale.buyTokens(investor, { value, from: purchaser }); - balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(value.mul(rateAtTime450000)); - }); - }); -}); diff --git a/test/crowdsale/IndividuallyCappedCrowdsale.test.js b/test/crowdsale/IndividuallyCappedCrowdsale.test.js deleted file mode 100644 index e8585ad6d..000000000 --- a/test/crowdsale/IndividuallyCappedCrowdsale.test.js +++ /dev/null @@ -1,107 +0,0 @@ -import ether from '../helpers/ether'; -import EVMRevert from '../helpers/EVMRevert'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const CappedCrowdsale = artifacts.require('IndividuallyCappedCrowdsaleImpl'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('IndividuallyCappedCrowdsale', function ([_, wallet, alice, bob, charlie]) { - const rate = new BigNumber(1); - const capAlice = ether(10); - const capBob = ether(2); - const lessThanCapAlice = ether(6); - const lessThanCapBoth = ether(1); - const tokenSupply = new BigNumber('1e22'); - - describe('individual capping', function () { - beforeEach(async function () { - this.token = await SimpleToken.new(); - this.crowdsale = await CappedCrowdsale.new(rate, wallet, this.token.address); - await this.crowdsale.setUserCap(alice, capAlice); - await this.crowdsale.setUserCap(bob, capBob); - await this.token.transfer(this.crowdsale.address, tokenSupply); - }); - - describe('accepting payments', function () { - it('should accept payments within cap', async function () { - await this.crowdsale.buyTokens(alice, { value: lessThanCapAlice }).should.be.fulfilled; - await this.crowdsale.buyTokens(bob, { value: lessThanCapBoth }).should.be.fulfilled; - }); - - it('should reject payments outside cap', async function () { - await this.crowdsale.buyTokens(alice, { value: capAlice }); - await this.crowdsale.buyTokens(alice, { value: 1 }).should.be.rejectedWith(EVMRevert); - }); - - it('should reject payments that exceed cap', async function () { - await this.crowdsale.buyTokens(alice, { value: capAlice.plus(1) }).should.be.rejectedWith(EVMRevert); - await this.crowdsale.buyTokens(bob, { value: capBob.plus(1) }).should.be.rejectedWith(EVMRevert); - }); - - it('should manage independent caps', async function () { - await this.crowdsale.buyTokens(alice, { value: lessThanCapAlice }).should.be.fulfilled; - await this.crowdsale.buyTokens(bob, { value: lessThanCapAlice }).should.be.rejectedWith(EVMRevert); - }); - - it('should default to a cap of zero', async function () { - await this.crowdsale.buyTokens(charlie, { value: lessThanCapBoth }).should.be.rejectedWith(EVMRevert); - }); - }); - - describe('reporting state', function () { - it('should report correct cap', async function () { - let retrievedCap = await this.crowdsale.getUserCap(alice); - retrievedCap.should.be.bignumber.equal(capAlice); - }); - - it('should report actual contribution', async function () { - await this.crowdsale.buyTokens(alice, { value: lessThanCapAlice }); - let retrievedContribution = await this.crowdsale.getUserContribution(alice); - retrievedContribution.should.be.bignumber.equal(lessThanCapAlice); - }); - }); - }); - - describe('group capping', function () { - beforeEach(async function () { - this.token = await SimpleToken.new(); - this.crowdsale = await CappedCrowdsale.new(rate, wallet, this.token.address); - await this.crowdsale.setGroupCap([bob, charlie], capBob); - await this.token.transfer(this.crowdsale.address, tokenSupply); - }); - - describe('accepting payments', function () { - it('should accept payments within cap', async function () { - await this.crowdsale.buyTokens(bob, { value: lessThanCapBoth }).should.be.fulfilled; - await this.crowdsale.buyTokens(charlie, { value: lessThanCapBoth }).should.be.fulfilled; - }); - - it('should reject payments outside cap', async function () { - await this.crowdsale.buyTokens(bob, { value: capBob }); - await this.crowdsale.buyTokens(bob, { value: 1 }).should.be.rejectedWith(EVMRevert); - await this.crowdsale.buyTokens(charlie, { value: capBob }); - await this.crowdsale.buyTokens(charlie, { value: 1 }).should.be.rejectedWith(EVMRevert); - }); - - it('should reject payments that exceed cap', async function () { - await this.crowdsale.buyTokens(bob, { value: capBob.plus(1) }).should.be.rejectedWith(EVMRevert); - await this.crowdsale.buyTokens(charlie, { value: capBob.plus(1) }).should.be.rejectedWith(EVMRevert); - }); - }); - - describe('reporting state', function () { - it('should report correct cap', async function () { - let retrievedCapBob = await this.crowdsale.getUserCap(bob); - retrievedCapBob.should.be.bignumber.equal(capBob); - let retrievedCapCharlie = await this.crowdsale.getUserCap(charlie); - retrievedCapCharlie.should.be.bignumber.equal(capBob); - }); - }); - }); -}); diff --git a/test/crowdsale/MintedCrowdsale.test.js b/test/crowdsale/MintedCrowdsale.test.js deleted file mode 100644 index 362dc23af..000000000 --- a/test/crowdsale/MintedCrowdsale.test.js +++ /dev/null @@ -1,61 +0,0 @@ -import ether from '../helpers/ether'; - -const BigNumber = web3.BigNumber; - -const should = require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const MintedCrowdsale = artifacts.require('MintedCrowdsaleImpl'); -const MintableToken = artifacts.require('MintableToken'); - -contract('MintedCrowdsale', function ([_, investor, wallet, purchaser]) { - const rate = new BigNumber(1000); - const value = ether(42); - - const expectedTokenAmount = rate.mul(value); - - beforeEach(async function () { - this.token = await MintableToken.new(); - this.crowdsale = await MintedCrowdsale.new(rate, wallet, this.token.address); - await this.token.transferOwnership(this.crowdsale.address); - }); - - describe('accepting payments', function () { - it('should be token owner', async function () { - const owner = await this.token.owner(); - owner.should.equal(this.crowdsale.address); - }); - - it('should accept payments', async function () { - await this.crowdsale.send(value).should.be.fulfilled; - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }).should.be.fulfilled; - }); - }); - - describe('high-level purchase', function () { - it('should log purchase', async function () { - const { logs } = await this.crowdsale.sendTransaction({ value: value, from: investor }); - const event = logs.find(e => e.event === 'TokenPurchase'); - should.exist(event); - event.args.purchaser.should.equal(investor); - event.args.beneficiary.should.equal(investor); - event.args.value.should.be.bignumber.equal(value); - event.args.amount.should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should assign tokens to sender', async function () { - await this.crowdsale.sendTransaction({ value: value, from: investor }); - let balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should forward funds to wallet', async function () { - const pre = web3.eth.getBalance(wallet); - await this.crowdsale.sendTransaction({ value, from: investor }); - const post = web3.eth.getBalance(wallet); - post.minus(pre).should.be.bignumber.equal(value); - }); - }); -}); diff --git a/test/crowdsale/PostDeliveryCrowdsale.test.js b/test/crowdsale/PostDeliveryCrowdsale.test.js deleted file mode 100644 index 1860a8dea..000000000 --- a/test/crowdsale/PostDeliveryCrowdsale.test.js +++ /dev/null @@ -1,67 +0,0 @@ -import { advanceBlock } from '../helpers/advanceToBlock'; -import { increaseTimeTo, duration } from '../helpers/increaseTime'; -import latestTime from '../helpers/latestTime'; -import EVMRevert from '../helpers/EVMRevert'; -import ether from '../helpers/ether'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const PostDeliveryCrowdsale = artifacts.require('PostDeliveryCrowdsaleImpl'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('PostDeliveryCrowdsale', function ([_, investor, wallet, purchaser]) { - const rate = new BigNumber(1); - const value = ether(42); - const tokenSupply = new BigNumber('1e22'); - - before(async function () { - // Advance to the next block to correctly read time in the solidity "now" function interpreted by ganache - await advanceBlock(); - }); - - beforeEach(async function () { - this.openingTime = latestTime() + duration.weeks(1); - this.closingTime = this.openingTime + duration.weeks(1); - this.beforeEndTime = this.closingTime - duration.hours(1); - this.afterClosingTime = this.closingTime + duration.seconds(1); - this.token = await SimpleToken.new(); - this.crowdsale = await PostDeliveryCrowdsale.new( - this.openingTime, this.closingTime, rate, wallet, this.token.address - ); - await this.token.transfer(this.crowdsale.address, tokenSupply); - }); - - it('should not immediately assign tokens to beneficiary', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }); - const balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(0); - }); - - it('should not allow beneficiaries to withdraw tokens before crowdsale ends', async function () { - await increaseTimeTo(this.beforeEndTime); - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }); - await this.crowdsale.withdrawTokens({ from: investor }).should.be.rejectedWith(EVMRevert); - }); - - it('should allow beneficiaries to withdraw tokens after crowdsale ends', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }); - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.withdrawTokens({ from: investor }).should.be.fulfilled; - }); - - it('should return the amount of tokens bought', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }); - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.withdrawTokens({ from: investor }); - const balance = await this.token.balanceOf(investor); - balance.should.be.bignumber.equal(value); - }); -}); diff --git a/test/crowdsale/RefundVault.test.js b/test/crowdsale/RefundVault.test.js deleted file mode 100644 index e3b88dfce..000000000 --- a/test/crowdsale/RefundVault.test.js +++ /dev/null @@ -1,59 +0,0 @@ -import ether from '../helpers/ether'; -import EVMRevert from '../helpers/EVMRevert'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const RefundVault = artifacts.require('RefundVault'); - -contract('RefundVault', function ([_, owner, wallet, investor]) { - const value = ether(42); - - beforeEach(async function () { - this.vault = await RefundVault.new(wallet, { from: owner }); - }); - - it('should accept contributions', async function () { - await this.vault.deposit(investor, { value, from: owner }).should.be.fulfilled; - }); - - it('should not refund contribution during active state', async function () { - await this.vault.deposit(investor, { value, from: owner }); - await this.vault.refund(investor).should.be.rejectedWith(EVMRevert); - }); - - it('only owner can enter refund mode', async function () { - await this.vault.enableRefunds({ from: _ }).should.be.rejectedWith(EVMRevert); - await this.vault.enableRefunds({ from: owner }).should.be.fulfilled; - }); - - it('should refund contribution after entering refund mode', async function () { - await this.vault.deposit(investor, { value, from: owner }); - await this.vault.enableRefunds({ from: owner }); - - const pre = web3.eth.getBalance(investor); - await this.vault.refund(investor); - const post = web3.eth.getBalance(investor); - - post.minus(pre).should.be.bignumber.equal(value); - }); - - it('only owner can close', async function () { - await this.vault.close({ from: _ }).should.be.rejectedWith(EVMRevert); - await this.vault.close({ from: owner }).should.be.fulfilled; - }); - - it('should forward funds to wallet after closing', async function () { - await this.vault.deposit(investor, { value, from: owner }); - - const pre = web3.eth.getBalance(wallet); - await this.vault.close({ from: owner }); - const post = web3.eth.getBalance(wallet); - - post.minus(pre).should.be.bignumber.equal(value); - }); -}); diff --git a/test/crowdsale/RefundableCrowdsale.test.js b/test/crowdsale/RefundableCrowdsale.test.js deleted file mode 100644 index 551e65c98..000000000 --- a/test/crowdsale/RefundableCrowdsale.test.js +++ /dev/null @@ -1,82 +0,0 @@ -import ether from '../helpers/ether'; -import { advanceBlock } from '../helpers/advanceToBlock'; -import { increaseTimeTo, duration } from '../helpers/increaseTime'; -import latestTime from '../helpers/latestTime'; -import EVMRevert from '../helpers/EVMRevert'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const RefundableCrowdsale = artifacts.require('RefundableCrowdsaleImpl'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('RefundableCrowdsale', function ([_, owner, wallet, investor, purchaser]) { - const rate = new BigNumber(1); - const goal = ether(50); - const lessThanGoal = ether(45); - const tokenSupply = new BigNumber('1e22'); - - before(async function () { - // Advance to the next block to correctly read time in the solidity "now" function interpreted by ganache - await advanceBlock(); - }); - - beforeEach(async function () { - this.openingTime = latestTime() + duration.weeks(1); - this.closingTime = this.openingTime + duration.weeks(1); - this.afterClosingTime = this.closingTime + duration.seconds(1); - - this.token = await SimpleToken.new(); - this.crowdsale = await RefundableCrowdsale.new( - this.openingTime, this.closingTime, rate, wallet, this.token.address, goal, { from: owner } - ); - await this.token.transfer(this.crowdsale.address, tokenSupply); - }); - - describe('creating a valid crowdsale', function () { - it('should fail with zero goal', async function () { - await RefundableCrowdsale.new( - this.openingTime, this.closingTime, rate, wallet, this.token.address, 0, { from: owner } - ).should.be.rejectedWith(EVMRevert); - }); - }); - - it('should deny refunds before end', async function () { - await this.crowdsale.claimRefund({ from: investor }).should.be.rejectedWith(EVMRevert); - await increaseTimeTo(this.openingTime); - await this.crowdsale.claimRefund({ from: investor }).should.be.rejectedWith(EVMRevert); - }); - - it('should deny refunds after end if goal was reached', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.sendTransaction({ value: goal, from: investor }); - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.claimRefund({ from: investor }).should.be.rejectedWith(EVMRevert); - }); - - it('should allow refunds after end if goal was not reached', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.sendTransaction({ value: lessThanGoal, from: investor }); - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.finalize({ from: owner }); - const pre = web3.eth.getBalance(investor); - await this.crowdsale.claimRefund({ from: investor, gasPrice: 0 }) - .should.be.fulfilled; - const post = web3.eth.getBalance(investor); - post.minus(pre).should.be.bignumber.equal(lessThanGoal); - }); - - it('should forward funds to wallet after end if goal was reached', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.sendTransaction({ value: goal, from: investor }); - await increaseTimeTo(this.afterClosingTime); - const pre = web3.eth.getBalance(wallet); - await this.crowdsale.finalize({ from: owner }); - const post = web3.eth.getBalance(wallet); - post.minus(pre).should.be.bignumber.equal(goal); - }); -}); diff --git a/test/crowdsale/TimedCrowdsale.test.js b/test/crowdsale/TimedCrowdsale.test.js deleted file mode 100644 index ad54792a4..000000000 --- a/test/crowdsale/TimedCrowdsale.test.js +++ /dev/null @@ -1,62 +0,0 @@ -import ether from '../helpers/ether'; -import { advanceBlock } from '../helpers/advanceToBlock'; -import { increaseTimeTo, duration } from '../helpers/increaseTime'; -import latestTime from '../helpers/latestTime'; -import EVMRevert from '../helpers/EVMRevert'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const TimedCrowdsale = artifacts.require('TimedCrowdsaleImpl'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('TimedCrowdsale', function ([_, investor, wallet, purchaser]) { - const rate = new BigNumber(1); - const value = ether(42); - const tokenSupply = new BigNumber('1e22'); - - before(async function () { - // Advance to the next block to correctly read time in the solidity "now" function interpreted by ganache - await advanceBlock(); - }); - - beforeEach(async function () { - this.openingTime = latestTime() + duration.weeks(1); - this.closingTime = this.openingTime + duration.weeks(1); - this.afterClosingTime = this.closingTime + duration.seconds(1); - this.token = await SimpleToken.new(); - this.crowdsale = await TimedCrowdsale.new(this.openingTime, this.closingTime, rate, wallet, this.token.address); - await this.token.transfer(this.crowdsale.address, tokenSupply); - }); - - it('should be ended only after end', async function () { - let ended = await this.crowdsale.hasClosed(); - ended.should.equal(false); - await increaseTimeTo(this.afterClosingTime); - ended = await this.crowdsale.hasClosed(); - ended.should.equal(true); - }); - - describe('accepting payments', function () { - it('should reject payments before start', async function () { - await this.crowdsale.send(value).should.be.rejectedWith(EVMRevert); - await this.crowdsale.buyTokens(investor, { from: purchaser, value: value }).should.be.rejectedWith(EVMRevert); - }); - - it('should accept payments after start', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.send(value).should.be.fulfilled; - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }).should.be.fulfilled; - }); - - it('should reject payments after end', async function () { - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.send(value).should.be.rejectedWith(EVMRevert); - await this.crowdsale.buyTokens(investor, { value: value, from: purchaser }).should.be.rejectedWith(EVMRevert); - }); - }); -}); diff --git a/test/crowdsale/WhitelistedCrowdsale.test.js b/test/crowdsale/WhitelistedCrowdsale.test.js deleted file mode 100644 index e62016ace..000000000 --- a/test/crowdsale/WhitelistedCrowdsale.test.js +++ /dev/null @@ -1,93 +0,0 @@ -import ether from '../helpers/ether'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .should(); - -const WhitelistedCrowdsale = artifacts.require('WhitelistedCrowdsaleImpl'); -const SimpleToken = artifacts.require('SimpleToken'); - -contract('WhitelistedCrowdsale', function ([_, wallet, authorized, unauthorized, anotherAuthorized]) { - const rate = 1; - const value = ether(42); - const tokenSupply = new BigNumber('1e22'); - - describe('single user whitelisting', function () { - beforeEach(async function () { - this.token = await SimpleToken.new(); - this.crowdsale = await WhitelistedCrowdsale.new(rate, wallet, this.token.address); - await this.token.transfer(this.crowdsale.address, tokenSupply); - await this.crowdsale.addToWhitelist(authorized); - }); - - describe('accepting payments', function () { - it('should accept payments to whitelisted (from whichever buyers)', async function () { - await this.crowdsale.buyTokens(authorized, { value: value, from: authorized }).should.be.fulfilled; - await this.crowdsale.buyTokens(authorized, { value: value, from: unauthorized }).should.be.fulfilled; - }); - - it('should reject payments to not whitelisted (from whichever buyers)', async function () { - await this.crowdsale.send(value).should.be.rejected; - await this.crowdsale.buyTokens(unauthorized, { value: value, from: unauthorized }).should.be.rejected; - await this.crowdsale.buyTokens(unauthorized, { value: value, from: authorized }).should.be.rejected; - }); - - it('should reject payments to addresses removed from whitelist', async function () { - await this.crowdsale.removeFromWhitelist(authorized); - await this.crowdsale.buyTokens(authorized, { value: value, from: authorized }).should.be.rejected; - }); - }); - - describe('reporting whitelisted', function () { - it('should correctly report whitelisted addresses', async function () { - let isAuthorized = await this.crowdsale.whitelist(authorized); - isAuthorized.should.equal(true); - let isntAuthorized = await this.crowdsale.whitelist(unauthorized); - isntAuthorized.should.equal(false); - }); - }); - }); - - describe('many user whitelisting', function () { - beforeEach(async function () { - this.token = await SimpleToken.new(); - this.crowdsale = await WhitelistedCrowdsale.new(rate, wallet, this.token.address); - await this.token.transfer(this.crowdsale.address, tokenSupply); - await this.crowdsale.addManyToWhitelist([authorized, anotherAuthorized]); - }); - - describe('accepting payments', function () { - it('should accept payments to whitelisted (from whichever buyers)', async function () { - await this.crowdsale.buyTokens(authorized, { value: value, from: authorized }).should.be.fulfilled; - await this.crowdsale.buyTokens(authorized, { value: value, from: unauthorized }).should.be.fulfilled; - await this.crowdsale.buyTokens(anotherAuthorized, { value: value, from: authorized }).should.be.fulfilled; - await this.crowdsale.buyTokens(anotherAuthorized, { value: value, from: unauthorized }).should.be.fulfilled; - }); - - it('should reject payments to not whitelisted (with whichever buyers)', async function () { - await this.crowdsale.send(value).should.be.rejected; - await this.crowdsale.buyTokens(unauthorized, { value: value, from: unauthorized }).should.be.rejected; - await this.crowdsale.buyTokens(unauthorized, { value: value, from: authorized }).should.be.rejected; - }); - - it('should reject payments to addresses removed from whitelist', async function () { - await this.crowdsale.removeFromWhitelist(anotherAuthorized); - await this.crowdsale.buyTokens(authorized, { value: value, from: authorized }).should.be.fulfilled; - await this.crowdsale.buyTokens(anotherAuthorized, { value: value, from: authorized }).should.be.rejected; - }); - }); - - describe('reporting whitelisted', function () { - it('should correctly report whitelisted addresses', async function () { - let isAuthorized = await this.crowdsale.whitelist(authorized); - isAuthorized.should.equal(true); - let isAnotherAuthorized = await this.crowdsale.whitelist(anotherAuthorized); - isAnotherAuthorized.should.equal(true); - let isntAuthorized = await this.crowdsale.whitelist(unauthorized); - isntAuthorized.should.equal(false); - }); - }); - }); -}); diff --git a/test/examples/SampleCrowdsale.test.js b/test/examples/SampleCrowdsale.test.js deleted file mode 100644 index 45d0c216e..000000000 --- a/test/examples/SampleCrowdsale.test.js +++ /dev/null @@ -1,126 +0,0 @@ -import ether from '../helpers/ether'; -import { advanceBlock } from '../helpers/advanceToBlock'; -import { increaseTimeTo, duration } from '../helpers/increaseTime'; -import latestTime from '../helpers/latestTime'; -import EVMRevert from '../helpers/EVMRevert'; -import assertRevert from '../helpers/assertRevert'; - -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const SampleCrowdsale = artifacts.require('SampleCrowdsale'); -const SampleCrowdsaleToken = artifacts.require('SampleCrowdsaleToken'); -const RefundVault = artifacts.require('RefundVault'); - -contract('SampleCrowdsale', function ([owner, wallet, investor]) { - const RATE = new BigNumber(10); - const GOAL = ether(10); - const CAP = ether(20); - - before(async function () { - // Advance to the next block to correctly read time in the solidity "now" function interpreted by ganache - await advanceBlock(); - }); - - beforeEach(async function () { - this.openingTime = latestTime() + duration.weeks(1); - this.closingTime = this.openingTime + duration.weeks(1); - this.afterClosingTime = this.closingTime + duration.seconds(1); - - this.token = await SampleCrowdsaleToken.new({ from: owner }); - this.vault = await RefundVault.new(wallet, { from: owner }); - this.crowdsale = await SampleCrowdsale.new( - this.openingTime, this.closingTime, RATE, wallet, CAP, this.token.address, GOAL - ); - await this.token.transferOwnership(this.crowdsale.address); - await this.vault.transferOwnership(this.crowdsale.address); - }); - - it('should create crowdsale with correct parameters', async function () { - this.crowdsale.should.exist; - this.token.should.exist; - - const openingTime = await this.crowdsale.openingTime(); - const closingTime = await this.crowdsale.closingTime(); - const rate = await this.crowdsale.rate(); - const walletAddress = await this.crowdsale.wallet(); - const goal = await this.crowdsale.goal(); - const cap = await this.crowdsale.cap(); - - openingTime.should.be.bignumber.equal(this.openingTime); - closingTime.should.be.bignumber.equal(this.closingTime); - rate.should.be.bignumber.equal(RATE); - walletAddress.should.be.equal(wallet); - goal.should.be.bignumber.equal(GOAL); - cap.should.be.bignumber.equal(CAP); - }); - - it('should not accept payments before start', async function () { - await this.crowdsale.send(ether(1)).should.be.rejectedWith(EVMRevert); - await this.crowdsale.buyTokens(investor, { from: investor, value: ether(1) }).should.be.rejectedWith(EVMRevert); - }); - - it('should accept payments during the sale', async function () { - const investmentAmount = ether(1); - const expectedTokenAmount = RATE.mul(investmentAmount); - - await increaseTimeTo(this.openingTime); - await this.crowdsale.buyTokens(investor, { value: investmentAmount, from: investor }).should.be.fulfilled; - - (await this.token.balanceOf(investor)).should.be.bignumber.equal(expectedTokenAmount); - (await this.token.totalSupply()).should.be.bignumber.equal(expectedTokenAmount); - }); - - it('should reject payments after end', async function () { - await increaseTimeTo(this.afterEnd); - await this.crowdsale.send(ether(1)).should.be.rejectedWith(EVMRevert); - await this.crowdsale.buyTokens(investor, { value: ether(1), from: investor }).should.be.rejectedWith(EVMRevert); - }); - - it('should reject payments over cap', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.send(CAP); - await this.crowdsale.send(1).should.be.rejectedWith(EVMRevert); - }); - - it('should allow finalization and transfer funds to wallet if the goal is reached', async function () { - await increaseTimeTo(this.openingTime); - await this.crowdsale.send(GOAL); - - const beforeFinalization = web3.eth.getBalance(wallet); - await increaseTimeTo(this.afterClosingTime); - await this.crowdsale.finalize({ from: owner }); - const afterFinalization = web3.eth.getBalance(wallet); - - afterFinalization.minus(beforeFinalization).should.be.bignumber.equal(GOAL); - }); - - it('should allow refunds if the goal is not reached', async function () { - const balanceBeforeInvestment = web3.eth.getBalance(investor); - - await increaseTimeTo(this.openingTime); - await this.crowdsale.sendTransaction({ value: ether(1), from: investor, gasPrice: 0 }); - await increaseTimeTo(this.afterClosingTime); - - await this.crowdsale.finalize({ from: owner }); - await this.crowdsale.claimRefund({ from: investor, gasPrice: 0 }).should.be.fulfilled; - - const balanceAfterRefund = web3.eth.getBalance(investor); - balanceBeforeInvestment.should.be.bignumber.equal(balanceAfterRefund); - }); - - describe('when goal > cap', function () { - // goal > cap - const HIGH_GOAL = ether(30); - - it('creation reverts', async function () { - await assertRevert(SampleCrowdsale.new( - this.openingTime, this.closingTime, RATE, wallet, CAP, this.token.address, HIGH_GOAL - )); - }); - }); -}); diff --git a/test/examples/SimpleToken.test.js b/test/examples/SimpleToken.test.js deleted file mode 100644 index 3d173ca35..000000000 --- a/test/examples/SimpleToken.test.js +++ /dev/null @@ -1,41 +0,0 @@ -import decodeLogs from '../helpers/decodeLogs'; -const SimpleToken = artifacts.require('SimpleToken'); - -contract('SimpleToken', accounts => { - let token; - const creator = accounts[0]; - - beforeEach(async function () { - token = await SimpleToken.new({ from: creator }); - }); - - it('has a name', async function () { - const name = await token.name(); - assert.equal(name, 'SimpleToken'); - }); - - it('has a symbol', async function () { - const symbol = await token.symbol(); - assert.equal(symbol, 'SIM'); - }); - - it('has 18 decimals', async function () { - const decimals = await token.decimals(); - assert(decimals.eq(18)); - }); - - it('assigns the initial total supply to the creator', async function () { - const totalSupply = await token.totalSupply(); - const creatorBalance = await token.balanceOf(creator); - - assert(creatorBalance.eq(totalSupply)); - - const receipt = web3.eth.getTransactionReceipt(token.transactionHash); - const logs = decodeLogs(receipt.logs, SimpleToken, token.address); - assert.equal(logs.length, 1); - assert.equal(logs[0].event, 'Transfer'); - assert.equal(logs[0].args.from.valueOf(), 0x0); - assert.equal(logs[0].args.to.valueOf(), creator); - assert(logs[0].args.value.eq(totalSupply)); - }); -}); diff --git a/test/library/ECRecovery.test.js b/test/library/ECRecovery.test.js deleted file mode 100644 index 7ea55823f..000000000 --- a/test/library/ECRecovery.test.js +++ /dev/null @@ -1,77 +0,0 @@ - -import { - hashMessage, - signMessage, -} from '../helpers/sign'; -const ECRecoveryMock = artifacts.require('ECRecoveryMock'); - -require('chai') - .use(require('chai-as-promised')) - .should(); - -contract('ECRecovery', function (accounts) { - let ecrecovery; - const TEST_MESSAGE = 'OpenZeppelin'; - - before(async function () { - ecrecovery = await ECRecoveryMock.new(); - }); - - it('recover v0', async function () { - // Signature generated outside ganache with method web3.eth.sign(signer, message) - let signer = '0x2cc1166f6212628a0deef2b33befb2187d35b86c'; - let message = web3.sha3(TEST_MESSAGE); - // eslint-disable-next-line max-len - let signature = '0x5d99b6f7f6d1f73d1a26497f2b1c89b24c0993913f86e9a2d02cd69887d9c94f3c880358579d811b21dd1b7fd9bb01c1d81d10e69f0384e675c32b39643be89200'; - const addrRecovered = await ecrecovery.recover(message, signature); - addrRecovered.should.eq(signer); - }); - - it('recover v1', async function () { - // Signature generated outside ganache with method web3.eth.sign(signer, message) - let signer = '0x1e318623ab09fe6de3c9b8672098464aeda9100e'; - let message = web3.sha3(TEST_MESSAGE); - // eslint-disable-next-line max-len - let signature = '0x331fe75a821c982f9127538858900d87d3ec1f9f737338ad67cad133fa48feff48e6fa0c18abc62e42820f05943e47af3e9fbe306ce74d64094bdf1691ee53e001'; - const addrRecovered = await ecrecovery.recover(message, signature); - addrRecovered.should.eq(signer); - }); - - it('recover using web3.eth.sign()', async function () { - // Create the signature using account[0] - const signature = signMessage(accounts[0], TEST_MESSAGE); - - // Recover the signer address from the generated message and signature. - const addrRecovered = await ecrecovery.recover( - hashMessage(TEST_MESSAGE), - signature - ); - addrRecovered.should.eq(accounts[0]); - }); - - it('recover using web3.eth.sign() should return wrong signer', async function () { - // Create the signature using account[0] - const signature = signMessage(accounts[0], TEST_MESSAGE); - - // Recover the signer address from the generated message and wrong signature. - const addrRecovered = await ecrecovery.recover(hashMessage('Test'), signature); - assert.notEqual(accounts[0], addrRecovered); - }); - - it('recover should fail when a wrong hash is sent', async function () { - // Create the signature using account[0] - let signature = signMessage(accounts[0], TEST_MESSAGE); - - // Recover the signer address from the generated message and wrong signature. - const addrRecovered = await ecrecovery.recover(hashMessage(TEST_MESSAGE).substring(2), signature); - addrRecovered.should.eq('0x0000000000000000000000000000000000000000'); - }); - - context('toEthSignedMessage', () => { - it('should prefix hashes correctly', async function () { - const hashedMessage = web3.sha3(TEST_MESSAGE); - const ethMessage = await ecrecovery.toEthSignedMessageHash(hashedMessage); - ethMessage.should.eq(hashMessage(TEST_MESSAGE)); - }); - }); -}); diff --git a/test/library/Math.test.js b/test/library/Math.test.js deleted file mode 100644 index c671bc85f..000000000 --- a/test/library/Math.test.js +++ /dev/null @@ -1,43 +0,0 @@ -var MathMock = artifacts.require('MathMock'); - -contract('Math', function (accounts) { - let math; - - before(async function () { - math = await MathMock.new(); - }); - - it('returns max64 correctly', async function () { - let a = 5678; - let b = 1234; - await math.max64(a, b); - let result = await math.result64(); - assert.equal(result, a); - }); - - it('returns min64 correctly', async function () { - let a = 5678; - let b = 1234; - await math.min64(a, b); - let result = await math.result64(); - - assert.equal(result, b); - }); - - it('returns max256 correctly', async function () { - let a = 5678; - let b = 1234; - await math.max256(a, b); - let result = await math.result256(); - assert.equal(result, a); - }); - - it('returns min256 correctly', async function () { - let a = 5678; - let b = 1234; - await math.min256(a, b); - let result = await math.result256(); - - assert.equal(result, b); - }); -}); diff --git a/test/library/MerkleProof.test.js b/test/library/MerkleProof.test.js deleted file mode 100644 index 1e8da3c8f..000000000 --- a/test/library/MerkleProof.test.js +++ /dev/null @@ -1,61 +0,0 @@ - -import MerkleTree from '../helpers/merkleTree.js'; -import { sha3, bufferToHex } from 'ethereumjs-util'; - -var MerkleProofWrapper = artifacts.require('MerkleProofWrapper'); - -contract('MerkleProof', function (accounts) { - let merkleProof; - - before(async function () { - merkleProof = await MerkleProofWrapper.new(); - }); - - describe('verifyProof', function () { - it('should return true for a valid Merkle proof', async function () { - const elements = ['a', 'b', 'c', 'd']; - const merkleTree = new MerkleTree(elements); - - const root = merkleTree.getHexRoot(); - - const proof = merkleTree.getHexProof(elements[0]); - - const leaf = bufferToHex(sha3(elements[0])); - - const result = await merkleProof.verifyProof(proof, root, leaf); - assert.isOk(result, 'verifyProof did not return true for a valid proof'); - }); - - it('should return false for an invalid Merkle proof', async function () { - const correctElements = ['a', 'b', 'c']; - const correctMerkleTree = new MerkleTree(correctElements); - - const correctRoot = correctMerkleTree.getHexRoot(); - - const correctLeaf = bufferToHex(sha3(correctElements[0])); - - const badElements = ['d', 'e', 'f']; - const badMerkleTree = new MerkleTree(badElements); - - const badProof = badMerkleTree.getHexProof(badElements[0]); - - const result = await merkleProof.verifyProof(badProof, correctRoot, correctLeaf); - assert.isNotOk(result, 'verifyProof did not return false for an invalid proof'); - }); - - it('should return false for a Merkle proof of invalid length', async function () { - const elements = ['a', 'b', 'c']; - const merkleTree = new MerkleTree(elements); - - const root = merkleTree.getHexRoot(); - - const proof = merkleTree.getHexProof(elements[0]); - const badProof = proof.slice(0, proof.length - 5); - - const leaf = bufferToHex(sha3(elements[0])); - - const result = await merkleProof.verifyProof(badProof, root, leaf); - assert.isNotOk(result, 'verifyProof did not return false for proof of invalid length'); - }); - }); -}); diff --git a/test/lifecycle/Destructible.test.js b/test/lifecycle/Destructible.test.js deleted file mode 100644 index 2757d76cd..000000000 --- a/test/lifecycle/Destructible.test.js +++ /dev/null @@ -1,23 +0,0 @@ - -var Destructible = artifacts.require('Destructible'); -require('../helpers/transactionMined.js'); - -contract('Destructible', function (accounts) { - it('should send balance to owner after destruction', async function () { - let destructible = await Destructible.new({ from: accounts[0], value: web3.toWei('10', 'ether') }); - let owner = await destructible.owner(); - let initBalance = web3.eth.getBalance(owner); - await destructible.destroy({ from: owner }); - let newBalance = web3.eth.getBalance(owner); - assert.isTrue(newBalance > initBalance); - }); - - it('should send balance to recepient after destruction', async function () { - let destructible = await Destructible.new({ from: accounts[0], value: web3.toWei('10', 'ether') }); - let owner = await destructible.owner(); - let initBalance = web3.eth.getBalance(accounts[1]); - await destructible.destroyAndSend(accounts[1], { from: owner }); - let newBalance = web3.eth.getBalance(accounts[1]); - assert.isTrue(newBalance.greaterThan(initBalance)); - }); -}); diff --git a/test/lifecycle/TokenDestructible.test.js b/test/lifecycle/TokenDestructible.test.js deleted file mode 100644 index 8566bf190..000000000 --- a/test/lifecycle/TokenDestructible.test.js +++ /dev/null @@ -1,37 +0,0 @@ - -var TokenDestructible = artifacts.require('TokenDestructible'); -var StandardTokenMock = artifacts.require('StandardTokenMock'); -require('../helpers/transactionMined.js'); - -contract('TokenDestructible', function (accounts) { - let destructible; - - beforeEach(async function () { - destructible = await TokenDestructible.new({ - from: accounts[0], - value: web3.toWei('10', 'ether'), - }); - }); - - it('should send balance to owner after destruction', async function () { - let owner = await destructible.owner(); - let initBalance = web3.eth.getBalance(owner); - await destructible.destroy([], { from: owner }); - let newBalance = web3.eth.getBalance(owner); - assert.isTrue(newBalance > initBalance); - }); - - it('should send tokens to owner after destruction', async function () { - let owner = await destructible.owner(); - let token = await StandardTokenMock.new(destructible.address, 100); - let initContractBalance = await token.balanceOf(destructible.address); - let initOwnerBalance = await token.balanceOf(owner); - assert.equal(initContractBalance, 100); - assert.equal(initOwnerBalance, 0); - await destructible.destroy([token.address], { from: owner }); - let newContractBalance = await token.balanceOf(destructible.address); - let newOwnerBalance = await token.balanceOf(owner); - assert.equal(newContractBalance, 0); - assert.equal(newOwnerBalance, 100); - }); -}); diff --git a/test/ownership/CanReclaimToken.test.js b/test/ownership/CanReclaimToken.test.js deleted file mode 100644 index 6f0f2c671..000000000 --- a/test/ownership/CanReclaimToken.test.js +++ /dev/null @@ -1,35 +0,0 @@ - -import expectThrow from '../helpers/expectThrow'; - -const CanReclaimToken = artifacts.require('CanReclaimToken'); -const BasicTokenMock = artifacts.require('BasicTokenMock'); - -contract('CanReclaimToken', function (accounts) { - let token = null; - let canReclaimToken = null; - - beforeEach(async function () { - // Create contract and token - token = await BasicTokenMock.new(accounts[0], 100); - canReclaimToken = await CanReclaimToken.new(); - // Force token into contract - await token.transfer(canReclaimToken.address, 10); - const startBalance = await token.balanceOf(canReclaimToken.address); - assert.equal(startBalance, 10); - }); - - it('should allow owner to reclaim tokens', async function () { - const ownerStartBalance = await token.balanceOf(accounts[0]); - await canReclaimToken.reclaimToken(token.address); - const ownerFinalBalance = await token.balanceOf(accounts[0]); - const finalBalance = await token.balanceOf(canReclaimToken.address); - assert.equal(finalBalance, 0); - assert.equal(ownerFinalBalance - ownerStartBalance, 10); - }); - - it('should allow only owner to reclaim tokens', async function () { - await expectThrow( - canReclaimToken.reclaimToken(token.address, { from: accounts[1] }), - ); - }); -}); diff --git a/test/ownership/Claimable.test.js b/test/ownership/Claimable.test.js deleted file mode 100644 index 52340fb94..000000000 --- a/test/ownership/Claimable.test.js +++ /dev/null @@ -1,53 +0,0 @@ - -import assertRevert from '../helpers/assertRevert'; - -var Claimable = artifacts.require('Claimable'); - -contract('Claimable', function (accounts) { - let claimable; - - beforeEach(async function () { - claimable = await Claimable.new(); - }); - - it('should have an owner', async function () { - let owner = await claimable.owner(); - assert.isTrue(owner !== 0); - }); - - it('changes pendingOwner after transfer', async function () { - let newOwner = accounts[1]; - await claimable.transferOwnership(newOwner); - let pendingOwner = await claimable.pendingOwner(); - - assert.isTrue(pendingOwner === newOwner); - }); - - it('should prevent to claimOwnership from no pendingOwner', async function () { - await assertRevert(claimable.claimOwnership({ from: accounts[2] })); - }); - - it('should prevent non-owners from transfering', async function () { - const other = accounts[2]; - const owner = await claimable.owner.call(); - - assert.isTrue(owner !== other); - await assertRevert(claimable.transferOwnership(other, { from: other })); - }); - - describe('after initiating a transfer', function () { - let newOwner; - - beforeEach(async function () { - newOwner = accounts[1]; - await claimable.transferOwnership(newOwner); - }); - - it('changes allow pending owner to claim ownership', async function () { - await claimable.claimOwnership({ from: newOwner }); - let owner = await claimable.owner(); - - assert.isTrue(owner === newOwner); - }); - }); -}); diff --git a/test/ownership/Contactable.test.js b/test/ownership/Contactable.test.js deleted file mode 100644 index 901ba4824..000000000 --- a/test/ownership/Contactable.test.js +++ /dev/null @@ -1,28 +0,0 @@ - -var Contactable = artifacts.require('Contactable'); - -contract('Contactable', function (accounts) { - let contactable; - - beforeEach(async function () { - contactable = await Contactable.new(); - }); - - it('should have an empty contact info', async function () { - let info = await contactable.contactInformation(); - assert.isTrue(info === ''); - }); - - describe('after setting the contact information', function () { - let contactInfo = 'contact information'; - - beforeEach(async function () { - await contactable.setContactInformation(contactInfo); - }); - - it('should return the setted contact information', async function () { - let info = await contactable.contactInformation(); - assert.isTrue(info === contactInfo); - }); - }); -}); diff --git a/test/ownership/DelayedClaimable.test.js b/test/ownership/DelayedClaimable.test.js deleted file mode 100644 index 90be7fbc9..000000000 --- a/test/ownership/DelayedClaimable.test.js +++ /dev/null @@ -1,55 +0,0 @@ -import assertRevert from '../helpers/assertRevert'; - -var DelayedClaimable = artifacts.require('DelayedClaimable'); - -contract('DelayedClaimable', function (accounts) { - var delayedClaimable; - - beforeEach(function () { - return DelayedClaimable.new().then(function (deployed) { - delayedClaimable = deployed; - }); - }); - - it('can set claim blocks', async function () { - await delayedClaimable.transferOwnership(accounts[2]); - await delayedClaimable.setLimits(0, 1000); - let end = await delayedClaimable.end(); - assert.equal(end, 1000); - let start = await delayedClaimable.start(); - assert.equal(start, 0); - }); - - it('changes pendingOwner after transfer successful', async function () { - await delayedClaimable.transferOwnership(accounts[2]); - await delayedClaimable.setLimits(0, 1000); - let end = await delayedClaimable.end(); - assert.equal(end, 1000); - let start = await delayedClaimable.start(); - assert.equal(start, 0); - let pendingOwner = await delayedClaimable.pendingOwner(); - assert.equal(pendingOwner, accounts[2]); - await delayedClaimable.claimOwnership({ from: accounts[2] }); - let owner = await delayedClaimable.owner(); - assert.equal(owner, accounts[2]); - }); - - it('changes pendingOwner after transfer fails', async function () { - await delayedClaimable.transferOwnership(accounts[1]); - await delayedClaimable.setLimits(100, 110); - let end = await delayedClaimable.end(); - assert.equal(end, 110); - let start = await delayedClaimable.start(); - assert.equal(start, 100); - let pendingOwner = await delayedClaimable.pendingOwner(); - assert.equal(pendingOwner, accounts[1]); - await assertRevert(delayedClaimable.claimOwnership({ from: accounts[1] })); - let owner = await delayedClaimable.owner(); - assert.isTrue(owner !== accounts[1]); - }); - - it('set end and start invalid values fail', async function () { - await delayedClaimable.transferOwnership(accounts[1]); - await assertRevert(delayedClaimable.setLimits(1001, 1000)); - }); -}); diff --git a/test/ownership/HasNoContracts.test.js b/test/ownership/HasNoContracts.test.js deleted file mode 100644 index f2020a173..000000000 --- a/test/ownership/HasNoContracts.test.js +++ /dev/null @@ -1,33 +0,0 @@ - -import expectThrow from '../helpers/expectThrow'; - -const Ownable = artifacts.require('Ownable'); -const HasNoContracts = artifacts.require('HasNoContracts'); - -contract('HasNoContracts', function (accounts) { - let hasNoContracts = null; - let ownable = null; - - beforeEach(async () => { - // Create contract and token - hasNoContracts = await HasNoContracts.new(); - ownable = await Ownable.new(); - - // Force ownership into contract - await ownable.transferOwnership(hasNoContracts.address); - const owner = await ownable.owner(); - assert.equal(owner, hasNoContracts.address); - }); - - it('should allow owner to reclaim contracts', async function () { - await hasNoContracts.reclaimContract(ownable.address); - const owner = await ownable.owner(); - assert.equal(owner, accounts[0]); - }); - - it('should allow only owner to reclaim contracts', async function () { - await expectThrow( - hasNoContracts.reclaimContract(ownable.address, { from: accounts[1] }), - ); - }); -}); diff --git a/test/ownership/HasNoEther.test.js b/test/ownership/HasNoEther.test.js deleted file mode 100644 index ff95e998f..000000000 --- a/test/ownership/HasNoEther.test.js +++ /dev/null @@ -1,64 +0,0 @@ - -import expectThrow from '../helpers/expectThrow'; -import toPromise from '../helpers/toPromise'; -const HasNoEtherTest = artifacts.require('HasNoEtherTest'); -const ForceEther = artifacts.require('ForceEther'); - -contract('HasNoEther', function (accounts) { - const amount = web3.toWei('1', 'ether'); - - it('should be constructorable', async function () { - await HasNoEtherTest.new(); - }); - - it('should not accept ether in constructor', async function () { - await expectThrow(HasNoEtherTest.new({ value: amount })); - }); - - it('should not accept ether', async function () { - let hasNoEther = await HasNoEtherTest.new(); - - await expectThrow( - toPromise(web3.eth.sendTransaction)({ - from: accounts[1], - to: hasNoEther.address, - value: amount, - }), - ); - }); - - it('should allow owner to reclaim ether', async function () { - // Create contract - let hasNoEther = await HasNoEtherTest.new(); - const startBalance = await web3.eth.getBalance(hasNoEther.address); - assert.equal(startBalance, 0); - - // Force ether into it - let forceEther = await ForceEther.new({ value: amount }); - await forceEther.destroyAndSend(hasNoEther.address); - const forcedBalance = await web3.eth.getBalance(hasNoEther.address); - assert.equal(forcedBalance, amount); - - // Reclaim - const ownerStartBalance = await web3.eth.getBalance(accounts[0]); - await hasNoEther.reclaimEther(); - const ownerFinalBalance = await web3.eth.getBalance(accounts[0]); - const finalBalance = await web3.eth.getBalance(hasNoEther.address); - assert.equal(finalBalance, 0); - assert.isAbove(ownerFinalBalance, ownerStartBalance); - }); - - it('should allow only owner to reclaim ether', async function () { - // Create contract - let hasNoEther = await HasNoEtherTest.new({ from: accounts[0] }); - - // Force ether into it - let forceEther = await ForceEther.new({ value: amount }); - await forceEther.destroyAndSend(hasNoEther.address); - const forcedBalance = await web3.eth.getBalance(hasNoEther.address); - assert.equal(forcedBalance, amount); - - // Reclaim - await expectThrow(hasNoEther.reclaimEther({ from: accounts[1] })); - }); -}); diff --git a/test/ownership/HasNoTokens.test.js b/test/ownership/HasNoTokens.test.js deleted file mode 100644 index e9c14a7f5..000000000 --- a/test/ownership/HasNoTokens.test.js +++ /dev/null @@ -1,40 +0,0 @@ - -import expectThrow from '../helpers/expectThrow'; - -const HasNoTokens = artifacts.require('HasNoTokens'); -const ERC223TokenMock = artifacts.require('ERC223TokenMock'); - -contract('HasNoTokens', function (accounts) { - let hasNoTokens = null; - let token = null; - - beforeEach(async () => { - // Create contract and token - hasNoTokens = await HasNoTokens.new(); - token = await ERC223TokenMock.new(accounts[0], 100); - - // Force token into contract - await token.transfer(hasNoTokens.address, 10); - const startBalance = await token.balanceOf(hasNoTokens.address); - assert.equal(startBalance, 10); - }); - - it('should not accept ERC223 tokens', async function () { - await expectThrow(token.transferERC223(hasNoTokens.address, 10, '')); - }); - - it('should allow owner to reclaim tokens', async function () { - const ownerStartBalance = await token.balanceOf(accounts[0]); - await hasNoTokens.reclaimToken(token.address); - const ownerFinalBalance = await token.balanceOf(accounts[0]); - const finalBalance = await token.balanceOf(hasNoTokens.address); - assert.equal(finalBalance, 0); - assert.equal(ownerFinalBalance - ownerStartBalance, 10); - }); - - it('should allow only owner to reclaim tokens', async function () { - await expectThrow( - hasNoTokens.reclaimToken(token.address, { from: accounts[1] }), - ); - }); -}); diff --git a/test/ownership/Whitelist.test.js b/test/ownership/Whitelist.test.js deleted file mode 100644 index e0ae29f96..000000000 --- a/test/ownership/Whitelist.test.js +++ /dev/null @@ -1,103 +0,0 @@ -import expectThrow from '../helpers/expectThrow'; -import expectEvent from '../helpers/expectEvent'; - -const WhitelistMock = artifacts.require('WhitelistMock'); - -require('chai') - .use(require('chai-as-promised')) - .should(); - -contract('Whitelist', function (accounts) { - let mock; - - const [ - owner, - whitelistedAddress1, - whitelistedAddress2, - anyone, - ] = accounts; - - const whitelistedAddresses = [whitelistedAddress1, whitelistedAddress2]; - - before(async function () { - mock = await WhitelistMock.new(); - }); - - context('in normal conditions', () => { - it('should add address to the whitelist', async function () { - await expectEvent.inTransaction( - mock.addAddressToWhitelist(whitelistedAddress1, { from: owner }), - 'WhitelistedAddressAdded' - ); - const isWhitelisted = await mock.whitelist(whitelistedAddress1); - isWhitelisted.should.be.equal(true); - }); - - it('should add addresses to the whitelist', async function () { - await expectEvent.inTransaction( - mock.addAddressesToWhitelist(whitelistedAddresses, { from: owner }), - 'WhitelistedAddressAdded' - ); - for (let addr of whitelistedAddresses) { - const isWhitelisted = await mock.whitelist(addr); - isWhitelisted.should.be.equal(true); - } - }); - - it('should not announce WhitelistedAddressAdded event if address is already in the whitelist', async function () { - const { logs } = await mock.addAddressToWhitelist(whitelistedAddress1, { from: owner }); - logs.should.be.empty; - }); - - it('should remove address from the whitelist', async function () { - await expectEvent.inTransaction( - mock.removeAddressFromWhitelist(whitelistedAddress1, { from: owner }), - 'WhitelistedAddressRemoved' - ); - let isWhitelisted = await mock.whitelist(whitelistedAddress1); - isWhitelisted.should.be.equal(false); - }); - - it('should remove addresses from the the whitelist', async function () { - await expectEvent.inTransaction( - mock.removeAddressesFromWhitelist(whitelistedAddresses, { from: owner }), - 'WhitelistedAddressRemoved' - ); - for (let addr of whitelistedAddresses) { - const isWhitelisted = await mock.whitelist(addr); - isWhitelisted.should.be.equal(false); - } - }); - - it('should not announce WhitelistedAddressRemoved event if address is not in the whitelist', async function () { - const { logs } = await mock.removeAddressFromWhitelist(whitelistedAddress1, { from: owner }); - logs.should.be.empty; - }); - - it('should allow whitelisted address to call #onlyWhitelistedCanDoThis', async () => { - await mock.addAddressToWhitelist(whitelistedAddress1, { from: owner }); - await mock.onlyWhitelistedCanDoThis({ from: whitelistedAddress1 }) - .should.be.fulfilled; - }); - }); - - context('in adversarial conditions', () => { - it('should not allow "anyone" to add to the whitelist', async () => { - await expectThrow( - mock.addAddressToWhitelist(whitelistedAddress1, { from: anyone }) - ); - }); - - it('should not allow "anyone" to remove from the whitelist', async () => { - await expectThrow( - mock.removeAddressFromWhitelist(whitelistedAddress1, { from: anyone }) - ); - }); - - it('should not allow "anyone" to call #onlyWhitelistedCanDoThis', async () => { - await expectThrow( - mock.onlyWhitelistedCanDoThis({ from: anyone }) - ); - }); - }); -}); diff --git a/test/ownership/rbac/RBAC.test.js b/test/ownership/rbac/RBAC.test.js deleted file mode 100644 index e748efba5..000000000 --- a/test/ownership/rbac/RBAC.test.js +++ /dev/null @@ -1,98 +0,0 @@ -import expectThrow from '../../helpers/expectThrow'; -import expectEvent from '../../helpers/expectEvent'; - -const RBACMock = artifacts.require('RBACMock'); - -require('chai') - .use(require('chai-as-promised')) - .should(); - -const ROLE_ADVISOR = 'advisor'; - -contract('RBAC', function (accounts) { - let mock; - - const [ - admin, - anyone, - futureAdvisor, - ...advisors - ] = accounts; - - before(async () => { - mock = await RBACMock.new(advisors, { from: admin }); - }); - - context('in normal conditions', () => { - it('allows admin to call #onlyAdminsCanDoThis', async () => { - await mock.onlyAdminsCanDoThis({ from: admin }) - .should.be.fulfilled; - }); - it('allows admin to call #onlyAdvisorsCanDoThis', async () => { - await mock.onlyAdvisorsCanDoThis({ from: admin }) - .should.be.fulfilled; - }); - it('allows advisors to call #onlyAdvisorsCanDoThis', async () => { - await mock.onlyAdvisorsCanDoThis({ from: advisors[0] }) - .should.be.fulfilled; - }); - it('allows admin to call #eitherAdminOrAdvisorCanDoThis', async () => { - await mock.eitherAdminOrAdvisorCanDoThis({ from: admin }) - .should.be.fulfilled; - }); - it('allows advisors to call #eitherAdminOrAdvisorCanDoThis', async () => { - await mock.eitherAdminOrAdvisorCanDoThis({ from: advisors[0] }) - .should.be.fulfilled; - }); - it('does not allow admins to call #nobodyCanDoThis', async () => { - await expectThrow( - mock.nobodyCanDoThis({ from: admin }) - ); - }); - it('does not allow advisors to call #nobodyCanDoThis', async () => { - await expectThrow( - mock.nobodyCanDoThis({ from: advisors[0] }) - ); - }); - it('does not allow anyone to call #nobodyCanDoThis', async () => { - await expectThrow( - mock.nobodyCanDoThis({ from: anyone }) - ); - }); - it('allows an admin to remove an advisor\'s role', async () => { - await mock.removeAdvisor(advisors[0], { from: admin }) - .should.be.fulfilled; - }); - it('allows admins to #adminRemoveRole', async () => { - await mock.adminRemoveRole(advisors[3], ROLE_ADVISOR, { from: admin }) - .should.be.fulfilled; - }); - - it('announces a RoleAdded event on addRole', async () => { - await expectEvent.inTransaction( - mock.adminAddRole(futureAdvisor, ROLE_ADVISOR, { from: admin }), - 'RoleAdded' - ); - }); - - it('announces a RoleRemoved event on removeRole', async () => { - await expectEvent.inTransaction( - mock.adminRemoveRole(futureAdvisor, ROLE_ADVISOR, { from: admin }), - 'RoleRemoved' - ); - }); - }); - - context('in adversarial conditions', () => { - it('does not allow an advisor to remove another advisor', async () => { - await expectThrow( - mock.removeAdvisor(advisors[1], { from: advisors[0] }) - ); - }); - it('does not allow "anyone" to remove an advisor', async () => { - await expectThrow( - mock.removeAdvisor(advisors[0], { from: anyone }) - ); - }); - }); -}); diff --git a/test/payment/PullPayment.test.js b/test/payment/PullPayment.test.js deleted file mode 100644 index 8f5a4e41a..000000000 --- a/test/payment/PullPayment.test.js +++ /dev/null @@ -1,71 +0,0 @@ -var PullPaymentMock = artifacts.require('PullPaymentMock'); - -contract('PullPayment', function (accounts) { - let ppce; - let amount = 17 * 1e18; - - beforeEach(async function () { - ppce = await PullPaymentMock.new({ value: amount }); - }); - - it('can\'t call asyncSend externally', async function () { - assert.isUndefined(ppce.asyncSend); - }); - - it('can record an async payment correctly', async function () { - let AMOUNT = 100; - await ppce.callSend(accounts[0], AMOUNT); - let paymentsToAccount0 = await ppce.payments(accounts[0]); - let totalPayments = await ppce.totalPayments(); - - assert.equal(totalPayments, AMOUNT); - assert.equal(paymentsToAccount0, AMOUNT); - }); - - it('can add multiple balances on one account', async function () { - await ppce.callSend(accounts[0], 200); - await ppce.callSend(accounts[0], 300); - let paymentsToAccount0 = await ppce.payments(accounts[0]); - let totalPayments = await ppce.totalPayments(); - - assert.equal(totalPayments, 500); - assert.equal(paymentsToAccount0, 500); - }); - - it('can add balances on multiple accounts', async function () { - await ppce.callSend(accounts[0], 200); - await ppce.callSend(accounts[1], 300); - - let paymentsToAccount0 = await ppce.payments(accounts[0]); - assert.equal(paymentsToAccount0, 200); - - let paymentsToAccount1 = await ppce.payments(accounts[1]); - assert.equal(paymentsToAccount1, 300); - - let totalPayments = await ppce.totalPayments(); - assert.equal(totalPayments, 500); - }); - - it('can withdraw payment', async function () { - let payee = accounts[1]; - let initialBalance = web3.eth.getBalance(payee); - - await ppce.callSend(payee, amount); - - let payment1 = await ppce.payments(payee); - assert.equal(payment1, amount); - - let totalPayments = await ppce.totalPayments(); - assert.equal(totalPayments, amount); - - await ppce.withdrawPayments({ from: payee }); - let payment2 = await ppce.payments(payee); - assert.equal(payment2, 0); - - totalPayments = await ppce.totalPayments(); - assert.equal(totalPayments, 0); - - let balance = web3.eth.getBalance(payee); - assert(Math.abs(balance - initialBalance - amount) < 1e16); - }); -}); diff --git a/test/payment/SplitPayment.test.js b/test/payment/SplitPayment.test.js deleted file mode 100644 index dd18eaeac..000000000 --- a/test/payment/SplitPayment.test.js +++ /dev/null @@ -1,78 +0,0 @@ -const BigNumber = web3.BigNumber; - -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -const EVMThrow = require('../helpers/EVMThrow.js'); -const SplitPayment = artifacts.require('SplitPayment'); - -contract('SplitPayment', function ([owner, payee1, payee2, payee3, nonpayee1, payer1]) { - const amount = web3.toWei(1.0, 'ether'); - - beforeEach(async function () { - this.payees = [payee1, payee2, payee3]; - this.shares = [20, 10, 70]; - - this.contract = await SplitPayment.new(this.payees, this.shares); - }); - - it('should accept payments', async function () { - await web3.eth.sendTransaction({ from: owner, to: this.contract.address, value: amount }); - - const balance = web3.eth.getBalance(this.contract.address); - balance.should.be.bignumber.equal(amount); - }); - - it('should store shares if address is payee', async function () { - const shares = await this.contract.shares.call(payee1); - shares.should.be.bignumber.not.equal(0); - }); - - it('should not store shares if address is not payee', async function () { - const shares = await this.contract.shares.call(nonpayee1); - shares.should.be.bignumber.equal(0); - }); - - it('should throw if no funds to claim', async function () { - await this.contract.claim({ from: payee1 }).should.be.rejectedWith(EVMThrow); - }); - - it('should throw if non-payee want to claim', async function () { - await web3.eth.sendTransaction({ from: payer1, to: this.contract.address, value: amount }); - await this.contract.claim({ from: nonpayee1 }).should.be.rejectedWith(EVMThrow); - }); - - it('should distribute funds to payees', async function () { - await web3.eth.sendTransaction({ from: payer1, to: this.contract.address, value: amount }); - - // receive funds - const initBalance = web3.eth.getBalance(this.contract.address); - initBalance.should.be.bignumber.equal(amount); - - // distribute to payees - const initAmount1 = web3.eth.getBalance(payee1); - await this.contract.claim({ from: payee1 }); - const profit1 = web3.eth.getBalance(payee1) - initAmount1; - assert(Math.abs(profit1 - web3.toWei(0.20, 'ether')) < 1e16); - - const initAmount2 = web3.eth.getBalance(payee2); - await this.contract.claim({ from: payee2 }); - const profit2 = web3.eth.getBalance(payee2) - initAmount2; - assert(Math.abs(profit2 - web3.toWei(0.10, 'ether')) < 1e16); - - const initAmount3 = web3.eth.getBalance(payee3); - await this.contract.claim({ from: payee3 }); - const profit3 = web3.eth.getBalance(payee3) - initAmount3; - assert(Math.abs(profit3 - web3.toWei(0.70, 'ether')) < 1e16); - - // end balance should be zero - const endBalance = web3.eth.getBalance(this.contract.address); - endBalance.should.be.bignumber.equal(0); - - // check correct funds released accounting - const totalReleased = await this.contract.totalReleased.call(); - totalReleased.should.be.bignumber.equal(initBalance); - }); -}); diff --git a/test/token/ERC20/CappedToken.test.js b/test/token/ERC20/CappedToken.test.js deleted file mode 100644 index c3fa5af6b..000000000 --- a/test/token/ERC20/CappedToken.test.js +++ /dev/null @@ -1,36 +0,0 @@ - -import expectThrow from '../../helpers/expectThrow'; -import ether from '../../helpers/ether'; - -var CappedToken = artifacts.require('CappedToken'); - -contract('Capped', function (accounts) { - const cap = ether(1000); - - let token; - - beforeEach(async function () { - token = await CappedToken.new(cap); - }); - - it('should start with the correct cap', async function () { - let _cap = await token.cap(); - - assert(cap.eq(_cap)); - }); - - it('should mint when amount is less than cap', async function () { - const result = await token.mint(accounts[0], 100); - assert.equal(result.logs[0].event, 'Mint'); - }); - - it('should fail to mint if the ammount exceeds the cap', async function () { - await token.mint(accounts[0], cap.sub(1)); - await expectThrow(token.mint(accounts[0], 100)); - }); - - it('should fail to mint after cap is reached', async function () { - await token.mint(accounts[0], cap); - await expectThrow(token.mint(accounts[0], 1)); - }); -}); diff --git a/test/token/ERC827/ERC827Token.js b/test/token/ERC827/ERC827Token.js deleted file mode 100644 index f82f3fdf0..000000000 --- a/test/token/ERC827/ERC827Token.js +++ /dev/null @@ -1,374 +0,0 @@ - -import EVMRevert from '../../helpers/EVMRevert'; -var Message = artifacts.require('MessageHelper'); -var ERC827TokenMock = artifacts.require('ERC827TokenMock'); - -var BigNumber = web3.BigNumber; -var _ = require('lodash'); -var ethjsABI = require('ethjs-abi'); -require('chai') - .use(require('chai-as-promised')) - .use(require('chai-bignumber')(BigNumber)) - .should(); - -contract('ERC827 Token', function (accounts) { - let token; - - function findMethod (abi, name, args) { - for (var i = 0; i < abi.length; i++) { - const methodArgs = _.map(abi[i].inputs, 'type').join(','); - if ((abi[i].name === name) && (methodArgs === args)) { - return abi[i]; - } - } - } - - beforeEach(async function () { - token = await ERC827TokenMock.new(accounts[0], 100); - }); - - it('should return the correct totalSupply after construction', async function () { - let totalSupply = await token.totalSupply(); - - assert.equal(totalSupply, 100); - }); - - it('should return the correct allowance amount after approval', async function () { - let token = await ERC827TokenMock.new(accounts[0], 100); - await token.approve(accounts[1], 100); - let allowance = await token.allowance(accounts[0], accounts[1]); - - assert.equal(allowance, 100); - }); - - it('should return correct balances after transfer', async function () { - await token.transfer(accounts[1], 100); - let balance0 = await token.balanceOf(accounts[0]); - assert.equal(balance0, 0); - - let balance1 = await token.balanceOf(accounts[1]); - assert.equal(balance1, 100); - }); - - it('should throw an error when trying to transfer more than balance', async function () { - await token.transfer(accounts[1], 101).should.be.rejectedWith(EVMRevert); - }); - - it('should return correct balances after transfering from another account', async function () { - await token.approve(accounts[1], 100); - await token.transferFrom(accounts[0], accounts[2], 100, { from: accounts[1] }); - - let balance0 = await token.balanceOf(accounts[0]); - assert.equal(balance0, 0); - - let balance1 = await token.balanceOf(accounts[2]); - assert.equal(balance1, 100); - - let balance2 = await token.balanceOf(accounts[1]); - assert.equal(balance2, 0); - }); - - it('should throw an error when trying to transfer more than allowed', async function () { - await token.approve(accounts[1], 99); - await token.transferFrom( - accounts[0], accounts[2], 100, - { from: accounts[1] } - ).should.be.rejectedWith(EVMRevert); - }); - - it('should throw an error when trying to transferFrom more than _from has', async function () { - let balance0 = await token.balanceOf(accounts[0]); - await token.approve(accounts[1], 99); - await token.transferFrom( - accounts[0], accounts[2], balance0 + 1, - { from: accounts[1] } - ).should.be.rejectedWith(EVMRevert); - }); - - describe('validating allowance updates to spender', function () { - let preApproved; - - it('should start with zero', async function () { - preApproved = await token.allowance(accounts[0], accounts[1]); - assert.equal(preApproved, 0); - }); - - it('should increase by 50 then decrease by 10', async function () { - const abiMethod = findMethod(token.abi, 'increaseApproval', 'address,uint256'); - const increaseApprovalData = ethjsABI.encodeMethod(abiMethod, - [accounts[1], 50] - ); - await token.sendTransaction( - { from: accounts[0], data: increaseApprovalData } - ); - let postIncrease = await token.allowance(accounts[0], accounts[1]); - preApproved.plus(50).should.be.bignumber.equal(postIncrease); - await token.decreaseApproval(accounts[1], 10); - let postDecrease = await token.allowance(accounts[0], accounts[1]); - postIncrease.minus(10).should.be.bignumber.equal(postDecrease); - }); - }); - - it('should increase by 50 then set to 0 when decreasing by more than 50', async function () { - await token.approve(accounts[1], 50); - await token.decreaseApproval(accounts[1], 60); - let postDecrease = await token.allowance(accounts[0], accounts[1]); - postDecrease.should.be.bignumber.equal(0); - }); - - it('should throw an error when trying to transfer to 0x0', async function () { - await token.transfer(0x0, 100).should.be.rejectedWith(EVMRevert); - }); - - it('should throw an error when trying to transferFrom to 0x0', async function () { - await token.approve(accounts[1], 100); - await token.transferFrom(accounts[0], 0x0, 100, { from: accounts[1] }) - .should.be.rejectedWith(EVMRevert); - }); - - describe('Test ERC827 methods', function () { - it( - 'should return correct balances after transfer (with data) and show the event on receiver contract' - , async function () { - const message = await Message.new(); - - const extraData = message.contract.showMessage.getData( - web3.toHex(123456), 666, 'Transfer Done' - ); - const abiMethod = findMethod(token.abi, 'transfer', 'address,uint256,bytes'); - const transferData = ethjsABI.encodeMethod(abiMethod, - [message.contract.address, 100, extraData] - ); - const transaction = await token.sendTransaction( - { from: accounts[0], data: transferData } - ); - - assert.equal(2, transaction.receipt.logs.length); - - new BigNumber(100).should.be.bignumber.equal( - await token.balanceOf(message.contract.address) - ); - }); - - it( - 'should return correct allowance after approve (with data) and show the event on receiver contract' - , async function () { - const message = await Message.new(); - - const extraData = message.contract.showMessage.getData( - web3.toHex(123456), 666, 'Transfer Done' - ); - - const abiMethod = findMethod(token.abi, 'approve', 'address,uint256,bytes'); - const approveData = ethjsABI.encodeMethod(abiMethod, - [message.contract.address, 100, extraData] - ); - const transaction = await token.sendTransaction( - { from: accounts[0], data: approveData } - ); - - assert.equal(2, transaction.receipt.logs.length); - - new BigNumber(100).should.be.bignumber.equal( - await token.allowance(accounts[0], message.contract.address) - ); - }); - - it( - 'should return correct allowance after increaseApproval (with data) and show the event on receiver contract' - , async function () { - const message = await Message.new(); - - const extraData = message.contract.showMessage.getData( - web3.toHex(123456), 666, 'Transfer Done' - ); - - await token.approve(message.contract.address, 10); - new BigNumber(10).should.be.bignumber.equal( - await token.allowance(accounts[0], message.contract.address) - ); - - const abiMethod = findMethod(token.abi, 'increaseApproval', 'address,uint256,bytes'); - const increaseApprovalData = ethjsABI.encodeMethod(abiMethod, - [message.contract.address, 50, extraData] - ); - const transaction = await token.sendTransaction( - { from: accounts[0], data: increaseApprovalData } - ); - - assert.equal(2, transaction.receipt.logs.length); - - new BigNumber(60).should.be.bignumber.equal( - await token.allowance(accounts[0], message.contract.address) - ); - }); - - it( - 'should return correct allowance after decreaseApproval (with data) and show the event on receiver contract' - , async function () { - const message = await Message.new(); - - await token.approve(message.contract.address, 100); - - new BigNumber(100).should.be.bignumber.equal( - await token.allowance(accounts[0], message.contract.address) - ); - - const extraData = message.contract.showMessage.getData( - web3.toHex(123456), 666, 'Transfer Done' - ); - - const abiMethod = findMethod(token.abi, 'decreaseApproval', 'address,uint256,bytes'); - const decreaseApprovalData = ethjsABI.encodeMethod(abiMethod, - [message.contract.address, 60, extraData] - ); - const transaction = await token.sendTransaction( - { from: accounts[0], data: decreaseApprovalData } - ); - - assert.equal(2, transaction.receipt.logs.length); - - new BigNumber(40).should.be.bignumber.equal( - await token.allowance(accounts[0], message.contract.address) - ); - }); - - it( - 'should return correct balances after transferFrom (with data) and show the event on receiver contract' - , async function () { - const message = await Message.new(); - - const extraData = message.contract.showMessage.getData( - web3.toHex(123456), 666, 'Transfer Done' - ); - - await token.approve(accounts[1], 100, { from: accounts[0] }); - - new BigNumber(100).should.be.bignumber.equal( - await token.allowance(accounts[0], accounts[1]) - ); - - const abiMethod = findMethod(token.abi, 'transferFrom', 'address,address,uint256,bytes'); - const transferFromData = ethjsABI.encodeMethod(abiMethod, - [accounts[0], message.contract.address, 100, extraData] - ); - const transaction = await token.sendTransaction( - { from: accounts[1], data: transferFromData } - ); - - assert.equal(2, transaction.receipt.logs.length); - - new BigNumber(100).should.be.bignumber.equal( - await token.balanceOf(message.contract.address) - ); - }); - - it('should fail inside approve (with data)', async function () { - const message = await Message.new(); - - const extraData = message.contract.fail.getData(); - - const abiMethod = findMethod(token.abi, 'approve', 'address,uint256,bytes'); - const approveData = ethjsABI.encodeMethod(abiMethod, - [message.contract.address, 10, extraData] - ); - await token.sendTransaction( - { from: accounts[0], data: approveData } - ).should.be.rejectedWith(EVMRevert); - - // approval should not have gone through so allowance is still 0 - new BigNumber(0).should.be.bignumber - .equal(await token.allowance(accounts[1], message.contract.address)); - }); - - it('should fail inside transfer (with data)', async function () { - const message = await Message.new(); - - const extraData = message.contract.fail.getData(); - - const abiMethod = findMethod(token.abi, 'transfer', 'address,uint256,bytes'); - const transferData = ethjsABI.encodeMethod(abiMethod, - [message.contract.address, 10, extraData] - ); - await token.sendTransaction( - { from: accounts[0], data: transferData } - ).should.be.rejectedWith(EVMRevert); - - // transfer should not have gone through, so balance is still 0 - new BigNumber(0).should.be.bignumber - .equal(await token.balanceOf(message.contract.address)); - }); - - it('should fail inside transferFrom (with data)', async function () { - const message = await Message.new(); - - const extraData = message.contract.fail.getData(); - - await token.approve(accounts[1], 10, { from: accounts[2] }); - - const abiMethod = findMethod(token.abi, 'transferFrom', 'address,address,uint256,bytes'); - const transferFromData = ethjsABI.encodeMethod(abiMethod, - [accounts[2], message.contract.address, 10, extraData] - ); - await token.sendTransaction( - { from: accounts[1], data: transferFromData } - ).should.be.rejectedWith(EVMRevert); - - // transferFrom should have failed so balance is still 0 but allowance is 10 - new BigNumber(10).should.be.bignumber - .equal(await token.allowance(accounts[2], accounts[1])); - new BigNumber(0).should.be.bignumber - .equal(await token.balanceOf(message.contract.address)); - }); - - it('should fail approve (with data) when using token contract address as receiver', async function () { - const message = await Message.new(); - - const extraData = message.contract.showMessage.getData( - web3.toHex(123456), 666, 'Transfer Done' - ); - - const abiMethod = findMethod(token.abi, 'approve', 'address,uint256,bytes'); - const approveData = ethjsABI.encodeMethod(abiMethod, - [token.contract.address, 100, extraData] - ); - await token.sendTransaction( - { from: accounts[0], data: approveData } - ).should.be.rejectedWith(EVMRevert); - }); - - it('should fail transfer (with data) when using token contract address as receiver', async function () { - const message = await Message.new(); - - const extraData = message.contract.showMessage.getData( - web3.toHex(123456), 666, 'Transfer Done' - ); - - const abiMethod = findMethod(token.abi, 'transfer', 'address,uint256,bytes'); - const transferData = ethjsABI.encodeMethod(abiMethod, - [token.contract.address, 100, extraData] - ); - await token.sendTransaction( - { from: accounts[0], data: transferData } - ).should.be.rejectedWith(EVMRevert); - }); - - it('should fail transferFrom (with data) when using token contract address as receiver', async function () { - const message = await Message.new(); - - const extraData = message.contract.showMessage.getData( - web3.toHex(123456), 666, 'Transfer Done' - ); - - await token.approve(accounts[1], 1, { from: accounts[0] }); - - const abiMethod = findMethod(token.abi, 'transferFrom', 'address,address,uint256,bytes'); - const transferFromData = ethjsABI.encodeMethod(abiMethod, - [accounts[0], token.contract.address, 1, extraData] - ); - await token.sendTransaction( - { from: accounts[1], data: transferFromData } - ).should.be.rejectedWith(EVMRevert); - }); - }); -}); From f9fc8d2e961be8f93b12f0a02c57665d8abfe773 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Wed, 18 Apr 2018 18:10:26 -0300 Subject: [PATCH 08/54] adapt contracts for upgradeability --- contracts/lifecycle/Migrations.sol | 4 ++++ contracts/mocks/DetailedERC20Mock.sol | 4 +++- contracts/mocks/ERC721TokenMock.sol | 6 ++--- contracts/mocks/PausableMock.sol | 2 ++ contracts/mocks/PausableTokenMock.sol | 2 ++ contracts/ownership/Ownable.sol | 8 +++---- contracts/token/ERC20/DetailedERC20.sol | 6 ++--- contracts/token/ERC20/MintableToken.sol | 4 ++-- contracts/token/ERC20/TokenTimelock.sol | 6 ++--- contracts/token/ERC20/TokenVesting.sol | 9 ++++++-- contracts/token/ERC721/ERC721Token.sol | 5 +++-- package-lock.json | 30 ++++++++++++++++--------- package.json | 3 ++- test/ownership/Ownable.test.js | 1 + test/token/ERC20/MintableToken.test.js | 3 ++- test/token/ERC20/TokenTimelock.test.js | 6 +++-- test/token/ERC20/TokenVesting.test.js | 6 +++-- 17 files changed, 68 insertions(+), 37 deletions(-) diff --git a/contracts/lifecycle/Migrations.sol b/contracts/lifecycle/Migrations.sol index b12a39b2d..caf1fd56b 100644 --- a/contracts/lifecycle/Migrations.sol +++ b/contracts/lifecycle/Migrations.sol @@ -10,6 +10,10 @@ import "../ownership/Ownable.sol"; contract Migrations is Ownable { uint256 public lastCompletedMigration; + function Migrations() public { + Ownable.initialize(msg.sender); + } + function setCompleted(uint256 completed) onlyOwner public { lastCompletedMigration = completed; } diff --git a/contracts/mocks/DetailedERC20Mock.sol b/contracts/mocks/DetailedERC20Mock.sol index eb0f8cee0..9ead14d70 100644 --- a/contracts/mocks/DetailedERC20Mock.sol +++ b/contracts/mocks/DetailedERC20Mock.sol @@ -5,5 +5,7 @@ import "../token/ERC20/DetailedERC20.sol"; 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) public { + DetailedERC20.initialize(_name, _symbol, _decimals); + } } diff --git a/contracts/mocks/ERC721TokenMock.sol b/contracts/mocks/ERC721TokenMock.sol index 5fe3668ef..29bfe7439 100644 --- a/contracts/mocks/ERC721TokenMock.sol +++ b/contracts/mocks/ERC721TokenMock.sol @@ -9,9 +9,9 @@ import "../token/ERC721/ERC721Token.sol"; * and a public setter for metadata URI */ contract ERC721TokenMock is ERC721Token { - function ERC721TokenMock(string name, string symbol) public - ERC721Token(name, symbol) - { } + function ERC721TokenMock(string name, string symbol) public { + ERC721Token.initialize(name, symbol); + } function mint(address _to, uint256 _tokenId) public { super._mint(_to, _tokenId); diff --git a/contracts/mocks/PausableMock.sol b/contracts/mocks/PausableMock.sol index e28576b89..2e9022e60 100644 --- a/contracts/mocks/PausableMock.sol +++ b/contracts/mocks/PausableMock.sol @@ -10,6 +10,8 @@ contract PausableMock is Pausable { uint256 public count; function PausableMock() public { + Ownable.initialize(msg.sender); + drasticMeasureTaken = false; count = 0; } diff --git a/contracts/mocks/PausableTokenMock.sol b/contracts/mocks/PausableTokenMock.sol index 24aa6c891..66d79ae3a 100644 --- a/contracts/mocks/PausableTokenMock.sol +++ b/contracts/mocks/PausableTokenMock.sol @@ -7,6 +7,8 @@ import "../token/ERC20/PausableToken.sol"; contract PausableTokenMock is PausableToken { function PausableTokenMock(address initialAccount, uint initialBalance) public { + Ownable.initialize(msg.sender); + balances[initialAccount] = initialBalance; } diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol index 0d08f73dd..1c8c47321 100644 --- a/contracts/ownership/Ownable.sol +++ b/contracts/ownership/Ownable.sol @@ -1,24 +1,24 @@ pragma solidity ^0.4.21; +import 'zos-lib/contracts/migrations/Migratable.sol'; /** * @title Ownable * @dev The Ownable contract has an owner address, and provides basic authorization control * functions, this simplifies the implementation of "user permissions". */ -contract Ownable { +contract Ownable is Migratable { address public owner; event OwnershipTransferred(address indexed previousOwner, address indexed newOwner); - /** * @dev The Ownable constructor sets the original `owner` of the contract to the sender * account. */ - function Ownable() public { - owner = msg.sender; + function initialize(address _sender) public isInitializer("Ownable", "0") { + owner = _sender; } /** diff --git a/contracts/token/ERC20/DetailedERC20.sol b/contracts/token/ERC20/DetailedERC20.sol index a4807fea7..00ddac633 100644 --- a/contracts/token/ERC20/DetailedERC20.sol +++ b/contracts/token/ERC20/DetailedERC20.sol @@ -1,14 +1,14 @@ pragma solidity ^0.4.21; import "./ERC20.sol"; +import 'zos-lib/contracts/migrations/Migratable.sol'; - -contract DetailedERC20 is ERC20 { +contract DetailedERC20 is Migratable, ERC20 { string public name; string public symbol; uint8 public decimals; - function DetailedERC20(string _name, string _symbol, uint8 _decimals) public { + function initialize(address _sender, string _name, string _symbol, uint8 _decimals) public isInitializer("DetailedERC20", "0") { name = _name; symbol = _symbol; decimals = _decimals; diff --git a/contracts/token/ERC20/MintableToken.sol b/contracts/token/ERC20/MintableToken.sol index b9719529f..36d24587a 100644 --- a/contracts/token/ERC20/MintableToken.sol +++ b/contracts/token/ERC20/MintableToken.sol @@ -2,7 +2,7 @@ pragma solidity ^0.4.21; import "./StandardToken.sol"; import "../../ownership/Ownable.sol"; - +import "zos-lib/contracts/migrations/Migratable.sol"; /** * @title Mintable token @@ -10,7 +10,7 @@ import "../../ownership/Ownable.sol"; * @dev Issue: * https://github.com/OpenZeppelin/zeppelin-solidity/issues/120 * Based on code by TokenMarketNet: https://github.com/TokenMarketNet/ico/blob/master/contracts/MintableToken.sol */ -contract MintableToken is StandardToken, Ownable { +contract MintableToken is Migratable, Ownable, StandardToken { event Mint(address indexed to, uint256 amount); event MintFinished(); diff --git a/contracts/token/ERC20/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol index a14d904b5..05d840ffb 100644 --- a/contracts/token/ERC20/TokenTimelock.sol +++ b/contracts/token/ERC20/TokenTimelock.sol @@ -1,14 +1,14 @@ pragma solidity ^0.4.21; import "./SafeERC20.sol"; - +import "zos-lib/contracts/migrations/Migratable.sol"; /** * @title TokenTimelock * @dev TokenTimelock is a token holder contract that will allow a * beneficiary to extract the tokens after a given release time */ -contract TokenTimelock { +contract TokenTimelock is Migratable { using SafeERC20 for ERC20Basic; // ERC20 basic token contract being held @@ -20,7 +20,7 @@ contract TokenTimelock { // timestamp when token release is enabled uint256 public releaseTime; - function TokenTimelock(ERC20Basic _token, address _beneficiary, uint256 _releaseTime) public { + function initialize(address _sender, ERC20Basic _token, address _beneficiary, uint256 _releaseTime) public isInitializer("TokenTimelock", "0") { // solium-disable-next-line security/no-block-members require(_releaseTime > block.timestamp); token = _token; diff --git a/contracts/token/ERC20/TokenVesting.sol b/contracts/token/ERC20/TokenVesting.sol index 8e902eac7..ceeb19d6b 100644 --- a/contracts/token/ERC20/TokenVesting.sol +++ b/contracts/token/ERC20/TokenVesting.sol @@ -6,6 +6,7 @@ import "./ERC20Basic.sol"; import "./SafeERC20.sol"; import "../../ownership/Ownable.sol"; import "../../math/SafeMath.sol"; +import 'zos-lib/contracts/migrations/Migratable.sol'; /** @@ -14,7 +15,7 @@ import "../../math/SafeMath.sol"; * typical vesting scheme, with a cliff and vesting period. Optionally revocable by the * owner. */ -contract TokenVesting is Ownable { +contract TokenVesting is Migratable, Ownable { using SafeMath for uint256; using SafeERC20 for ERC20Basic; @@ -42,7 +43,8 @@ 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( + function initialize( + address _sender, address _beneficiary, uint256 _start, uint256 _cliff, @@ -50,7 +52,10 @@ contract TokenVesting is Ownable { bool _revocable ) public + isInitializer("TokenVesting", "0") { + Ownable.initialize(_sender); + require(_beneficiary != address(0)); require(_cliff <= _duration); diff --git a/contracts/token/ERC721/ERC721Token.sol b/contracts/token/ERC721/ERC721Token.sol index 7e43ec7e9..24c48f953 100644 --- a/contracts/token/ERC721/ERC721Token.sol +++ b/contracts/token/ERC721/ERC721Token.sol @@ -2,6 +2,7 @@ pragma solidity ^0.4.21; import "./ERC721.sol"; import "./ERC721BasicToken.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; /** @@ -10,7 +11,7 @@ import "./ERC721BasicToken.sol"; * Moreover, it includes approve all functionality using operator terminology * @dev see https://github.com/ethereum/EIPs/blob/master/EIPS/eip-721.md */ -contract ERC721Token is ERC721, ERC721BasicToken { +contract ERC721Token is Migratable, ERC721, ERC721BasicToken { // Token name string internal name_; @@ -35,7 +36,7 @@ contract ERC721Token is ERC721, ERC721BasicToken { /** * @dev Constructor function */ - function ERC721Token(string _name, string _symbol) public { + function initialize(address _sender, string _name, string _symbol) public isInitializer("ERC721Token", "0") { name_ = _name; symbol_ = _symbol; } diff --git a/package-lock.json b/package-lock.json index 9e56a7db8..d35924e33 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2755,7 +2755,6 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.2.1.tgz", "integrity": "sha1-4KepOn6BFjqUR3utVu3lJKtt5TM=", - "dev": true, "requires": { "bn.js": "4.11.6", "js-sha3": "0.5.5", @@ -2765,14 +2764,12 @@ "bn.js": { "version": "4.11.6", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", - "dev": true + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" }, "js-sha3": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz", - "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=", - "dev": true + "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=" } } }, @@ -4824,8 +4821,7 @@ "is-hex-prefixed": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz", - "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=", - "dev": true + "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=" }, "is-my-json-valid": { "version": "2.16.0", @@ -6394,7 +6390,6 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/number-to-bn/-/number-to-bn-1.7.0.tgz", "integrity": "sha1-uzYjWS9+X54AMLGXe9QaDFP+HqA=", - "dev": true, "requires": { "bn.js": "4.11.6", "strip-hex-prefix": "1.0.0" @@ -6403,8 +6398,7 @@ "bn.js": { "version": "4.11.6", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", - "dev": true + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" } } }, @@ -8025,7 +8019,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz", "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=", - "dev": true, "requires": { "is-hex-prefixed": "1.0.0" } @@ -9452,6 +9445,21 @@ } } } + }, + "zeppelin-solidity": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/zeppelin-solidity/-/zeppelin-solidity-1.8.0.tgz", + "integrity": "sha512-7Mxq6Y7EES0PSLrRF6v0EVYqBVRRo8hFrr7m3jEs69VbbQ5kpANzizeEdbP1/PWKSOmBOg208qP2vSA0FlzFLA==", + "requires": { + "dotenv": "4.0.0", + "ethjs-abi": "0.2.1" + } + }, + "zos-lib": { + "version": "git://github.com/zeppelinos/zos-lib.git#a4fc8fedbf0c4414717c9aafa24494775423db86", + "requires": { + "zeppelin-solidity": "1.8.0" + } } } } diff --git a/package.json b/package.json index 613b38c8a..afc120c15 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "truffle-hdwallet-provider": "0.0.3" }, "dependencies": { - "dotenv": "^4.0.0" + "dotenv": "^4.0.0", + "zos-lib": "git://github.com/zeppelinos/zos-lib.git" } } diff --git a/test/ownership/Ownable.test.js b/test/ownership/Ownable.test.js index 209a209b1..23f454289 100644 --- a/test/ownership/Ownable.test.js +++ b/test/ownership/Ownable.test.js @@ -8,6 +8,7 @@ contract('Ownable', function (accounts) { beforeEach(async function () { ownable = await Ownable.new(); + await ownable.initialize(accounts[0]); }); it('should have an owner', async function () { diff --git a/test/token/ERC20/MintableToken.test.js b/test/token/ERC20/MintableToken.test.js index a6b2d268e..8e169e58f 100644 --- a/test/token/ERC20/MintableToken.test.js +++ b/test/token/ERC20/MintableToken.test.js @@ -3,7 +3,8 @@ const MintableToken = artifacts.require('MintableToken'); contract('Mintable', function ([owner, anotherAccount]) { beforeEach(async function () { - this.token = await MintableToken.new({ from: owner }); + this.token = await MintableToken.new(); + await this.token.initialize(owner); }); describe('minting finished', function () { diff --git a/test/token/ERC20/TokenTimelock.test.js b/test/token/ERC20/TokenTimelock.test.js index d99c4b247..a8f2e20d8 100644 --- a/test/token/ERC20/TokenTimelock.test.js +++ b/test/token/ERC20/TokenTimelock.test.js @@ -15,9 +15,11 @@ contract('TokenTimelock', function ([_, owner, beneficiary]) { const amount = new BigNumber(100); beforeEach(async function () { - this.token = await MintableToken.new({ from: owner }); + this.token = await MintableToken.new(); + await this.token.initialize(owner); this.releaseTime = latestTime() + duration.years(1); - this.timelock = await TokenTimelock.new(this.token.address, beneficiary, this.releaseTime); + this.timelock = await TokenTimelock.new(); + await this.timelock.initialize(this.token.address, beneficiary, this.releaseTime); await this.token.mint(this.timelock.address, amount, { from: owner }); }); diff --git a/test/token/ERC20/TokenVesting.test.js b/test/token/ERC20/TokenVesting.test.js index e6ce5c177..82101e4c8 100644 --- a/test/token/ERC20/TokenVesting.test.js +++ b/test/token/ERC20/TokenVesting.test.js @@ -16,13 +16,15 @@ contract('TokenVesting', function ([_, owner, beneficiary]) { const amount = new BigNumber(1000); beforeEach(async function () { - this.token = await MintableToken.new({ from: owner }); + this.token = await MintableToken.new(); + await this.token.initialize(owner); this.start = latestTime() + duration.minutes(1); // +1 minute so it starts after contract instantiation this.cliff = duration.years(1); this.duration = duration.years(2); - this.vesting = await TokenVesting.new(beneficiary, this.start, this.cliff, this.duration, true, { from: owner }); + this.vesting = await TokenVesting.new(); + await this.vesting.initialize(owner, beneficiary, this.start, this.cliff, this.duration, true); await this.token.mint(this.vesting.address, amount, { from: owner }); }); From 2eac2a79b76abd31df612d1760f498a840fb43e4 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 20 Apr 2018 11:21:53 -0300 Subject: [PATCH 09/54] add mintable erc721 token --- contracts/token/ERC721/MintableERC721Token.sol | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 contracts/token/ERC721/MintableERC721Token.sol diff --git a/contracts/token/ERC721/MintableERC721Token.sol b/contracts/token/ERC721/MintableERC721Token.sol new file mode 100644 index 000000000..1f922e73b --- /dev/null +++ b/contracts/token/ERC721/MintableERC721Token.sol @@ -0,0 +1,18 @@ +pragma solidity ^0.4.21; + +import "./ERC721Token.sol"; +import "../../ownership/Ownable.sol"; + +/** + * @title Mintable ERC721 Token + */ +contract MintableERC721Token is Migratable, Ownable, ERC721Token { + function initialize(address _sender, string _name, string _symbol) isInitializer("MintableERC721Token", "0") { + Ownable.initialize(_sender); + ERC721Token.initialize(_sender, _name, _symbol); + } + + function mint(address _to, uint256 _tokenId) onlyOwner public { + _mint(_to, _tokenId); + } +} From b1a801566cedff9c3e8d09be6bc4361fcc58f660 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 20 Apr 2018 12:14:25 -0300 Subject: [PATCH 10/54] fix initializers and tests --- contracts/mocks/DetailedERC20Mock.sol | 2 +- contracts/mocks/ERC721TokenMock.sol | 2 +- test/token/ERC20/TokenTimelock.test.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contracts/mocks/DetailedERC20Mock.sol b/contracts/mocks/DetailedERC20Mock.sol index 9ead14d70..01f1640c8 100644 --- a/contracts/mocks/DetailedERC20Mock.sol +++ b/contracts/mocks/DetailedERC20Mock.sol @@ -6,6 +6,6 @@ import "../token/ERC20/DetailedERC20.sol"; contract DetailedERC20Mock is StandardToken, DetailedERC20 { function DetailedERC20Mock(string _name, string _symbol, uint8 _decimals) public { - DetailedERC20.initialize(_name, _symbol, _decimals); + DetailedERC20.initialize(msg.sender, _name, _symbol, _decimals); } } diff --git a/contracts/mocks/ERC721TokenMock.sol b/contracts/mocks/ERC721TokenMock.sol index 29bfe7439..ac5bab39d 100644 --- a/contracts/mocks/ERC721TokenMock.sol +++ b/contracts/mocks/ERC721TokenMock.sol @@ -10,7 +10,7 @@ import "../token/ERC721/ERC721Token.sol"; */ contract ERC721TokenMock is ERC721Token { function ERC721TokenMock(string name, string symbol) public { - ERC721Token.initialize(name, symbol); + ERC721Token.initialize(msg.sender, name, symbol); } function mint(address _to, uint256 _tokenId) public { diff --git a/test/token/ERC20/TokenTimelock.test.js b/test/token/ERC20/TokenTimelock.test.js index a8f2e20d8..32bae6fa5 100644 --- a/test/token/ERC20/TokenTimelock.test.js +++ b/test/token/ERC20/TokenTimelock.test.js @@ -19,7 +19,7 @@ contract('TokenTimelock', function ([_, owner, beneficiary]) { await this.token.initialize(owner); this.releaseTime = latestTime() + duration.years(1); this.timelock = await TokenTimelock.new(); - await this.timelock.initialize(this.token.address, beneficiary, this.releaseTime); + await this.timelock.initialize(owner, this.token.address, beneficiary, this.releaseTime); await this.token.mint(this.timelock.address, amount, { from: owner }); }); From ea335ebc6482742d53b5bdf82fc909651e7383a0 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Thu, 19 Apr 2018 12:26:12 -0300 Subject: [PATCH 11/54] ignore everything but official contracts for npm --- contracts/.npmignore | 2 ++ package.json | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 contracts/.npmignore diff --git a/contracts/.npmignore b/contracts/.npmignore new file mode 100644 index 000000000..e792d8bc6 --- /dev/null +++ b/contracts/.npmignore @@ -0,0 +1,2 @@ +mocks +examples diff --git a/package.json b/package.json index afc120c15..df482b817 100644 --- a/package.json +++ b/package.json @@ -2,6 +2,9 @@ "name": "zeppelin-solidity", "version": "1.8.0", "description": "Secure Smart Contract library for Solidity", + "files": [ + "contracts" + ], "scripts": { "test": "scripts/test.sh", "lint": "eslint .", From 5f079c860516f4353226e1018ee57675ae6e04cc Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Thu, 19 Apr 2018 12:32:56 -0300 Subject: [PATCH 12/54] add prepack step to build contracts --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index df482b817..500dd0b94 100644 --- a/package.json +++ b/package.json @@ -3,9 +3,11 @@ "version": "1.8.0", "description": "Secure Smart Contract library for Solidity", "files": [ - "contracts" + "contracts", + "build" ], "scripts": { + "prepack": "truffle compile", "test": "scripts/test.sh", "lint": "eslint .", "lint:fix": "eslint . --fix", From ff6a5654523c855ee677e38b68befe82a8d5ef1b Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 20 Apr 2018 11:28:56 -0300 Subject: [PATCH 13/54] bump version --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 500dd0b94..0e5be3b9b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "zeppelin-solidity", - "version": "1.8.0", + "name": "openzeppelin-zos", + "version": "1.9.0-beta", "description": "Secure Smart Contract library for Solidity", "files": [ "contracts", From 27d696aa7d0aa642cb75b8743dbb6529e8200422 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 20 Apr 2018 13:28:04 -0300 Subject: [PATCH 14/54] add deployable erc20 contracts --- .../token/ERC20/DetailedMintableToken.sol | 12 ++++++++++++ .../token/ERC20/DetailedPremintedToken.sol | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 contracts/token/ERC20/DetailedMintableToken.sol create mode 100644 contracts/token/ERC20/DetailedPremintedToken.sol diff --git a/contracts/token/ERC20/DetailedMintableToken.sol b/contracts/token/ERC20/DetailedMintableToken.sol new file mode 100644 index 000000000..c7f73cda4 --- /dev/null +++ b/contracts/token/ERC20/DetailedMintableToken.sol @@ -0,0 +1,12 @@ +pragma solidity ^0.4.21; + +import "zos-lib/contracts/migrations/Migratable.sol"; +import "./DetailedERC20.sol"; +import "./MintableToken.sol"; + +contract DetailedMintableToken is Migratable, DetailedERC20, MintableToken { + function initialize(address _sender, string _name, string _symbol, uint8 _decimals) isInitializer("DetailedMintableToken", "0") { + DetailedERC20.initialize(_sender, _name, _symbol, _decimals); + Ownable.initialize(_sender); + } +} diff --git a/contracts/token/ERC20/DetailedPremintedToken.sol b/contracts/token/ERC20/DetailedPremintedToken.sol new file mode 100644 index 000000000..900b17d60 --- /dev/null +++ b/contracts/token/ERC20/DetailedPremintedToken.sol @@ -0,0 +1,18 @@ +pragma solidity ^0.4.21; + +import "zos-lib/contracts/migrations/Migratable.sol"; +import "./DetailedERC20.sol"; +import "./MintableToken.sol"; + +contract DetailedPremintedToken is Migratable, DetailedERC20, StandardToken { + function initialize(address _sender, string _name, string _symbol, uint8 _decimals, uint256 _initialBalance) isInitializer("DetailedPremintedToken", "0") { + DetailedERC20.initialize(_sender, _name, _symbol, _decimals); + + _premint(_sender, _initialBalance); + } + + function _premint(address _to, uint256 _value) internal { + balances[_to] += _value; + emit Transfer(0, _to, _value); + } +} From 95fdc7bd8ae01a401d2aa9aef4425c25963c2245 Mon Sep 17 00:00:00 2001 From: Alejo Salles Date: Fri, 20 Apr 2018 19:58:16 -0300 Subject: [PATCH 15/54] update contracts and config --- contracts/ownership/Ownable.sol | 2 +- contracts/token/ERC20/DetailedERC20.sol | 2 +- contracts/token/ERC20/TokenTimelock.sol | 2 +- contracts/token/ERC20/TokenVesting.sol | 2 +- contracts/token/ERC721/ERC721Token.sol | 2 +- package-lock.json | 1195 +++++++++++++---------- package.json | 3 +- truffle-config.js | 7 +- 8 files changed, 699 insertions(+), 516 deletions(-) diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol index 28ca7e7e2..b1bfd54cf 100644 --- a/contracts/ownership/Ownable.sol +++ b/contracts/ownership/Ownable.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.21; -import 'zos-upgradeability/contracts/migrations/Initializable.sol'; +import 'zos-lib/contracts/migrations/Initializable.sol'; /** * @title Ownable diff --git a/contracts/token/ERC20/DetailedERC20.sol b/contracts/token/ERC20/DetailedERC20.sol index 382cf64d3..8bcedba34 100644 --- a/contracts/token/ERC20/DetailedERC20.sol +++ b/contracts/token/ERC20/DetailedERC20.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.21; import "./ERC20.sol"; -import 'zos-upgradeability/contracts/migrations/Initializable.sol'; +import 'zos-lib/contracts/migrations/Initializable.sol'; contract DetailedERC20 is Initializable, ERC20 { string public name; diff --git a/contracts/token/ERC20/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol index 643dd367d..6e82a1a2f 100644 --- a/contracts/token/ERC20/TokenTimelock.sol +++ b/contracts/token/ERC20/TokenTimelock.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.21; import "./SafeERC20.sol"; -import "zos-upgradeability/contracts/migrations/Initializable.sol"; +import "zos-lib/contracts/migrations/Initializable.sol"; /** * @title TokenTimelock diff --git a/contracts/token/ERC20/TokenVesting.sol b/contracts/token/ERC20/TokenVesting.sol index 8dcfa3178..652bd4ae7 100644 --- a/contracts/token/ERC20/TokenVesting.sol +++ b/contracts/token/ERC20/TokenVesting.sol @@ -6,7 +6,7 @@ import "./ERC20Basic.sol"; import "./SafeERC20.sol"; import "../../ownership/Ownable.sol"; import "../../math/SafeMath.sol"; -import 'zos-upgradeability/contracts/migrations/Initializable.sol'; +import 'zos-lib/contracts/migrations/Initializable.sol'; /** diff --git a/contracts/token/ERC721/ERC721Token.sol b/contracts/token/ERC721/ERC721Token.sol index 6d6a7bbb2..49a066587 100644 --- a/contracts/token/ERC721/ERC721Token.sol +++ b/contracts/token/ERC721/ERC721Token.sol @@ -2,7 +2,7 @@ pragma solidity ^0.4.21; import "./ERC721.sol"; import "./ERC721BasicToken.sol"; -import "zos-upgradeability/contracts/migrations/Initializable.sol"; +import "zos-lib/contracts/migrations/Initializable.sol"; /** diff --git a/package-lock.json b/package-lock.json index c32a5de49..fafb40d16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { - "name": "zeppelin-solidity", - "version": "1.8.0", + "name": "openzeppelin-zos", + "version": "1.9.0-beta", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -52,7 +52,6 @@ "version": "5.5.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "dev": true, "requires": { "co": "4.6.0", "fast-deep-equal": "1.0.0", @@ -92,14 +91,12 @@ "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "ansi-styles": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" }, "any-observable": { "version": "0.2.0", @@ -111,7 +108,6 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", - "dev": true, "requires": { "micromatch": "2.3.11", "normalize-path": "2.1.1" @@ -120,14 +116,12 @@ "aproba": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz", - "integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw==", - "dev": true + "integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw==" }, "are-we-there-yet": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", - "dev": true, "requires": { "delegates": "1.0.0", "readable-stream": "2.3.3" @@ -146,7 +140,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, "requires": { "arr-flatten": "1.1.0" } @@ -154,8 +147,7 @@ "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" }, "array-differ": { "version": "1.0.0", @@ -181,8 +173,7 @@ "array-unique": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=" }, "arrify": { "version": "1.0.1", @@ -223,8 +214,7 @@ "async-each": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", - "dev": true + "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=" }, "async-eventemitter": { "version": "0.2.3", @@ -264,11 +254,186 @@ "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", "dev": true }, + "babel-cli": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz", + "integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=", + "requires": { + "babel-core": "6.26.0", + "babel-polyfill": "6.26.0", + "babel-register": "6.26.0", + "babel-runtime": "6.26.0", + "chokidar": "1.7.0", + "commander": "2.11.0", + "convert-source-map": "1.5.0", + "fs-readdir-recursive": "1.1.0", + "glob": "7.1.2", + "lodash": "4.17.4", + "output-file-sync": "1.1.2", + "path-is-absolute": "1.0.1", + "slash": "1.0.0", + "source-map": "0.5.6", + "v8flags": "2.1.1" + }, + "dependencies": { + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + } + }, + "babel-core": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz", + "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=", + "requires": { + "babel-code-frame": "6.26.0", + "babel-generator": "6.26.1", + "babel-helpers": "6.24.1", + "babel-messages": "6.23.0", + "babel-register": "6.26.0", + "babel-runtime": "6.26.0", + "babel-template": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "convert-source-map": "1.5.0", + "debug": "2.6.8", + "json5": "0.5.1", + "lodash": "4.17.4", + "minimatch": "3.0.4", + "path-is-absolute": "1.0.1", + "private": "0.1.7", + "slash": "1.0.0", + "source-map": "0.5.6" + } + }, + "babel-generator": { + "version": "6.26.1", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", + "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", + "requires": { + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.4", + "source-map": "0.5.7", + "trim-right": "1.0.1" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + } + } + }, + "babel-polyfill": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz", + "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=", + "requires": { + "babel-runtime": "6.26.0", + "core-js": "2.5.0", + "regenerator-runtime": "0.10.5" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.10.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz", + "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=" + } + } + }, + "babel-register": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", + "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", + "requires": { + "babel-core": "6.26.0", + "babel-runtime": "6.26.0", + "core-js": "2.5.0", + "home-or-tmp": "2.0.0", + "lodash": "4.17.4", + "mkdirp": "0.5.1", + "source-map-support": "0.4.15" + } + }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "requires": { + "core-js": "2.5.0", + "regenerator-runtime": "0.11.1" + } + }, + "babel-template": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", + "requires": { + "babel-runtime": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "lodash": "4.17.4" + } + }, + "babel-traverse": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", + "requires": { + "babel-code-frame": "6.26.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0", + "debug": "2.6.8", + "globals": "9.18.0", + "invariant": "2.2.2", + "lodash": "4.17.4" + } + }, + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "requires": { + "babel-runtime": "6.26.0", + "esutils": "2.0.2", + "lodash": "4.17.4", + "to-fast-properties": "1.0.3" + } + }, + "babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==" + }, + "jsesc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=" + }, + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + } + } + }, "babel-code-frame": { "version": "6.22.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=", - "dev": true, "requires": { "chalk": "1.1.3", "esutils": "2.0.2", @@ -480,7 +645,6 @@ "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", - "dev": true, "requires": { "babel-runtime": "6.25.0", "babel-template": "6.25.0" @@ -490,7 +654,6 @@ "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "dev": true, "requires": { "babel-runtime": "6.25.0" } @@ -1020,7 +1183,6 @@ "version": "6.25.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz", "integrity": "sha1-M7mOql1IK7AajRqmtDetKwGuxBw=", - "dev": true, "requires": { "core-js": "2.5.0", "regenerator-runtime": "0.10.5" @@ -1030,7 +1192,6 @@ "version": "6.25.0", "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz", "integrity": "sha1-ZlJBFmt8KqTGGdceGSlpVSsQwHE=", - "dev": true, "requires": { "babel-runtime": "6.25.0", "babel-traverse": "6.25.0", @@ -1043,7 +1204,6 @@ "version": "6.25.0", "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz", "integrity": "sha1-IldJfi/NGbie3BPEyROB+VEklvE=", - "dev": true, "requires": { "babel-code-frame": "6.22.0", "babel-messages": "6.23.0", @@ -1060,7 +1220,6 @@ "version": "6.25.0", "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz", "integrity": "sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4=", - "dev": true, "requires": { "babel-runtime": "6.25.0", "esutils": "2.0.2", @@ -1081,14 +1240,12 @@ "babylon": { "version": "6.17.4", "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz", - "integrity": "sha512-kChlV+0SXkjE0vUn9OZ7pBMWRFd8uq3mZe8x1K6jhuNcAFAtEnjchFAqB+dYEXKyd+JpT6eppRR78QAr5gTsUw==", - "dev": true + "integrity": "sha512-kChlV+0SXkjE0vUn9OZ7pBMWRFd8uq3mZe8x1K6jhuNcAFAtEnjchFAqB+dYEXKyd+JpT6eppRR78QAr5gTsUw==" }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, "base-x": { "version": "1.1.0", @@ -1119,8 +1276,7 @@ "binary-extensions": { "version": "1.11.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", - "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", - "dev": true + "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=" }, "binaryextensions": { "version": "2.1.1", @@ -1131,8 +1287,7 @@ "bindings": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz", - "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==", - "dev": true + "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==" }, "bip39": { "version": "2.2.0", @@ -1150,7 +1305,6 @@ "version": "1.1.5", "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz", "integrity": "sha1-AfqHSHhcpwlV1QESF9GzE5lpyiI=", - "dev": true, "requires": { "safe-buffer": "5.1.1" } @@ -1159,16 +1313,19 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz", "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=", - "dev": true, "requires": { "readable-stream": "2.3.3" } }, + "bluebird": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==" + }, "bn.js": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", - "dev": true + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" }, "boom": { "version": "2.10.1", @@ -1183,7 +1340,6 @@ "version": "1.1.8", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", - "dev": true, "requires": { "balanced-match": "1.0.0", "concat-map": "0.0.1" @@ -1193,7 +1349,6 @@ "version": "1.8.5", "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "dev": true, "requires": { "expand-range": "1.8.2", "preserve": "0.2.0", @@ -1203,20 +1358,17 @@ "brorand": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", - "dev": true + "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=" }, "browser-stdout": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz", - "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=", - "dev": true + "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=" }, "browserify-aes": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz", "integrity": "sha1-Xncl297x/Vkw1OurSFZ85FHEigo=", - "dev": true, "requires": { "buffer-xor": "1.0.3", "cipher-base": "1.0.4", @@ -1229,7 +1381,6 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/browserify-sha3/-/browserify-sha3-0.0.1.tgz", "integrity": "sha1-P/NKMAbvFcD7NWflQbkaI0ASPRE=", - "dev": true, "requires": { "js-sha3": "0.3.1" } @@ -1256,14 +1407,12 @@ "buffer-xor": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", - "dev": true + "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=" }, "builtin-modules": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" }, "cacheable-request": { "version": "2.1.4", @@ -1306,8 +1455,7 @@ "camelcase": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" }, "caseless": { "version": "0.11.0", @@ -1359,7 +1507,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, "requires": { "ansi-styles": "2.2.1", "escape-string-regexp": "1.0.5", @@ -1393,7 +1540,6 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", - "dev": true, "requires": { "anymatch": "1.3.2", "async-each": "1.0.1", @@ -1409,14 +1555,12 @@ "chownr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", - "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", - "dev": true + "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=" }, "cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", - "dev": true, "requires": { "inherits": "2.0.3", "safe-buffer": "5.1.1" @@ -1488,7 +1632,6 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, "requires": { "string-width": "1.0.2", "strip-ansi": "3.0.1", @@ -1568,14 +1711,12 @@ "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", - "dev": true + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" }, "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, "coinstring": { "version": "2.3.0", @@ -1628,8 +1769,7 @@ "commander": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", - "dev": true + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" }, "commondir": { "version": "1.0.1", @@ -1640,8 +1780,7 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, "concat-stream": { "version": "1.6.0", @@ -1657,8 +1796,7 @@ "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" }, "contains-path": { "version": "0.1.0", @@ -1669,20 +1807,17 @@ "convert-source-map": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz", - "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=", - "dev": true + "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=" }, "core-js": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.0.tgz", - "integrity": "sha1-VpwFCRi+ZIazg3VSAorgRmtxcIY=", - "dev": true + "integrity": "sha1-VpwFCRi+ZIazg3VSAorgRmtxcIY=" }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "coveralls": { "version": "2.13.1", @@ -1709,7 +1844,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=", - "dev": true, "requires": { "cipher-base": "1.0.4", "inherits": "2.0.3", @@ -1721,7 +1855,6 @@ "version": "1.1.6", "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz", "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=", - "dev": true, "requires": { "cipher-base": "1.0.4", "create-hash": "1.1.3", @@ -1766,8 +1899,7 @@ "crypto-js": { "version": "3.1.8", "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.8.tgz", - "integrity": "sha1-cV8HC/YBTyrpkqmLOSkli3E/CNU=", - "dev": true + "integrity": "sha1-cV8HC/YBTyrpkqmLOSkli3E/CNU=" }, "dargs": { "version": "5.1.0", @@ -1814,7 +1946,6 @@ "version": "2.6.8", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", - "dev": true, "requires": { "ms": "2.0.0" } @@ -1822,8 +1953,7 @@ "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, "decode-uri-component": { "version": "0.2.0", @@ -1866,8 +1996,7 @@ "deep-extend": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", - "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", - "dev": true + "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=" }, "deep-is": { "version": "0.1.3", @@ -1932,8 +2061,7 @@ "delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" }, "detect-conflict": { "version": "1.0.1", @@ -1945,7 +2073,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "dev": true, "requires": { "repeating": "2.0.1" } @@ -1980,7 +2107,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz", "integrity": "sha1-Pja2xCs3BDgjzbwzLVjzHiRFSAs=", - "dev": true, "requires": { "browserify-aes": "1.0.6", "create-hash": "1.1.3", @@ -2025,7 +2151,6 @@ "version": "6.4.0", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", - "dev": true, "requires": { "bn.js": "4.11.8", "brorand": "1.1.0", @@ -2055,7 +2180,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz", "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=", - "dev": true, "requires": { "once": "1.4.0" } @@ -2097,7 +2221,6 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", - "dev": true, "requires": { "is-arrayish": "0.2.1" } @@ -2129,8 +2252,7 @@ "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "escodegen": { "version": "1.8.1", @@ -2534,8 +2656,7 @@ "esutils": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" }, "ethereum-common": { "version": "0.0.16", @@ -2543,6 +2664,29 @@ "integrity": "sha1-mh4Wnq00q3XgifUMpRK/0PvRJlU=", "dev": true }, + "ethereumjs-abi": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.5.tgz", + "integrity": "sha1-WmN+8Wq0NHP6cqKa2QhxQFs/UkE=", + "requires": { + "bn.js": "4.11.8", + "ethereumjs-util": "4.5.0" + }, + "dependencies": { + "ethereumjs-util": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz", + "integrity": "sha1-PpQosxfuvaPXJg2FT93alUsfG8Y=", + "requires": { + "bn.js": "4.11.8", + "create-hash": "1.1.3", + "keccakjs": "0.2.1", + "rlp": "2.0.0", + "secp256k1": "3.3.0" + } + } + } + }, "ethereumjs-account": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/ethereumjs-account/-/ethereumjs-account-2.0.4.tgz", @@ -2787,7 +2931,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz", "integrity": "sha1-SXtmrZ/vZc18CKYYCCS6FHa2blM=", - "dev": true, "requires": { "create-hash": "1.1.3" } @@ -2817,7 +2960,6 @@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, "requires": { "is-posix-bracket": "0.1.1" } @@ -2826,7 +2968,6 @@ "version": "1.8.2", "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", - "dev": true, "requires": { "fill-range": "2.2.3" } @@ -2834,8 +2975,7 @@ "expand-template": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-1.0.3.tgz", - "integrity": "sha1-bDAzIxd6YrGyLAcCefeGEoe2mxo=", - "dev": true + "integrity": "sha1-bDAzIxd6YrGyLAcCefeGEoe2mxo=" }, "expand-tilde": { "version": "2.0.2", @@ -2867,7 +3007,6 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, "requires": { "is-extglob": "1.0.0" } @@ -2890,14 +3029,12 @@ "fast-deep-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", - "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=", - "dev": true + "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=" }, "fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", - "dev": true + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" }, "fast-levenshtein": { "version": "2.0.6", @@ -2927,14 +3064,12 @@ "filename-regex": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", - "dev": true + "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=" }, "fill-range": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", - "dev": true, "requires": { "is-number": "2.1.0", "isobject": "2.1.0", @@ -2947,7 +3082,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, "requires": { "path-exists": "2.1.0", "pinkie-promise": "2.0.1" @@ -2992,14 +3126,12 @@ "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" }, "for-own": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", - "dev": true, "requires": { "for-in": "1.0.2" } @@ -3041,7 +3173,6 @@ "version": "0.30.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", - "dev": true, "requires": { "graceful-fs": "4.1.11", "jsonfile": "2.4.0", @@ -3050,17 +3181,20 @@ "rimraf": "2.6.1" } }, + "fs-readdir-recursive": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz", + "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==" + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" }, "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", @@ -3070,13 +3204,11 @@ "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", @@ -3085,19 +3217,16 @@ }, "ansi-regex": { "version": "2.1.1", - "bundled": true, - "dev": true + "bundled": 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", @@ -3107,42 +3236,35 @@ "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 + "bundled": true }, "bcrypt-pbkdf": { "version": "1.0.1", "bundled": true, - "dev": true, "optional": true, "requires": { "tweetnacl": "0.14.5" @@ -3151,7 +3273,6 @@ "block-stream": { "version": "0.0.9", "bundled": true, - "dev": true, "requires": { "inherits": "2.0.3" } @@ -3159,7 +3280,6 @@ "boom": { "version": "2.10.1", "bundled": true, - "dev": true, "requires": { "hoek": "2.16.3" } @@ -3167,7 +3287,6 @@ "brace-expansion": { "version": "1.1.7", "bundled": true, - "dev": true, "requires": { "balanced-match": "0.4.2", "concat-map": "0.0.1" @@ -3175,53 +3294,44 @@ }, "buffer-shims": { "version": "1.0.0", - "bundled": true, - "dev": true + "bundled": 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 + "bundled": 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 + "bundled": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "dev": true + "bundled": true }, "core-util-is": { "version": "1.0.2", - "bundled": true, - "dev": true + "bundled": true }, "cryptiles": { "version": "2.0.5", "bundled": true, - "dev": true, "requires": { "boom": "2.10.1" } @@ -3229,7 +3339,6 @@ "dashdash": { "version": "1.14.1", "bundled": true, - "dev": true, "optional": true, "requires": { "assert-plus": "1.0.0" @@ -3238,7 +3347,6 @@ "assert-plus": { "version": "1.0.0", "bundled": true, - "dev": true, "optional": true } } @@ -3246,7 +3354,6 @@ "debug": { "version": "2.6.8", "bundled": true, - "dev": true, "optional": true, "requires": { "ms": "2.0.0" @@ -3255,30 +3362,25 @@ "deep-extend": { "version": "0.4.2", "bundled": true, - "dev": true, "optional": true }, "delayed-stream": { "version": "1.0.0", - "bundled": true, - "dev": true + "bundled": 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" @@ -3287,24 +3389,20 @@ "extend": { "version": "3.0.1", "bundled": true, - "dev": true, "optional": true }, "extsprintf": { "version": "1.0.2", - "bundled": true, - "dev": true + "bundled": 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", @@ -3314,13 +3412,11 @@ }, "fs.realpath": { "version": "1.0.0", - "bundled": true, - "dev": true + "bundled": true }, "fstream": { "version": "1.0.11", "bundled": true, - "dev": true, "requires": { "graceful-fs": "4.1.11", "inherits": "2.0.3", @@ -3331,7 +3427,6 @@ "fstream-ignore": { "version": "1.0.5", "bundled": true, - "dev": true, "optional": true, "requires": { "fstream": "1.0.11", @@ -3342,7 +3437,6 @@ "gauge": { "version": "2.7.4", "bundled": true, - "dev": true, "optional": true, "requires": { "aproba": "1.1.1", @@ -3358,7 +3452,6 @@ "getpass": { "version": "0.1.7", "bundled": true, - "dev": true, "optional": true, "requires": { "assert-plus": "1.0.0" @@ -3367,7 +3460,6 @@ "assert-plus": { "version": "1.0.0", "bundled": true, - "dev": true, "optional": true } } @@ -3375,7 +3467,6 @@ "glob": { "version": "7.1.2", "bundled": true, - "dev": true, "requires": { "fs.realpath": "1.0.0", "inflight": "1.0.6", @@ -3387,19 +3478,16 @@ }, "graceful-fs": { "version": "4.1.11", - "bundled": true, - "dev": true + "bundled": 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", @@ -3409,13 +3497,11 @@ "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", @@ -3425,13 +3511,11 @@ }, "hoek": { "version": "2.16.3", - "bundled": true, - "dev": true + "bundled": true }, "http-signature": { "version": "1.1.1", "bundled": true, - "dev": true, "optional": true, "requires": { "assert-plus": "0.2.0", @@ -3442,7 +3526,6 @@ "inflight": { "version": "1.0.6", "bundled": true, - "dev": true, "requires": { "once": "1.4.0", "wrappy": "1.0.2" @@ -3450,19 +3533,16 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "dev": true + "bundled": 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" } @@ -3470,24 +3550,20 @@ "is-typedarray": { "version": "1.0.0", "bundled": true, - "dev": true, "optional": true }, "isarray": { "version": "1.0.0", - "bundled": true, - "dev": true + "bundled": 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" @@ -3496,19 +3572,16 @@ "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" @@ -3517,19 +3590,16 @@ "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", @@ -3541,20 +3611,17 @@ "assert-plus": { "version": "1.0.0", "bundled": true, - "dev": true, "optional": true } } }, "mime-db": { "version": "1.27.0", - "bundled": true, - "dev": true + "bundled": true }, "mime-types": { "version": "2.1.15", "bundled": true, - "dev": true, "requires": { "mime-db": "1.27.0" } @@ -3562,20 +3629,17 @@ "minimatch": { "version": "3.0.4", "bundled": true, - "dev": true, "requires": { "brace-expansion": "1.1.7" } }, "minimist": { "version": "0.0.8", - "bundled": true, - "dev": true + "bundled": true }, "mkdirp": { "version": "0.5.1", "bundled": true, - "dev": true, "requires": { "minimist": "0.0.8" } @@ -3583,13 +3647,11 @@ "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", @@ -3608,7 +3670,6 @@ "nopt": { "version": "4.0.1", "bundled": true, - "dev": true, "optional": true, "requires": { "abbrev": "1.1.0", @@ -3618,7 +3679,6 @@ "npmlog": { "version": "4.1.0", "bundled": true, - "dev": true, "optional": true, "requires": { "are-we-there-yet": "1.1.4", @@ -3629,25 +3689,21 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "dev": true + "bundled": 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" } @@ -3655,19 +3711,16 @@ "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", @@ -3676,36 +3729,30 @@ }, "path-is-absolute": { "version": "1.0.1", - "bundled": true, - "dev": true + "bundled": true }, "performance-now": { "version": "0.2.0", "bundled": true, - "dev": true, "optional": true }, "process-nextick-args": { "version": "1.0.7", - "bundled": true, - "dev": true + "bundled": 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", @@ -3717,7 +3764,6 @@ "minimist": { "version": "1.2.0", "bundled": true, - "dev": true, "optional": true } } @@ -3725,7 +3771,6 @@ "readable-stream": { "version": "2.2.9", "bundled": true, - "dev": true, "requires": { "buffer-shims": "1.0.0", "core-util-is": "1.0.2", @@ -3739,7 +3784,6 @@ "request": { "version": "2.81.0", "bundled": true, - "dev": true, "optional": true, "requires": { "aws-sign2": "0.6.0", @@ -3769,38 +3813,32 @@ "rimraf": { "version": "2.6.1", "bundled": true, - "dev": true, "requires": { "glob": "7.1.2" } }, "safe-buffer": { "version": "5.0.1", - "bundled": true, - "dev": true + "bundled": 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" } @@ -3808,7 +3846,6 @@ "sshpk": { "version": "1.13.0", "bundled": true, - "dev": true, "optional": true, "requires": { "asn1": "0.2.3", @@ -3825,7 +3862,6 @@ "assert-plus": { "version": "1.0.0", "bundled": true, - "dev": true, "optional": true } } @@ -3833,7 +3869,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "dev": true, "requires": { "code-point-at": "1.1.0", "is-fullwidth-code-point": "1.0.0", @@ -3843,7 +3878,6 @@ "string_decoder": { "version": "1.0.1", "bundled": true, - "dev": true, "requires": { "safe-buffer": "5.0.1" } @@ -3851,13 +3885,11 @@ "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" } @@ -3865,13 +3897,11 @@ "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", @@ -3881,7 +3911,6 @@ "tar-pack": { "version": "3.4.0", "bundled": true, - "dev": true, "optional": true, "requires": { "debug": "2.6.8", @@ -3897,7 +3926,6 @@ "tough-cookie": { "version": "2.3.2", "bundled": true, - "dev": true, "optional": true, "requires": { "punycode": "1.4.1" @@ -3906,7 +3934,6 @@ "tunnel-agent": { "version": "0.6.0", "bundled": true, - "dev": true, "optional": true, "requires": { "safe-buffer": "5.0.1" @@ -3915,30 +3942,25 @@ "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 + "bundled": 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" @@ -3947,7 +3969,6 @@ "wide-align": { "version": "1.1.2", "bundled": true, - "dev": true, "optional": true, "requires": { "string-width": "1.0.2" @@ -3955,8 +3976,7 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true, - "dev": true + "bundled": true } } }, @@ -4003,7 +4023,6 @@ "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", - "dev": true, "requires": { "aproba": "1.1.2", "console-control-strings": "1.1.0", @@ -4033,8 +4052,7 @@ "get-caller-file": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", - "dev": true + "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=" }, "get-func-name": { "version": "2.0.0", @@ -4132,8 +4150,7 @@ "github-from-package": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", - "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=", - "dev": true + "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=" }, "github-username": { "version": "4.1.0", @@ -4148,7 +4165,6 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "dev": true, "requires": { "fs.realpath": "1.0.0", "inflight": "1.0.6", @@ -4189,7 +4205,6 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", - "dev": true, "requires": { "glob-parent": "2.0.0", "is-glob": "2.0.1" @@ -4199,7 +4214,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "dev": true, "requires": { "is-glob": "2.0.1" } @@ -4241,8 +4255,7 @@ "globals": { "version": "9.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", - "dev": true + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==" }, "globby": { "version": "5.0.0", @@ -4294,14 +4307,12 @@ "graceful-fs": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" }, "graceful-readlink": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", - "dev": true + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=" }, "grouped-queue": { "version": "0.3.3", @@ -4315,8 +4326,7 @@ "growl": { "version": "1.9.2", "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz", - "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=", - "dev": true + "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=" }, "handlebars": { "version": "4.0.11", @@ -4366,7 +4376,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, "requires": { "ansi-regex": "2.1.1" } @@ -4380,8 +4389,7 @@ "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" }, "has-symbol-support-x": { "version": "1.4.2", @@ -4401,14 +4409,12 @@ "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" }, "hash-base": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=", - "dev": true, "requires": { "inherits": "2.0.3" } @@ -4417,7 +4423,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", - "dev": true, "requires": { "inherits": "2.0.3", "minimalistic-assert": "1.0.0" @@ -4448,14 +4453,12 @@ "he": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", - "dev": true + "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=" }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "dev": true, "requires": { "hash.js": "1.1.3", "minimalistic-assert": "1.0.0", @@ -4472,7 +4475,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", - "dev": true, "requires": { "os-homedir": "1.0.2", "os-tmpdir": "1.0.2" @@ -4490,8 +4492,7 @@ "hosted-git-info": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", - "dev": true + "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" }, "http-cache-semantics": { "version": "3.8.1", @@ -4577,7 +4578,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, "requires": { "once": "1.4.0", "wrappy": "1.0.2" @@ -4586,14 +4586,12 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" }, "ini": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", - "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", - "dev": true + "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=" }, "inquirer": { "version": "3.3.0", @@ -4688,8 +4686,7 @@ "interpret": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", - "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=", - "dev": true + "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=" }, "into-stream": { "version": "3.1.0", @@ -4705,7 +4702,6 @@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", - "dev": true, "requires": { "loose-envify": "1.3.1" } @@ -4713,20 +4709,17 @@ "invert-kv": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", - "dev": true + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "is-binary-path": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, "requires": { "binary-extensions": "1.11.0" } @@ -4734,14 +4727,12 @@ "is-buffer": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", - "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=", - "dev": true + "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=" }, "is-builtin-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, "requires": { "builtin-modules": "1.1.1" } @@ -4761,14 +4752,12 @@ "is-dotfile": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", - "dev": true + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=" }, "is-equal-shallow": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", - "dev": true, "requires": { "is-primitive": "2.0.0" } @@ -4776,20 +4765,17 @@ "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" }, "is-extglob": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" }, "is-finite": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, "requires": { "number-is-nan": "1.0.1" } @@ -4798,7 +4784,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, "requires": { "number-is-nan": "1.0.1" } @@ -4813,7 +4798,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, "requires": { "is-extglob": "1.0.0" } @@ -4839,7 +4823,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", - "dev": true, "requires": { "kind-of": "3.2.2" } @@ -4900,14 +4883,12 @@ "is-posix-bracket": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", - "dev": true + "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=" }, "is-primitive": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", - "dev": true + "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=" }, "is-promise": { "version": "2.1.0", @@ -4975,8 +4956,7 @@ "is-utf8": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" }, "is-windows": { "version": "1.0.2", @@ -4987,8 +4967,7 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isexe": { "version": "2.0.0", @@ -5000,7 +4979,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, "requires": { "isarray": "1.0.0" } @@ -5121,8 +5099,7 @@ "js-sha3": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.3.1.tgz", - "integrity": "sha1-hhIoAhQvCChQKg0d7h2V4lO7AkM=", - "dev": true + "integrity": "sha1-hhIoAhQvCChQKg0d7h2V4lO7AkM=" }, "js-string-escape": { "version": "1.0.1", @@ -5133,8 +5110,7 @@ "js-tokens": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", - "dev": true + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" }, "js-yaml": { "version": "3.6.1", @@ -5211,8 +5187,7 @@ "json-schema-traverse": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", - "dev": true + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" }, "json-stable-stringify-without-jsonify": { "version": "1.0.1", @@ -5229,20 +5204,17 @@ "json3": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", - "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", - "dev": true + "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=" }, "json5": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", - "dev": true + "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" }, "jsonfile": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", - "dev": true, "requires": { "graceful-fs": "4.1.11" } @@ -5290,7 +5262,6 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/keccakjs/-/keccakjs-0.2.1.tgz", "integrity": "sha1-HWM6+QfvMFu/ny+mFtVsRFYd+k0=", - "dev": true, "requires": { "browserify-sha3": "0.0.1", "sha3": "1.2.0" @@ -5309,7 +5280,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { "is-buffer": "1.1.5" } @@ -5318,7 +5288,6 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", - "dev": true, "requires": { "graceful-fs": "4.1.11" } @@ -5334,7 +5303,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "dev": true, "requires": { "invert-kv": "1.0.0" } @@ -5616,7 +5584,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "dev": true, "requires": { "graceful-fs": "4.1.11", "parse-json": "2.2.0", @@ -5657,14 +5624,12 @@ "lodash": { "version": "4.17.4", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", - "dev": true + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" }, "lodash._baseassign": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", - "dev": true, "requires": { "lodash._basecopy": "3.0.1", "lodash.keys": "3.1.2" @@ -5673,32 +5638,27 @@ "lodash._basecopy": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", - "dev": true + "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=" }, "lodash._basecreate": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz", - "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=", - "dev": true + "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=" }, "lodash._getnative": { "version": "3.9.1", "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", - "dev": true + "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=" }, "lodash._isiterateecall": { "version": "3.0.9", "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", - "dev": true + "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=" }, "lodash.assign": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", - "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", - "dev": true + "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=" }, "lodash.cond": { "version": "4.5.2", @@ -5710,7 +5670,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz", "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=", - "dev": true, "requires": { "lodash._baseassign": "3.2.0", "lodash._basecreate": "3.0.3", @@ -5720,20 +5679,17 @@ "lodash.isarguments": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", - "dev": true + "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=" }, "lodash.isarray": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", - "dev": true + "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=" }, "lodash.keys": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", - "dev": true, "requires": { "lodash._getnative": "3.9.1", "lodash.isarguments": "3.1.0", @@ -5845,7 +5801,6 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", - "dev": true, "requires": { "js-tokens": "3.0.2" } @@ -6001,8 +5956,7 @@ "memorystream": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", - "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=", - "dev": true + "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=" }, "merkle-patricia-tree": { "version": "2.1.2", @@ -6039,7 +5993,6 @@ "version": "2.3.11", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "dev": true, "requires": { "arr-diff": "2.0.0", "array-unique": "0.2.1", @@ -6095,20 +6048,17 @@ "minimalistic-assert": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz", - "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=", - "dev": true + "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=" }, "minimalistic-crypto-utils": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", - "dev": true + "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=" }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, "requires": { "brace-expansion": "1.1.8" } @@ -6116,14 +6066,12 @@ "minimist": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" }, "mkdirp": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, "requires": { "minimist": "0.0.8" } @@ -6210,8 +6158,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "multimatch": { "version": "2.1.0", @@ -6234,8 +6181,7 @@ "nan": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz", - "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=", - "dev": true + "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=" }, "natural-compare": { "version": "1.4.0", @@ -6258,8 +6204,7 @@ "node-abi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.1.0.tgz", - "integrity": "sha512-AbW35CPRE4vdieOse46V+16dKispLNv3PQwgqlcfg7GQeQHcLu3gvp3fbU2gTh7d8NfGjp5CJh+j4Hpyb0XzaA==", - "dev": true + "integrity": "sha512-AbW35CPRE4vdieOse46V+16dKispLNv3PQwgqlcfg7GQeQHcLu3gvp3fbU2gTh7d8NfGjp5CJh+j4Hpyb0XzaA==" }, "node-dir": { "version": "0.1.8", @@ -6315,8 +6260,7 @@ "noop-logger": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz", - "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=", - "dev": true + "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=" }, "nopt": { "version": "3.0.6", @@ -6331,7 +6275,6 @@ "version": "2.4.0", "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==", - "dev": true, "requires": { "hosted-git-info": "2.5.0", "is-builtin-module": "1.0.0", @@ -6343,7 +6286,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, "requires": { "remove-trailing-separator": "1.0.2" } @@ -6359,6 +6301,14 @@ "sort-keys": "2.0.0" } }, + "npm-programmatic": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/npm-programmatic/-/npm-programmatic-0.0.10.tgz", + "integrity": "sha512-SklCZ26RRGi7hLIz/oaSnHy8ZT0gh8r6N3FMuKRye3ZcRo4HI/saldc8b7OqlY/Ov8FXnA1+I+Od+WtesWEp2Q==", + "requires": { + "bluebird": "3.5.1" + } + }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -6372,7 +6322,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", - "dev": true, "requires": { "are-we-there-yet": "1.1.4", "console-control-strings": "1.1.0", @@ -6383,8 +6332,7 @@ "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, "number-to-bn": { "version": "1.7.0", @@ -6411,8 +6359,7 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, "object-inspect": { "version": "1.3.0", @@ -6430,7 +6377,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", - "dev": true, "requires": { "for-own": "0.1.5", "is-extendable": "0.1.1" @@ -6440,7 +6386,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "requires": { "wrappy": "1.0.2" } @@ -6528,20 +6473,17 @@ "original-require": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/original-require/-/original-require-1.0.1.tgz", - "integrity": "sha1-DxMEcVhM0zURxew4yNWSE/msXiA=", - "dev": true + "integrity": "sha1-DxMEcVhM0zURxew4yNWSE/msXiA=" }, "os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", - "dev": true + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" }, "os-locale": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", - "dev": true, "requires": { "lcid": "1.0.0" } @@ -6549,8 +6491,17 @@ "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + }, + "output-file-sync": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz", + "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=", + "requires": { + "graceful-fs": "4.1.11", + "mkdirp": "0.5.1", + "object-assign": "4.1.1" + } }, "p-cancelable": { "version": "0.4.1", @@ -6625,7 +6576,6 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", - "dev": true, "requires": { "glob-base": "0.3.0", "is-dotfile": "1.0.3", @@ -6647,7 +6597,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, "requires": { "error-ex": "1.3.1" } @@ -6662,7 +6611,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, "requires": { "pinkie-promise": "2.0.1" } @@ -6670,8 +6618,7 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-is-inside": { "version": "1.0.2", @@ -6688,14 +6635,12 @@ "path-parse": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", - "dev": true + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=" }, "path-type": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, "requires": { "graceful-fs": "4.1.11", "pify": "2.3.0", @@ -6730,20 +6675,17 @@ "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" }, "pinkie": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" }, "pinkie-promise": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, "requires": { "pinkie": "2.0.4" } @@ -6767,7 +6709,6 @@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.2.2.tgz", "integrity": "sha512-F46pcvDxtQhbV3B+dm+exHuKxIyJK26fVNiJRmbTW/5D7o0Z2yzc8CKeu7UWbo9XxQZoVOC88aKgySAsza+cWw==", - "dev": true, "requires": { "expand-template": "1.0.3", "github-from-package": "0.0.0", @@ -6788,14 +6729,12 @@ "minimist": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, "requires": { "safe-buffer": "5.1.1" } @@ -6817,8 +6756,7 @@ "preserve": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", - "dev": true + "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=" }, "prettier": { "version": "1.11.1", @@ -6835,8 +6773,7 @@ "private": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz", - "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=", - "dev": true + "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=" }, "process": { "version": "0.5.2", @@ -6847,8 +6784,7 @@ "process-nextick-args": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" }, "progress": { "version": "2.0.0", @@ -6872,7 +6808,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz", "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=", - "dev": true, "requires": { "end-of-stream": "1.4.0", "once": "1.4.0" @@ -6905,7 +6840,6 @@ "version": "1.1.7", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", - "dev": true, "requires": { "is-number": "3.0.0", "kind-of": "4.0.0" @@ -6915,7 +6849,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, "requires": { "kind-of": "3.2.2" }, @@ -6924,7 +6857,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, "requires": { "is-buffer": "1.1.5" } @@ -6935,7 +6867,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, "requires": { "is-buffer": "1.1.5" } @@ -6955,7 +6886,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", - "dev": true, "requires": { "deep-extend": "0.4.2", "ini": "1.3.4", @@ -6966,8 +6896,7 @@ "minimist": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" } } }, @@ -6993,7 +6922,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, "requires": { "load-json-file": "1.1.0", "normalize-package-data": "2.4.0", @@ -7004,7 +6932,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, "requires": { "find-up": "1.1.2", "read-pkg": "1.1.0" @@ -7014,7 +6941,6 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", - "dev": true, "requires": { "core-util-is": "1.0.2", "inherits": "2.0.3", @@ -7029,7 +6955,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", - "dev": true, "requires": { "graceful-fs": "4.1.11", "minimatch": "3.0.4", @@ -7067,7 +6992,6 @@ "version": "0.6.2", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", - "dev": true, "requires": { "resolve": "1.4.0" } @@ -7081,8 +7005,7 @@ "regenerator-runtime": { "version": "0.10.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz", - "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=", - "dev": true + "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=" }, "regenerator-transform": { "version": "0.9.11", @@ -7099,7 +7022,6 @@ "version": "0.4.3", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=", - "dev": true, "requires": { "is-equal-shallow": "0.1.3", "is-primitive": "2.0.0" @@ -7134,26 +7056,22 @@ "remove-trailing-separator": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz", - "integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE=", - "dev": true + "integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE=" }, "repeat-element": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", - "dev": true + "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=" }, "repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" }, "repeating": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, "requires": { "is-finite": "1.0.2" } @@ -7213,20 +7131,17 @@ "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, "require-from-string": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", - "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=", - "dev": true + "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=" }, "require-main-filename": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" }, "require-uncached": { "version": "1.0.3", @@ -7250,7 +7165,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", - "dev": true, "requires": { "path-parse": "1.0.5" } @@ -7330,7 +7244,6 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", - "dev": true, "requires": { "glob": "7.1.2" } @@ -7339,7 +7252,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=", - "dev": true, "requires": { "hash-base": "2.0.2", "inherits": "2.0.3" @@ -7348,8 +7260,7 @@ "rlp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.0.0.tgz", - "integrity": "sha1-nbOE/0uJqPYVY9kjldhiWxjzr7A=", - "dev": true + "integrity": "sha1-nbOE/0uJqPYVY9kjldhiWxjzr7A=" }, "run-async": { "version": "2.3.0", @@ -7387,8 +7298,7 @@ "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" }, "scoped-regex": { "version": "1.0.0", @@ -7428,7 +7338,6 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.3.0.tgz", "integrity": "sha512-CbrQoeGG5V0kQ1ohEMGI+J7oKerapLTpivLICBaXR0R4HyQcN3kM9itLsV5fdpV1UR1bD14tOkJ1xughmlDIiQ==", - "dev": true, "requires": { "bindings": "1.3.0", "bip66": "1.1.5", @@ -7450,26 +7359,22 @@ "semver": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", - "dev": true + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, "set-immediate-shim": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "dev": true + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" }, "sha.js": { "version": "2.4.8", "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz", "integrity": "sha1-NwaMLEdra69ALRSknGf1l5IfY08=", - "dev": true, "requires": { "inherits": "2.0.3" } @@ -7478,7 +7383,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/sha3/-/sha3-1.2.0.tgz", "integrity": "sha1-aYnxtwpJhwWHajc+LGKs6WqpOZo=", - "dev": true, "requires": { "nan": "2.6.2" } @@ -7518,14 +7422,12 @@ "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "dev": true + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" }, "simple-get": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz", "integrity": "sha1-6XVe2kB+ltpAxeUVjJ6jezO+y+s=", - "dev": true, "requires": { "once": "1.4.0", "unzip-response": "1.0.2", @@ -7535,8 +7437,7 @@ "slash": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", - "dev": true + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" }, "slice-ansi": { "version": "1.0.0", @@ -7860,14 +7761,12 @@ "source-map": { "version": "0.5.6", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", - "dev": true + "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=" }, "source-map-support": { "version": "0.4.15", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz", "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=", - "dev": true, "requires": { "source-map": "0.5.6" } @@ -7876,7 +7775,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", - "dev": true, "requires": { "spdx-license-ids": "1.2.2" } @@ -7884,14 +7782,12 @@ "spdx-expression-parse": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", - "dev": true + "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=" }, "spdx-license-ids": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", - "dev": true + "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=" }, "sprintf-js": { "version": "1.0.3", @@ -7948,7 +7844,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, "requires": { "code-point-at": "1.1.0", "is-fullwidth-code-point": "1.0.0", @@ -7970,7 +7865,6 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, "requires": { "safe-buffer": "5.1.1" } @@ -7985,7 +7879,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, "requires": { "ansi-regex": "2.1.1" } @@ -7994,7 +7887,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, "requires": { "is-utf8": "0.2.1" } @@ -8026,14 +7918,12 @@ "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", - "dev": true + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" }, "symbol-observable": { "version": "1.0.1", @@ -8168,7 +8058,6 @@ "version": "1.15.3", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.3.tgz", "integrity": "sha1-7M+TXpQUk9gVECjmNuUc5MPKfyA=", - "dev": true, "requires": { "chownr": "1.0.1", "mkdirp": "0.5.1", @@ -8180,7 +8069,6 @@ "version": "1.5.4", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz", "integrity": "sha1-NlSc8E7RrumyowwBQyUiONr5QBY=", - "dev": true, "requires": { "bl": "1.2.1", "end-of-stream": "1.4.0", @@ -8252,8 +8140,7 @@ "to-fast-properties": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", - "dev": true + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=" }, "to-iso-string": { "version": "0.0.2", @@ -8279,8 +8166,7 @@ "trim-right": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", - "dev": true + "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=" }, "truffle": { "version": "4.1.5", @@ -8366,6 +8252,95 @@ } } }, + "truffle-blockchain-utils": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/truffle-blockchain-utils/-/truffle-blockchain-utils-0.0.4.tgz", + "integrity": "sha512-wgRrhwqh0aea08Hz28hUV4tuF2uTVQH/e9kBou+WK04cqrutB5cxQVQ6HGjeZLltxBYOFvhrGOOq4l3WJFnPEA==" + }, + "truffle-contract": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/truffle-contract/-/truffle-contract-3.0.5.tgz", + "integrity": "sha512-lRayhvX73OrLJ6TDvc0iYbzcB+Y1F9FCj9N1FXQ2EKOkqyIjmgZNMZFHGjvfTws1gsmonYd6sND0ahipiUYy8g==", + "requires": { + "ethjs-abi": "0.1.8", + "truffle-blockchain-utils": "0.0.4", + "truffle-contract-schema": "2.0.0", + "truffle-error": "0.0.2", + "web3": "0.20.6" + }, + "dependencies": { + "bignumber.js": { + "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934" + }, + "bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" + }, + "ethjs-abi": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.1.8.tgz", + "integrity": "sha1-zSiFg+1ijN+tr4re+juh28vKbBg=", + "requires": { + "bn.js": "4.11.6", + "js-sha3": "0.5.5", + "number-to-bn": "1.7.0" + } + }, + "js-sha3": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz", + "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=" + }, + "web3": { + "version": "0.20.6", + "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.6.tgz", + "integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=", + "requires": { + "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "crypto-js": "3.1.8", + "utf8": "2.1.2", + "xhr2": "0.1.4", + "xmlhttprequest": "1.8.0" + } + } + } + }, + "truffle-contract-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/truffle-contract-schema/-/truffle-contract-schema-2.0.0.tgz", + "integrity": "sha512-nLlspmu1GKDaluWksBwitHi/7Z3IpRjmBYeO9N+T1nVJD2V4IWJaptCKP1NqnPiJA+FChB7+F7pI6Br51/FtXQ==", + "requires": { + "ajv": "5.5.2", + "crypto-js": "3.1.9-1", + "debug": "3.1.0" + }, + "dependencies": { + "crypto-js": { + "version": "3.1.9-1", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz", + "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=" + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + } + } + }, + "truffle-error": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/truffle-error/-/truffle-error-0.0.2.tgz", + "integrity": "sha1-AbGJt4UFVmrhaJwjnHyi3RIc/kw=" + }, + "truffle-expect": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/truffle-expect/-/truffle-expect-0.0.3.tgz", + "integrity": "sha1-m3XO80O9WW5+XbyHj18bLjGKlEw=" + }, "truffle-hdwallet-provider": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/truffle-hdwallet-provider/-/truffle-hdwallet-provider-0.0.3.tgz", @@ -8462,6 +8437,32 @@ } } }, + "truffle-provisioner": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/truffle-provisioner/-/truffle-provisioner-0.1.0.tgz", + "integrity": "sha1-Ap5SScEBUwBzhTXgT97ZMaU8T2I=" + }, + "truffle-resolver": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/truffle-resolver/-/truffle-resolver-4.0.3.tgz", + "integrity": "sha512-CXzfXcG6LxQm5cWXH/HJE85pnvHvPDB16l2pzk9/q1F9Y4BWD2xS4rYzvrXGjkPNGrYTkNY+baF5YN/6eIGGgQ==", + "requires": { + "async": "2.6.0", + "truffle-contract": "3.0.5", + "truffle-expect": "0.0.3", + "truffle-provisioner": "0.1.0" + }, + "dependencies": { + "async": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", + "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "requires": { + "lodash": "4.17.4" + } + } + } + }, "tryit": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz", @@ -8590,8 +8591,7 @@ "unzip-response": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz", - "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=", - "dev": true + "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=" }, "url-parse-lax": { "version": "3.0.0", @@ -8608,17 +8608,20 @@ "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=", "dev": true }, + "user-home": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", + "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=" + }, "utf8": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", - "integrity": "sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY=", - "dev": true + "integrity": "sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY=" }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "uuid": { "version": "3.1.0", @@ -8632,11 +8635,18 @@ "integrity": "sha512-ejdrifsIydN1XDH7EuR2hn8ZrkRKUYF7tUcBjBy/lhrCvs2K+zRlbW9UHc0IQ9RsYFZJFqJrieoIHfkCa0DBRA==", "dev": true }, + "v8flags": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", + "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", + "requires": { + "user-home": "1.1.1" + } + }, "validate-npm-package-license": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", - "dev": true, "requires": { "spdx-correct": "1.0.2", "spdx-expression-parse": "1.0.4" @@ -9039,14 +9049,12 @@ "which-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", - "dev": true + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" }, "wide-align": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", - "dev": true, "requires": { "string-width": "1.0.2" } @@ -9054,8 +9062,7 @@ "window-size": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz", - "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=", - "dev": true + "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" }, "wordwrap": { "version": "1.0.0", @@ -9067,7 +9074,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "dev": true, "requires": { "string-width": "1.0.2", "strip-ansi": "3.0.1" @@ -9076,8 +9082,7 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "write": { "version": "0.2.1", @@ -9114,26 +9119,22 @@ "xhr2": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.1.4.tgz", - "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8=", - "dev": true + "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8=" }, "xmlhttprequest": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", - "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=", - "dev": true + "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=" }, "xtend": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "dev": true + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" }, "y18n": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" }, "yallist": { "version": "2.1.2", @@ -9145,7 +9146,6 @@ "version": "4.8.1", "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", - "dev": true, "requires": { "cliui": "3.2.0", "decamelize": "1.2.0", @@ -9167,7 +9167,6 @@ "version": "2.4.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz", "integrity": "sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=", - "dev": true, "requires": { "camelcase": "3.0.0", "lodash.assign": "4.2.0" @@ -9455,8 +9454,188 @@ "ethjs-abi": "0.2.1" } }, - "zos-upgradeability": { - "version": "git://github.com/zeppelinos/upgradeability-lib.git#68cd61fb48d0e4eec7142241448efa40c395bf33", + "zos": { + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/zos/-/zos-0.3.7.tgz", + "integrity": "sha512-V17wDh5fsOZ33+qkeE/x7K+/hYnCvzZW57RhrrbeVilmUwXgK26NF+E1hAzcqSzLN57ecsSH+aASjtzOZQsZxg==", + "requires": { + "babel-cli": "6.26.0", + "babel-polyfill": "6.26.0", + "colors": "1.2.1", + "commander": "2.15.1", + "ethereumjs-abi": "0.6.5", + "lodash": "4.17.5", + "npm-programmatic": "0.0.10", + "shelljs": "0.8.1", + "truffle": "4.1.7", + "truffle-contract": "3.0.5", + "truffle-provisioner": "0.1.0", + "truffle-resolver": "4.0.3", + "zos-kernel": "0.1.1", + "zos-lib": "0.0.3" + }, + "dependencies": { + "babel-polyfill": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz", + "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=", + "requires": { + "babel-runtime": "6.26.0", + "core-js": "2.5.0", + "regenerator-runtime": "0.10.5" + } + }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "requires": { + "core-js": "2.5.0", + "regenerator-runtime": "0.11.1" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" + } + } + }, + "colors": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz", + "integrity": "sha512-s8+wktIuDSLffCywiwSxQOMqtPxML11a/dtHE17tMn4B1MSWw/C22EKf7M2KGUBcDaVFEGT+S8N02geDXeuNKg==" + }, + "commander": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" + }, + "diff": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz", + "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=" + }, + "lodash": { + "version": "4.17.5", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", + "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" + }, + "mocha": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz", + "integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==", + "requires": { + "browser-stdout": "1.3.0", + "commander": "2.9.0", + "debug": "2.6.8", + "diff": "3.2.0", + "escape-string-regexp": "1.0.5", + "glob": "7.1.1", + "growl": "1.9.2", + "he": "1.1.1", + "json3": "3.3.2", + "lodash.create": "3.1.1", + "mkdirp": "0.5.1", + "supports-color": "3.1.2" + }, + "dependencies": { + "commander": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", + "requires": { + "graceful-readlink": "1.0.1" + } + }, + "glob": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", + "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=", + "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" + } + } + } + }, + "shelljs": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz", + "integrity": "sha512-YA/iYtZpzFe5HyWVGrb02FjPxc4EMCfpoU/Phg9fQoyMC72u9598OUBrsU8IrtwAKG0tO8IYaqbaLIw+k3IRGA==", + "requires": { + "glob": "7.1.2", + "interpret": "1.0.3", + "rechoir": "0.6.2" + } + }, + "solc": { + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.23.tgz", + "integrity": "sha512-AT7anLHY6uIRg2It6N0UlCHeZ7YeecIkUhnlirrCgCPCUevtnoN48BxvgigN/4jJTRljv5oFhAJtI6gvHzT5DQ==", + "requires": { + "fs-extra": "0.30.0", + "memorystream": "0.3.1", + "require-from-string": "1.2.1", + "semver": "5.4.1", + "yargs": "4.8.1" + } + }, + "supports-color": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", + "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", + "requires": { + "has-flag": "1.0.0" + } + }, + "truffle": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/truffle/-/truffle-4.1.7.tgz", + "integrity": "sha512-fe6BIcD9xo6iIJvV1m6ZhOk56kmB8k38kdoWOKYnPPw7ZUUSupgojeTb2K5e+4qIpIHvEvmET4yLUjSGR+hvwA==", + "requires": { + "mocha": "3.5.3", + "original-require": "1.0.1", + "solc": "0.4.23" + } + }, + "zos-lib": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-0.0.3.tgz", + "integrity": "sha512-OHMCw0JW1dvnKx4CNJqhaBbrBeldDJBNV74Z22irIi2Yh4kPBMc7ZVt7VSdEHD1wUL5Ez7RXPUwk9drL9QvKjQ==", + "requires": { + "zeppelin-solidity": "1.8.0" + } + } + } + }, + "zos-kernel": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/zos-kernel/-/zos-kernel-0.1.1.tgz", + "integrity": "sha512-xXoVLe08CWc9mofY4ckVBpFB5jr15/kgm2sz8VG+fFvFl4H0inC1AufGEdSwYWC4Hu9EOfc592LAg3tYjke+sQ==", + "requires": { + "zeppelin-solidity": "1.8.0", + "zos-lib": "0.0.2" + }, + "dependencies": { + "zos-lib": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-0.0.2.tgz", + "integrity": "sha512-wVPK3+lwguz4Bm4rWRcvQMPMa933BbtNMGqgoVNWIi6r2ZLZVYC93y1bxk19pWzBEdpcZyWDZ4yZwij2AsC9tw==", + "requires": { + "zeppelin-solidity": "1.8.0" + } + } + } + }, + "zos-lib": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-0.0.5.tgz", + "integrity": "sha512-UVINaUZ9WuGGlljKaTXaxzaLGW9F/5AViSsOYy/oagFyQIY6Ch9WQ1fnUx3L8O4p1XGne9rG2JXY4B9f6YPHsA==", "requires": { "zeppelin-solidity": "1.8.0" } diff --git a/package.json b/package.json index 16eead5ca..c3334b887 100644 --- a/package.json +++ b/package.json @@ -63,6 +63,7 @@ }, "dependencies": { "dotenv": "^4.0.0", - "zos-upgradeability": "git://github.com/zeppelinos/upgradeability-lib.git" + "zos": "^0.3.7", + "zos-lib": "0.0.5" } } diff --git a/truffle-config.js b/truffle-config.js index a5ca2558e..65e4bdd08 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -24,8 +24,11 @@ module.exports = { network_id: '*', // eslint-disable-line camelcase }, ropsten: { - provider: ropstenProvider, - network_id: 3, // eslint-disable-line camelcase + host: 'localhost', + network_id: '3', + port: 8555, + gas: 4700000, + gasPrice: 10e9, }, coverage: { host: 'localhost', From 18e16a5db035323ca3239c5e0728ae00ad55a86f Mon Sep 17 00:00:00 2001 From: Alejo Salles Date: Fri, 20 Apr 2018 20:38:23 -0300 Subject: [PATCH 16/54] added package.zos --- package.zos.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 package.zos.json diff --git a/package.zos.json b/package.zos.json new file mode 100644 index 000000000..c190c4e42 --- /dev/null +++ b/package.zos.json @@ -0,0 +1,10 @@ +{ + "contracts": { + "DetailedMintableToken": "DetailedMintableToken", + "DetailedPremintedToken": "DetailedPremintedToken", + "MintableERC721Token": "MintableERC721Token", + "TokenTimelock": "TokenTimelock", + "TokenVesting": "TokenVesting" + }, + "name": "openzeppelin-zos" +} From ff69c5449738968a9df35eb2971abcf9935ff012 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 20 Apr 2018 22:47:38 -0300 Subject: [PATCH 17/54] move zos (cli) to devDependency --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index c3334b887..c1a6f6f59 100644 --- a/package.json +++ b/package.json @@ -59,11 +59,11 @@ "solidity-coverage": "^0.4.15", "solium": "^1.1.6", "truffle": "^4.1.5", - "truffle-hdwallet-provider": "0.0.3" + "truffle-hdwallet-provider": "0.0.3", + "zos": "^0.3.7" }, "dependencies": { "dotenv": "^4.0.0", - "zos": "^0.3.7", "zos-lib": "0.0.5" } } From 8bce0a4f2e434388abfd0915e74f8159d483e4cc Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Thu, 17 May 2018 19:30:07 -0300 Subject: [PATCH 18/54] update sha3 1.2.0 -> 1.2.2 for node 10 compatibility --- package-lock.json | 2060 +++++++++++++++++---------------------------- 1 file changed, 774 insertions(+), 1286 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5f99b3728..6c16b07ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -52,6 +52,7 @@ "version": "5.5.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "dev": true, "requires": { "co": "4.6.0", "fast-deep-equal": "1.0.0", @@ -91,12 +92,14 @@ "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true }, "ansi-styles": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true }, "any-observable": { "version": "0.2.0", @@ -108,6 +111,7 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "dev": true, "requires": { "micromatch": "2.3.11", "normalize-path": "2.1.1" @@ -116,12 +120,14 @@ "aproba": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz", - "integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw==" + "integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw==", + "dev": true }, "are-we-there-yet": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", + "dev": true, "requires": { "delegates": "1.0.0", "readable-stream": "2.3.3" @@ -140,6 +146,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "dev": true, "requires": { "arr-flatten": "1.1.0" } @@ -147,7 +154,8 @@ "arr-flatten": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "dev": true }, "array-differ": { "version": "1.0.0", @@ -173,7 +181,8 @@ "array-unique": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=" + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "dev": true }, "arrify": { "version": "1.0.1", @@ -214,7 +223,8 @@ "async-each": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=" + "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", + "dev": true }, "async-eventemitter": { "version": "0.2.3", @@ -254,186 +264,11 @@ "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", "dev": true }, - "babel-cli": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz", - "integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=", - "requires": { - "babel-core": "6.26.0", - "babel-polyfill": "6.26.0", - "babel-register": "6.26.0", - "babel-runtime": "6.26.0", - "chokidar": "1.7.0", - "commander": "2.11.0", - "convert-source-map": "1.5.0", - "fs-readdir-recursive": "1.1.0", - "glob": "7.1.2", - "lodash": "4.17.4", - "output-file-sync": "1.1.2", - "path-is-absolute": "1.0.1", - "slash": "1.0.0", - "source-map": "0.5.6", - "v8flags": "2.1.1" - }, - "dependencies": { - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" - } - }, - "babel-core": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz", - "integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=", - "requires": { - "babel-code-frame": "6.26.0", - "babel-generator": "6.26.1", - "babel-helpers": "6.24.1", - "babel-messages": "6.23.0", - "babel-register": "6.26.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "convert-source-map": "1.5.0", - "debug": "2.6.8", - "json5": "0.5.1", - "lodash": "4.17.4", - "minimatch": "3.0.4", - "path-is-absolute": "1.0.1", - "private": "0.1.7", - "slash": "1.0.0", - "source-map": "0.5.6" - } - }, - "babel-generator": { - "version": "6.26.1", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", - "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", - "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.4", - "source-map": "0.5.7", - "trim-right": "1.0.1" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - } - } - }, - "babel-polyfill": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz", - "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=", - "requires": { - "babel-runtime": "6.26.0", - "core-js": "2.5.0", - "regenerator-runtime": "0.10.5" - }, - "dependencies": { - "regenerator-runtime": { - "version": "0.10.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz", - "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=" - } - } - }, - "babel-register": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", - "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", - "requires": { - "babel-core": "6.26.0", - "babel-runtime": "6.26.0", - "core-js": "2.5.0", - "home-or-tmp": "2.0.0", - "lodash": "4.17.4", - "mkdirp": "0.5.1", - "source-map-support": "0.4.15" - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "requires": { - "core-js": "2.5.0", - "regenerator-runtime": "0.11.1" - } - }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.4" - } - }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.8", - "globals": "9.18.0", - "invariant": "2.2.2", - "lodash": "4.17.4" - } - }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==" - }, - "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=" - }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" - } - } - }, "babel-code-frame": { "version": "6.22.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=", + "dev": true, "requires": { "chalk": "1.1.3", "esutils": "2.0.2", @@ -645,6 +480,7 @@ "version": "6.24.1", "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", + "dev": true, "requires": { "babel-runtime": "6.25.0", "babel-template": "6.25.0" @@ -654,6 +490,7 @@ "version": "6.23.0", "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", + "dev": true, "requires": { "babel-runtime": "6.25.0" } @@ -1183,6 +1020,7 @@ "version": "6.25.0", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz", "integrity": "sha1-M7mOql1IK7AajRqmtDetKwGuxBw=", + "dev": true, "requires": { "core-js": "2.5.0", "regenerator-runtime": "0.10.5" @@ -1192,6 +1030,7 @@ "version": "6.25.0", "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz", "integrity": "sha1-ZlJBFmt8KqTGGdceGSlpVSsQwHE=", + "dev": true, "requires": { "babel-runtime": "6.25.0", "babel-traverse": "6.25.0", @@ -1204,6 +1043,7 @@ "version": "6.25.0", "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz", "integrity": "sha1-IldJfi/NGbie3BPEyROB+VEklvE=", + "dev": true, "requires": { "babel-code-frame": "6.22.0", "babel-messages": "6.23.0", @@ -1220,6 +1060,7 @@ "version": "6.25.0", "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz", "integrity": "sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4=", + "dev": true, "requires": { "babel-runtime": "6.25.0", "esutils": "2.0.2", @@ -1240,12 +1081,14 @@ "babylon": { "version": "6.17.4", "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz", - "integrity": "sha512-kChlV+0SXkjE0vUn9OZ7pBMWRFd8uq3mZe8x1K6jhuNcAFAtEnjchFAqB+dYEXKyd+JpT6eppRR78QAr5gTsUw==" + "integrity": "sha512-kChlV+0SXkjE0vUn9OZ7pBMWRFd8uq3mZe8x1K6jhuNcAFAtEnjchFAqB+dYEXKyd+JpT6eppRR78QAr5gTsUw==", + "dev": true }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true }, "base-x": { "version": "1.1.0", @@ -1276,7 +1119,8 @@ "binary-extensions": { "version": "1.11.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", - "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=" + "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", + "dev": true }, "binaryextensions": { "version": "2.1.1", @@ -1287,7 +1131,8 @@ "bindings": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz", - "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==" + "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==", + "dev": true }, "bip39": { "version": "2.2.0", @@ -1305,6 +1150,7 @@ "version": "1.1.5", "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz", "integrity": "sha1-AfqHSHhcpwlV1QESF9GzE5lpyiI=", + "dev": true, "requires": { "safe-buffer": "5.1.1" } @@ -1313,19 +1159,16 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz", "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=", + "dev": true, "requires": { "readable-stream": "2.3.3" } }, - "bluebird": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==" - }, "bn.js": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==" + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true }, "boom": { "version": "2.10.1", @@ -1340,6 +1183,7 @@ "version": "1.1.8", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dev": true, "requires": { "balanced-match": "1.0.0", "concat-map": "0.0.1" @@ -1349,6 +1193,7 @@ "version": "1.8.5", "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "dev": true, "requires": { "expand-range": "1.8.2", "preserve": "0.2.0", @@ -1358,17 +1203,20 @@ "brorand": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=" + "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", + "dev": true }, "browser-stdout": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz", - "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=" + "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=", + "dev": true }, "browserify-aes": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz", "integrity": "sha1-Xncl297x/Vkw1OurSFZ85FHEigo=", + "dev": true, "requires": { "buffer-xor": "1.0.3", "cipher-base": "1.0.4", @@ -1381,6 +1229,7 @@ "version": "0.0.1", "resolved": "https://registry.npmjs.org/browserify-sha3/-/browserify-sha3-0.0.1.tgz", "integrity": "sha1-P/NKMAbvFcD7NWflQbkaI0ASPRE=", + "dev": true, "requires": { "js-sha3": "0.3.1" } @@ -1404,15 +1253,23 @@ "create-hash": "1.1.3" } }, + "buffer-from": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz", + "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==", + "dev": true + }, "buffer-xor": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=" + "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", + "dev": true }, "builtin-modules": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true }, "cacheable-request": { "version": "2.1.4", @@ -1455,7 +1312,8 @@ "camelcase": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", + "dev": true }, "caseless": { "version": "0.11.0", @@ -1507,6 +1365,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, "requires": { "ansi-styles": "2.2.1", "escape-string-regexp": "1.0.5", @@ -1540,10 +1399,11 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", + "dev": true, "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", @@ -1555,12 +1415,14 @@ "chownr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", - "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=" + "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", + "dev": true }, "cipher-base": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "dev": true, "requires": { "inherits": "2.0.3", "safe-buffer": "5.1.1" @@ -1632,6 +1494,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "dev": true, "requires": { "string-width": "1.0.2", "strip-ansi": "3.0.1", @@ -1711,12 +1574,14 @@ "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "dev": true }, "code-point-at": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", + "dev": true }, "coinstring": { "version": "2.3.0", @@ -1769,7 +1634,8 @@ "commander": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", - "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", + "dev": true }, "commondir": { "version": "1.0.1", @@ -1780,7 +1646,8 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true }, "concat-stream": { "version": "1.6.0", @@ -1796,7 +1663,8 @@ "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", - "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", + "dev": true }, "contains-path": { "version": "0.1.0", @@ -1807,17 +1675,20 @@ "convert-source-map": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz", - "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=" + "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=", + "dev": true }, "core-js": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.0.tgz", - "integrity": "sha1-VpwFCRi+ZIazg3VSAorgRmtxcIY=" + "integrity": "sha1-VpwFCRi+ZIazg3VSAorgRmtxcIY=", + "dev": true }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true }, "coveralls": { "version": "2.13.1", @@ -1844,6 +1715,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=", + "dev": true, "requires": { "cipher-base": "1.0.4", "inherits": "2.0.3", @@ -1855,6 +1727,7 @@ "version": "1.1.6", "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz", "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=", + "dev": true, "requires": { "cipher-base": "1.0.4", "create-hash": "1.1.3", @@ -1899,7 +1772,8 @@ "crypto-js": { "version": "3.1.8", "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.8.tgz", - "integrity": "sha1-cV8HC/YBTyrpkqmLOSkli3E/CNU=" + "integrity": "sha1-cV8HC/YBTyrpkqmLOSkli3E/CNU=", + "dev": true }, "dargs": { "version": "5.1.0", @@ -1946,6 +1820,7 @@ "version": "2.6.8", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "dev": true, "requires": { "ms": "2.0.0" } @@ -1953,7 +1828,8 @@ "decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "dev": true }, "decode-uri-component": { "version": "0.2.0", @@ -1996,7 +1872,8 @@ "deep-extend": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", - "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=" + "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=", + "dev": true }, "deep-is": { "version": "0.1.3", @@ -2061,7 +1938,8 @@ "delegates": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", + "dev": true }, "detect-conflict": { "version": "1.0.1", @@ -2073,6 +1951,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", + "dev": true, "requires": { "repeating": "2.0.1" } @@ -2108,6 +1987,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz", "integrity": "sha1-Pja2xCs3BDgjzbwzLVjzHiRFSAs=", + "dev": true, "requires": { "browserify-aes": "1.0.6", "create-hash": "1.1.3", @@ -2152,6 +2032,7 @@ "version": "6.4.0", "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", + "dev": true, "requires": { "bn.js": "4.11.8", "brorand": "1.1.0", @@ -2181,6 +2062,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz", "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=", + "dev": true, "requires": { "once": "1.4.0" } @@ -2222,6 +2104,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "dev": true, "requires": { "is-arrayish": "0.2.1" } @@ -2253,7 +2136,8 @@ "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true }, "escodegen": { "version": "1.8.1", @@ -2657,7 +2541,8 @@ "esutils": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true }, "ethereum-common": { "version": "0.0.16", @@ -2665,29 +2550,6 @@ "integrity": "sha1-mh4Wnq00q3XgifUMpRK/0PvRJlU=", "dev": true }, - "ethereumjs-abi": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.5.tgz", - "integrity": "sha1-WmN+8Wq0NHP6cqKa2QhxQFs/UkE=", - "requires": { - "bn.js": "4.11.8", - "ethereumjs-util": "4.5.0" - }, - "dependencies": { - "ethereumjs-util": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz", - "integrity": "sha1-PpQosxfuvaPXJg2FT93alUsfG8Y=", - "requires": { - "bn.js": "4.11.8", - "create-hash": "1.1.3", - "keccakjs": "0.2.1", - "rlp": "2.0.0", - "secp256k1": "3.3.0" - } - } - } - }, "ethereumjs-account": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/ethereumjs-account/-/ethereumjs-account-2.0.4.tgz", @@ -2747,7 +2609,7 @@ "integrity": "sha512-dBTav4AZQ7zuajmICv1k7bEesqS+8f0u0wciXNUJZb842RTBi0lgKEDF8WgZshzv4ThI+XVQSRNV/A+seiK4aA==", "dev": true, "requires": { - "source-map-support": "0.5.4", + "source-map-support": "0.5.5", "webpack-cli": "2.0.14" }, "dependencies": { @@ -2758,11 +2620,12 @@ "dev": true }, "source-map-support": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.4.tgz", - "integrity": "sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg==", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.5.tgz", + "integrity": "sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA==", "dev": true, "requires": { + "buffer-from": "1.0.0", "source-map": "0.6.1" } } @@ -2815,51 +2678,6 @@ "secp256k1": "3.3.0" } }, - "ethereumjs-vm": { - "version": "git+https://github.com/sc-forks/ethereumjs-vm-sc.git#328771cace30ed16ad5c1d13a69cda13d31173f9", - "dev": true, - "requires": { - "async": "2.5.0", - "async-eventemitter": "0.2.3", - "ethereum-common": "0.0.18", - "ethereumjs-account": "2.0.4", - "ethereumjs-block": "1.2.2", - "ethereumjs-util": "4.5.0", - "fake-merkle-patricia-tree": "1.0.1", - "functional-red-black-tree": "1.0.1", - "merkle-patricia-tree": "2.1.2" - }, - "dependencies": { - "async": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", - "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", - "dev": true, - "requires": { - "lodash": "4.17.4" - } - }, - "ethereum-common": { - "version": "0.0.18", - "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.0.18.tgz", - "integrity": "sha1-L9w1dvIykDNYl26znaeDIT/5Uj8=", - "dev": true - }, - "ethereumjs-util": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz", - "integrity": "sha1-PpQosxfuvaPXJg2FT93alUsfG8Y=", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "create-hash": "1.1.3", - "keccakjs": "0.2.1", - "rlp": "2.0.0", - "secp256k1": "3.3.0" - } - } - } - }, "ethereumjs-wallet": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/ethereumjs-wallet/-/ethereumjs-wallet-0.6.0.tgz", @@ -2900,6 +2718,7 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.2.1.tgz", "integrity": "sha1-4KepOn6BFjqUR3utVu3lJKtt5TM=", + "dev": true, "requires": { "bn.js": "4.11.6", "js-sha3": "0.5.5", @@ -2909,12 +2728,14 @@ "bn.js": { "version": "4.11.6", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", + "dev": true }, "js-sha3": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz", - "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=" + "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=", + "dev": true } } }, @@ -2932,6 +2753,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz", "integrity": "sha1-SXtmrZ/vZc18CKYYCCS6FHa2blM=", + "dev": true, "requires": { "create-hash": "1.1.3" } @@ -2961,6 +2783,7 @@ "version": "0.1.5", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "dev": true, "requires": { "is-posix-bracket": "0.1.1" } @@ -2969,6 +2792,7 @@ "version": "1.8.2", "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "dev": true, "requires": { "fill-range": "2.2.3" } @@ -2976,7 +2800,8 @@ "expand-template": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-1.0.3.tgz", - "integrity": "sha1-bDAzIxd6YrGyLAcCefeGEoe2mxo=" + "integrity": "sha1-bDAzIxd6YrGyLAcCefeGEoe2mxo=", + "dev": true }, "expand-tilde": { "version": "2.0.2", @@ -3008,6 +2833,7 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "dev": true, "requires": { "is-extglob": "1.0.0" } @@ -3030,12 +2856,14 @@ "fast-deep-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", - "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=" + "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=", + "dev": true }, "fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", + "dev": true }, "fast-levenshtein": { "version": "2.0.6", @@ -3065,12 +2893,14 @@ "filename-regex": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=" + "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", + "dev": true }, "fill-range": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", + "dev": true, "requires": { "is-number": "2.1.0", "isobject": "2.1.0", @@ -3083,6 +2913,7 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "dev": true, "requires": { "path-exists": "2.1.0", "pinkie-promise": "2.0.1" @@ -3127,12 +2958,14 @@ "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", + "dev": true }, "for-own": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "dev": true, "requires": { "for-in": "1.0.2" } @@ -3174,6 +3007,7 @@ "version": "0.30.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", + "dev": true, "requires": { "graceful-fs": "4.1.11", "jsonfile": "2.4.0", @@ -3182,179 +3016,95 @@ "rimraf": "2.6.1" } }, - "fs-readdir-recursive": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz", - "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==" - }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "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, - "optional": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - }, "ansi-regex": { "version": "2.1.1", - "bundled": true + "bundled": true, + "dev": true }, "aproba": { - "version": "1.1.1", + "version": "1.2.0", "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" + "readable-stream": "2.3.6" } }, - "asn1": { - "version": "0.2.3", - "bundled": true, - "optional": true - }, - "assert-plus": { - "version": "0.2.0", - "bundled": true, - "optional": true - }, - "asynckit": { - "version": "0.4.0", - "bundled": true, - "optional": true - }, - "aws-sign2": { - "version": "0.6.0", - "bundled": true, - "optional": true - }, - "aws4": { - "version": "1.6.0", - "bundled": true, - "optional": true - }, "balanced-match": { - "version": "0.4.2", - "bundled": true - }, - "bcrypt-pbkdf": { - "version": "1.0.1", + "version": "1.0.0", "bundled": true, - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "block-stream": { - "version": "0.0.9", - "bundled": true, - "requires": { - "inherits": "2.0.3" - } - }, - "boom": { - "version": "2.10.1", - "bundled": true, - "requires": { - "hoek": "2.16.3" - } + "dev": true }, "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 - }, - "caseless": { - "version": "0.12.0", - "bundled": true, - "optional": true - }, - "co": { - "version": "4.6.0", + "chownr": { + "version": "1.0.1", "bundled": true, + "dev": true, "optional": true }, "code-point-at": { "version": "1.1.0", - "bundled": true - }, - "combined-stream": { - "version": "1.0.5", "bundled": true, - "requires": { - "delayed-stream": "1.0.0" - } + "dev": true }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "dev": true }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "dev": true }, "core-util-is": { "version": "1.0.2", - "bundled": true - }, - "cryptiles": { - "version": "2.0.5", "bundled": true, - "requires": { - "boom": "2.10.1" - } - }, - "dashdash": { - "version": "1.14.1", - "bundled": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "optional": true - } - } + "dev": true, + "optional": true }, "debug": { - "version": "2.6.8", + "version": "2.6.9", "bundled": true, + "dev": true, "optional": true, "requires": { "ms": "2.0.0" @@ -3363,84 +3113,43 @@ "deep-extend": { "version": "0.4.2", "bundled": true, + "dev": true, "optional": true }, - "delayed-stream": { - "version": "1.0.0", - "bundled": true - }, "delegates": { "version": "1.0.0", "bundled": true, + "dev": true, "optional": true }, "detect-libc": { - "version": "1.0.2", + "version": "1.0.3", "bundled": true, + "dev": true, "optional": true }, - "ecc-jsbn": { - "version": "0.1.1", + "fs-minipass": { + "version": "1.2.5", "bundled": true, + "dev": true, "optional": true, "requires": { - "jsbn": "0.1.1" - } - }, - "extend": { - "version": "3.0.1", - "bundled": true, - "optional": true - }, - "extsprintf": { - "version": "1.0.2", - "bundled": true - }, - "forever-agent": { - "version": "0.6.1", - "bundled": true, - "optional": true - }, - "form-data": { - "version": "2.1.4", - "bundled": 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 - }, - "fstream": { - "version": "1.0.11", "bundled": 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, - "optional": true, - "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" - } + "dev": true, + "optional": true }, "gauge": { "version": "2.7.4", "bundled": true, + "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", @@ -3450,24 +3159,11 @@ "wide-align": "1.1.2" } }, - "getpass": { - "version": "0.1.7", - "bundled": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "optional": true - } - } - }, "glob": { "version": "7.1.2", "bundled": true, + "dev": true, + "optional": true, "requires": { "fs.realpath": "1.0.0", "inflight": "1.0.6", @@ -3477,56 +3173,35 @@ "path-is-absolute": "1.0.1" } }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true - }, - "har-schema": { - "version": "1.0.5", - "bundled": true, - "optional": true - }, - "har-validator": { - "version": "4.2.1", - "bundled": 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, - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "hoek": { - "version": "2.16.3", - "bundled": true - }, - "http-signature": { - "version": "1.1.1", + "iconv-lite": { + "version": "0.4.21", "bundled": true, + "dev": true, "optional": true, "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.0", - "sshpk": "1.13.0" + "safer-buffer": "2.1.2" + } + }, + "ignore-walk": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minimatch": "3.0.4" } }, "inflight": { "version": "1.0.6", "bundled": true, + "dev": true, + "optional": true, "requires": { "once": "1.4.0", "wrappy": "1.0.2" @@ -3534,113 +3209,64 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "dev": true }, "ini": { - "version": "1.3.4", + "version": "1.3.5", "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, - "optional": true - }, "isarray": { "version": "1.0.0", - "bundled": true - }, - "isstream": { - "version": "0.1.2", "bundled": true, + "dev": true, "optional": true }, - "jodid25519": { - "version": "1.0.2", - "bundled": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "jsbn": { - "version": "0.1.1", - "bundled": true, - "optional": true - }, - "json-schema": { - "version": "0.2.3", - "bundled": true, - "optional": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "bundled": true, - "optional": true, - "requires": { - "jsonify": "0.0.0" - } - }, - "json-stringify-safe": { - "version": "5.0.1", - "bundled": true, - "optional": true - }, - "jsonify": { - "version": "0.0.0", - "bundled": true, - "optional": true - }, - "jsprim": { - "version": "1.4.0", - "bundled": 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, - "optional": true - } - } - }, - "mime-db": { - "version": "1.27.0", - "bundled": true - }, - "mime-types": { - "version": "2.1.15", - "bundled": true, - "requires": { - "mime-db": "1.27.0" - } - }, "minimatch": { "version": "3.0.4", "bundled": true, + "dev": true, "requires": { - "brace-expansion": "1.1.7" + "brace-expansion": "1.1.11" } }, "minimist": { "version": "0.0.8", - "bundled": true + "bundled": true, + "dev": true + }, + "minipass": { + "version": "2.2.4", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "5.1.1", + "yallist": "3.0.2" + } + }, + "minizlib": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "2.2.4" + } }, "mkdirp": { "version": "0.5.1", "bundled": true, + "dev": true, "requires": { "minimist": "0.0.8" } @@ -3648,38 +3274,75 @@ "ms": { "version": "2.0.0", "bundled": true, + "dev": true, "optional": true }, - "node-pre-gyp": { - "version": "0.6.39", + "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": { - "detect-libc": "1.0.2", - "hawk": "3.1.3", + "debug": "2.6.9", + "iconv-lite": "0.4.21", + "sax": "1.2.4" + } + }, + "node-pre-gyp": { + "version": "0.9.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "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": { "version": "4.0.1", "bundled": true, + "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, "requires": { "are-we-there-yet": "1.1.4", @@ -3690,21 +3353,19 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true - }, - "oauth-sign": { - "version": "0.8.2", "bundled": true, - "optional": true + "dev": 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" } @@ -3712,16 +3373,19 @@ "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", + "version": "0.1.5", "bundled": true, + "dev": true, "optional": true, "requires": { "os-homedir": "1.0.2", @@ -3730,34 +3394,24 @@ }, "path-is-absolute": { "version": "1.0.1", - "bundled": true - }, - "performance-now": { - "version": "0.2.0", "bundled": true, + "dev": true, "optional": true }, "process-nextick-args": { - "version": "1.0.7", - "bundled": true - }, - "punycode": { - "version": "1.4.1", - "bundled": 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" }, @@ -3765,111 +3419,74 @@ "minimist": { "version": "1.2.0", "bundled": true, + "dev": true, "optional": true } } }, "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, - "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", - "bundled": true + "version": "5.1.1", + "bundled": true, + "dev": true + }, + "safer-buffer": { + "version": "2.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "sax": { + "version": "1.2.4", + "bundled": true, + "dev": true, + "optional": true }, "semver": { - "version": "5.3.0", + "version": "5.5.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, - "requires": { - "hoek": "2.16.3" - } - }, - "sshpk": { - "version": "1.13.0", - "bundled": 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, - "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", @@ -3877,20 +3494,18 @@ } }, "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, - "optional": true - }, "strip-ansi": { "version": "3.0.1", "bundled": true, + "dev": true, "requires": { "ansi-regex": "2.1.1" } @@ -3898,78 +3513,34 @@ "strip-json-comments": { "version": "2.0.1", "bundled": true, + "dev": true, "optional": true }, "tar": { - "version": "2.2.1", - "bundled": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, - "tar-pack": { - "version": "3.4.0", + "version": "4.4.1", "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" + "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" } }, - "tough-cookie": { - "version": "2.3.2", - "bundled": true, - "optional": true, - "requires": { - "punycode": "1.4.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", - "bundled": true, - "optional": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "bundled": true, - "optional": true - }, - "uid-number": { - "version": "0.0.6", - "bundled": true, - "optional": true - }, "util-deprecate": { "version": "1.0.2", - "bundled": true - }, - "uuid": { - "version": "3.0.1", "bundled": true, + "dev": true, "optional": true }, - "verror": { - "version": "1.3.6", - "bundled": 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" @@ -3977,7 +3548,13 @@ }, "wrappy": { "version": "1.0.2", - "bundled": true + "bundled": true, + "dev": true + }, + "yallist": { + "version": "3.0.2", + "bundled": true, + "dev": true } } }, @@ -4024,6 +3601,7 @@ "version": "2.7.4", "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "dev": true, "requires": { "aproba": "1.1.2", "console-control-strings": "1.1.0", @@ -4053,7 +3631,8 @@ "get-caller-file": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=" + "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", + "dev": true }, "get-func-name": { "version": "2.0.0", @@ -4151,7 +3730,8 @@ "github-from-package": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", - "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=" + "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=", + "dev": true }, "github-username": { "version": "4.1.0", @@ -4166,6 +3746,7 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, "requires": { "fs.realpath": "1.0.0", "inflight": "1.0.6", @@ -4206,6 +3787,7 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "dev": true, "requires": { "glob-parent": "2.0.0", "is-glob": "2.0.1" @@ -4215,6 +3797,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true, "requires": { "is-glob": "2.0.1" } @@ -4256,7 +3839,8 @@ "globals": { "version": "9.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==" + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", + "dev": true }, "globby": { "version": "5.0.0", @@ -4308,12 +3892,14 @@ "graceful-fs": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "dev": true }, "graceful-readlink": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=" + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", + "dev": true }, "grouped-queue": { "version": "0.3.3", @@ -4327,7 +3913,8 @@ "growl": { "version": "1.9.2", "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz", - "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=" + "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=", + "dev": true }, "handlebars": { "version": "4.0.11", @@ -4377,6 +3964,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, "requires": { "ansi-regex": "2.1.1" } @@ -4390,7 +3978,8 @@ "has-flag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=" + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true }, "has-symbol-support-x": { "version": "1.4.2", @@ -4410,12 +3999,14 @@ "has-unicode": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", - "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", + "dev": true }, "hash-base": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=", + "dev": true, "requires": { "inherits": "2.0.3" } @@ -4424,6 +4015,7 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", + "dev": true, "requires": { "inherits": "2.0.3", "minimalistic-assert": "1.0.0" @@ -4454,12 +4046,14 @@ "he": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=" + "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", + "dev": true }, "hmac-drbg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", + "dev": true, "requires": { "hash.js": "1.1.3", "minimalistic-assert": "1.0.0", @@ -4476,6 +4070,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", + "dev": true, "requires": { "os-homedir": "1.0.2", "os-tmpdir": "1.0.2" @@ -4493,7 +4088,8 @@ "hosted-git-info": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", - "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" + "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", + "dev": true }, "http-cache-semantics": { "version": "3.8.1", @@ -4579,6 +4175,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, "requires": { "once": "1.4.0", "wrappy": "1.0.2" @@ -4587,12 +4184,14 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true }, "ini": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", - "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=" + "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=", + "dev": true }, "inquirer": { "version": "3.3.0", @@ -4687,7 +4286,8 @@ "interpret": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", - "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=" + "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=", + "dev": true }, "into-stream": { "version": "3.1.0", @@ -4703,6 +4303,7 @@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", + "dev": true, "requires": { "loose-envify": "1.3.1" } @@ -4710,17 +4311,20 @@ "invert-kv": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", + "dev": true }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", + "dev": true }, "is-binary-path": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, "requires": { "binary-extensions": "1.11.0" } @@ -4728,12 +4332,14 @@ "is-buffer": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", - "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=" + "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=", + "dev": true }, "is-builtin-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "dev": true, "requires": { "builtin-modules": "1.1.1" } @@ -4753,12 +4359,14 @@ "is-dotfile": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=" + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", + "dev": true }, "is-equal-shallow": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", + "dev": true, "requires": { "is-primitive": "2.0.0" } @@ -4766,17 +4374,20 @@ "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", + "dev": true }, "is-extglob": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true }, "is-finite": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "dev": true, "requires": { "number-is-nan": "1.0.1" } @@ -4785,6 +4396,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, "requires": { "number-is-nan": "1.0.1" } @@ -4799,6 +4411,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, "requires": { "is-extglob": "1.0.0" } @@ -4806,7 +4419,8 @@ "is-hex-prefixed": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz", - "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=" + "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=", + "dev": true }, "is-my-json-valid": { "version": "2.16.0", @@ -4824,6 +4438,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "dev": true, "requires": { "kind-of": "3.2.2" } @@ -4884,12 +4499,14 @@ "is-posix-bracket": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=" + "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", + "dev": true }, "is-primitive": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=" + "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", + "dev": true }, "is-promise": { "version": "2.1.0", @@ -4957,7 +4574,8 @@ "is-utf8": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", + "dev": true }, "is-windows": { "version": "1.0.2", @@ -4968,7 +4586,8 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true }, "isexe": { "version": "2.0.0", @@ -4980,6 +4599,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, "requires": { "isarray": "1.0.0" } @@ -5100,7 +4720,8 @@ "js-sha3": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.3.1.tgz", - "integrity": "sha1-hhIoAhQvCChQKg0d7h2V4lO7AkM=" + "integrity": "sha1-hhIoAhQvCChQKg0d7h2V4lO7AkM=", + "dev": true }, "js-string-escape": { "version": "1.0.1", @@ -5111,7 +4732,8 @@ "js-tokens": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "dev": true }, "js-yaml": { "version": "3.6.1", @@ -5188,7 +4810,8 @@ "json-schema-traverse": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", + "dev": true }, "json-stable-stringify-without-jsonify": { "version": "1.0.1", @@ -5205,17 +4828,20 @@ "json3": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", - "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=" + "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", + "dev": true }, "json5": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" + "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", + "dev": true }, "jsonfile": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", + "dev": true, "requires": { "graceful-fs": "4.1.11" } @@ -5263,9 +4889,10 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/keccakjs/-/keccakjs-0.2.1.tgz", "integrity": "sha1-HWM6+QfvMFu/ny+mFtVsRFYd+k0=", + "dev": true, "requires": { "browserify-sha3": "0.0.1", - "sha3": "1.2.0" + "sha3": "1.2.2" } }, "keyv": { @@ -5281,6 +4908,7 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "requires": { "is-buffer": "1.1.5" } @@ -5289,6 +4917,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", + "dev": true, "requires": { "graceful-fs": "4.1.11" } @@ -5304,6 +4933,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "dev": true, "requires": { "invert-kv": "1.0.0" } @@ -5585,6 +5215,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "dev": true, "requires": { "graceful-fs": "4.1.11", "parse-json": "2.2.0", @@ -5625,12 +5256,14 @@ "lodash": { "version": "4.17.4", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", - "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true }, "lodash._baseassign": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", + "dev": true, "requires": { "lodash._basecopy": "3.0.1", "lodash.keys": "3.1.2" @@ -5639,27 +5272,32 @@ "lodash._basecopy": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=" + "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", + "dev": true }, "lodash._basecreate": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz", - "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=" + "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=", + "dev": true }, "lodash._getnative": { "version": "3.9.1", "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=" + "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", + "dev": true }, "lodash._isiterateecall": { "version": "3.0.9", "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=" + "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", + "dev": true }, "lodash.assign": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", - "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=" + "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=", + "dev": true }, "lodash.cond": { "version": "4.5.2", @@ -5671,6 +5309,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz", "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=", + "dev": true, "requires": { "lodash._baseassign": "3.2.0", "lodash._basecreate": "3.0.3", @@ -5680,17 +5319,20 @@ "lodash.isarguments": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=" + "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", + "dev": true }, "lodash.isarray": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=" + "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", + "dev": true }, "lodash.keys": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", + "dev": true, "requires": { "lodash._getnative": "3.9.1", "lodash.isarguments": "3.1.0", @@ -5802,6 +5444,7 @@ "version": "1.3.1", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "dev": true, "requires": { "js-tokens": "3.0.2" } @@ -5957,7 +5600,8 @@ "memorystream": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", - "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=" + "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=", + "dev": true }, "merkle-patricia-tree": { "version": "2.1.2", @@ -5994,6 +5638,7 @@ "version": "2.3.11", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "dev": true, "requires": { "arr-diff": "2.0.0", "array-unique": "0.2.1", @@ -6049,17 +5694,20 @@ "minimalistic-assert": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz", - "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=" + "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=", + "dev": true }, "minimalistic-crypto-utils": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=" + "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", + "dev": true }, "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, "requires": { "brace-expansion": "1.1.8" } @@ -6067,12 +5715,14 @@ "minimist": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true }, "mkdirp": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, "requires": { "minimist": "0.0.8" } @@ -6153,7 +5803,8 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true }, "multimatch": { "version": "2.1.0", @@ -6176,7 +5827,8 @@ "nan": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz", - "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=" + "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=", + "dev": true }, "natural-compare": { "version": "1.4.0", @@ -6199,7 +5851,8 @@ "node-abi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.1.0.tgz", - "integrity": "sha512-AbW35CPRE4vdieOse46V+16dKispLNv3PQwgqlcfg7GQeQHcLu3gvp3fbU2gTh7d8NfGjp5CJh+j4Hpyb0XzaA==" + "integrity": "sha512-AbW35CPRE4vdieOse46V+16dKispLNv3PQwgqlcfg7GQeQHcLu3gvp3fbU2gTh7d8NfGjp5CJh+j4Hpyb0XzaA==", + "dev": true }, "node-dir": { "version": "0.1.8", @@ -6255,7 +5908,8 @@ "noop-logger": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz", - "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=" + "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=", + "dev": true }, "nopt": { "version": "3.0.6", @@ -6270,6 +5924,7 @@ "version": "2.4.0", "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==", + "dev": true, "requires": { "hosted-git-info": "2.5.0", "is-builtin-module": "1.0.0", @@ -6281,6 +5936,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, "requires": { "remove-trailing-separator": "1.0.2" } @@ -6296,14 +5952,6 @@ "sort-keys": "2.0.0" } }, - "npm-programmatic": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/npm-programmatic/-/npm-programmatic-0.0.10.tgz", - "integrity": "sha512-SklCZ26RRGi7hLIz/oaSnHy8ZT0gh8r6N3FMuKRye3ZcRo4HI/saldc8b7OqlY/Ov8FXnA1+I+Od+WtesWEp2Q==", - "requires": { - "bluebird": "3.5.1" - } - }, "npm-run-path": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", @@ -6317,6 +5965,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "dev": true, "requires": { "are-we-there-yet": "1.1.4", "console-control-strings": "1.1.0", @@ -6327,12 +5976,14 @@ "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", + "dev": true }, "number-to-bn": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/number-to-bn/-/number-to-bn-1.7.0.tgz", "integrity": "sha1-uzYjWS9+X54AMLGXe9QaDFP+HqA=", + "dev": true, "requires": { "bn.js": "4.11.6", "strip-hex-prefix": "1.0.0" @@ -6341,7 +5992,8 @@ "bn.js": { "version": "4.11.6", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", + "dev": true } } }, @@ -6354,7 +6006,8 @@ "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true }, "object-inspect": { "version": "1.3.0", @@ -6372,6 +6025,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", + "dev": true, "requires": { "for-own": "0.1.5", "is-extendable": "0.1.1" @@ -6381,6 +6035,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, "requires": { "wrappy": "1.0.2" } @@ -6468,17 +6123,20 @@ "original-require": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/original-require/-/original-require-1.0.1.tgz", - "integrity": "sha1-DxMEcVhM0zURxew4yNWSE/msXiA=" + "integrity": "sha1-DxMEcVhM0zURxew4yNWSE/msXiA=", + "dev": true }, "os-homedir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", + "dev": true }, "os-locale": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "dev": true, "requires": { "lcid": "1.0.0" } @@ -6486,17 +6144,8 @@ "os-tmpdir": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" - }, - "output-file-sync": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz", - "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=", - "requires": { - "graceful-fs": "4.1.11", - "mkdirp": "0.5.1", - "object-assign": "4.1.1" - } + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", + "dev": true }, "p-cancelable": { "version": "0.4.1", @@ -6571,6 +6220,7 @@ "version": "3.0.4", "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "dev": true, "requires": { "glob-base": "0.3.0", "is-dotfile": "1.0.3", @@ -6592,6 +6242,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, "requires": { "error-ex": "1.3.1" } @@ -6606,6 +6257,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "dev": true, "requires": { "pinkie-promise": "2.0.1" } @@ -6613,7 +6265,8 @@ "path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true }, "path-is-inside": { "version": "1.0.2", @@ -6630,12 +6283,14 @@ "path-parse": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=" + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "dev": true }, "path-type": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "dev": true, "requires": { "graceful-fs": "4.1.11", "pify": "2.3.0", @@ -6670,17 +6325,20 @@ "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true }, "pinkie": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true }, "pinkie-promise": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, "requires": { "pinkie": "2.0.4" } @@ -6704,6 +6362,7 @@ "version": "2.2.2", "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.2.2.tgz", "integrity": "sha512-F46pcvDxtQhbV3B+dm+exHuKxIyJK26fVNiJRmbTW/5D7o0Z2yzc8CKeu7UWbo9XxQZoVOC88aKgySAsza+cWw==", + "dev": true, "requires": { "expand-template": "1.0.3", "github-from-package": "0.0.0", @@ -6724,12 +6383,14 @@ "minimist": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, "requires": { "safe-buffer": "5.1.1" } @@ -6751,7 +6412,8 @@ "preserve": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=" + "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", + "dev": true }, "prettier": { "version": "1.11.1", @@ -6768,7 +6430,8 @@ "private": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz", - "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=" + "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=", + "dev": true }, "process": { "version": "0.5.2", @@ -6779,7 +6442,8 @@ "process-nextick-args": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", + "dev": true }, "progress": { "version": "2.0.0", @@ -6803,6 +6467,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz", "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=", + "dev": true, "requires": { "end-of-stream": "1.4.0", "once": "1.4.0" @@ -6835,6 +6500,7 @@ "version": "1.1.7", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "dev": true, "requires": { "is-number": "3.0.0", "kind-of": "4.0.0" @@ -6844,6 +6510,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, "requires": { "kind-of": "3.2.2" }, @@ -6852,6 +6519,7 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, "requires": { "is-buffer": "1.1.5" } @@ -6862,6 +6530,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "dev": true, "requires": { "is-buffer": "1.1.5" } @@ -6881,6 +6550,7 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", + "dev": true, "requires": { "deep-extend": "0.4.2", "ini": "1.3.4", @@ -6891,7 +6561,8 @@ "minimist": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true } } }, @@ -6917,6 +6588,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "dev": true, "requires": { "load-json-file": "1.1.0", "normalize-package-data": "2.4.0", @@ -6927,6 +6599,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "dev": true, "requires": { "find-up": "1.1.2", "read-pkg": "1.1.0" @@ -6936,6 +6609,7 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, "requires": { "core-util-is": "1.0.2", "inherits": "2.0.3", @@ -6950,6 +6624,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", + "dev": true, "requires": { "graceful-fs": "4.1.11", "minimatch": "3.0.4", @@ -6987,6 +6662,7 @@ "version": "0.6.2", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "dev": true, "requires": { "resolve": "1.4.0" } @@ -7000,7 +6676,8 @@ "regenerator-runtime": { "version": "0.10.5", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz", - "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=" + "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=", + "dev": true }, "regenerator-transform": { "version": "0.9.11", @@ -7017,6 +6694,7 @@ "version": "0.4.3", "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=", + "dev": true, "requires": { "is-equal-shallow": "0.1.3", "is-primitive": "2.0.0" @@ -7051,22 +6729,26 @@ "remove-trailing-separator": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz", - "integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE=" + "integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE=", + "dev": true }, "repeat-element": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=" + "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", + "dev": true }, "repeat-string": { "version": "1.6.1", "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", + "dev": true }, "repeating": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "dev": true, "requires": { "is-finite": "1.0.2" } @@ -7126,17 +6808,20 @@ "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", + "dev": true }, "require-from-string": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", - "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=" + "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=", + "dev": true }, "require-main-filename": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", + "dev": true }, "require-uncached": { "version": "1.0.3", @@ -7160,6 +6845,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", + "dev": true, "requires": { "path-parse": "1.0.5" } @@ -7239,6 +6925,7 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", + "dev": true, "requires": { "glob": "7.1.2" } @@ -7247,6 +6934,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=", + "dev": true, "requires": { "hash-base": "2.0.2", "inherits": "2.0.3" @@ -7255,7 +6943,8 @@ "rlp": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.0.0.tgz", - "integrity": "sha1-nbOE/0uJqPYVY9kjldhiWxjzr7A=" + "integrity": "sha1-nbOE/0uJqPYVY9kjldhiWxjzr7A=", + "dev": true }, "run-async": { "version": "2.3.0", @@ -7266,6 +6955,12 @@ "is-promise": "2.1.0" } }, + "rustbn.js": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/rustbn.js/-/rustbn.js-0.1.2.tgz", + "integrity": "sha512-bAkNqSHYdJdFsBC7Z11JgzYktL31HIpB2o70jZcGiL1U1TVtPyvaVhDrGWwS8uZtaqwW2k6NOPGZCqW/Dgh5Lg==", + "dev": true + }, "rx-lite": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", @@ -7293,7 +6988,8 @@ "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "dev": true }, "scoped-regex": { "version": "1.0.0", @@ -7333,6 +7029,7 @@ "version": "3.3.0", "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.3.0.tgz", "integrity": "sha512-CbrQoeGG5V0kQ1ohEMGI+J7oKerapLTpivLICBaXR0R4HyQcN3kM9itLsV5fdpV1UR1bD14tOkJ1xughmlDIiQ==", + "dev": true, "requires": { "bindings": "1.3.0", "bip66": "1.1.5", @@ -7354,30 +7051,35 @@ "semver": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", - "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", + "dev": true }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", + "dev": true }, "set-immediate-shim": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", + "dev": true }, "sha.js": { "version": "2.4.8", "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz", "integrity": "sha1-NwaMLEdra69ALRSknGf1l5IfY08=", + "dev": true, "requires": { "inherits": "2.0.3" } }, "sha3": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/sha3/-/sha3-1.2.0.tgz", - "integrity": "sha1-aYnxtwpJhwWHajc+LGKs6WqpOZo=", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/sha3/-/sha3-1.2.2.tgz", + "integrity": "sha1-pmxQmN5MJbyIM27ItIF9AFvKe6k=", + "dev": true, "requires": { "nan": "2.6.2" } @@ -7417,12 +7119,14 @@ "signal-exit": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", + "dev": true }, "simple-get": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz", "integrity": "sha1-6XVe2kB+ltpAxeUVjJ6jezO+y+s=", + "dev": true, "requires": { "once": "1.4.0", "unzip-response": "1.0.2", @@ -7432,7 +7136,8 @@ "slash": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", + "dev": true }, "slice-ansi": { "version": "1.0.0", @@ -7516,9 +7221,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", @@ -7528,25 +7233,49 @@ "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" } }, "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" + }, + "dependencies": { + "yargs": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", + "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", + "dev": true, + "requires": { + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "lodash.assign": "4.2.0", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "window-size": "0.2.0", + "y18n": "3.2.1", + "yargs-parser": "2.4.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", @@ -7558,7 +7287,7 @@ "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": { @@ -7575,9 +7304,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", @@ -7663,9 +7392,9 @@ "dev": true }, "solparse": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/solparse/-/solparse-2.2.4.tgz", - "integrity": "sha512-Sdyk983juUaOITdTD9U5Yc+MaX8kz4pN3wFyCRILWXW3+Ff96PxY9RLBuZINYbBgCAXN1a+kThJfFMlaXG9R6A==", + "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", @@ -7713,7 +7442,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", @@ -7756,12 +7485,14 @@ "source-map": { "version": "0.5.6", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", - "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=" + "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=", + "dev": true }, "source-map-support": { "version": "0.4.15", "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz", "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=", + "dev": true, "requires": { "source-map": "0.5.6" } @@ -7770,6 +7501,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "dev": true, "requires": { "spdx-license-ids": "1.2.2" } @@ -7777,12 +7509,14 @@ "spdx-expression-parse": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", - "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=" + "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=", + "dev": true }, "spdx-license-ids": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", - "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=" + "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=", + "dev": true }, "sprintf-js": { "version": "1.0.3", @@ -7839,6 +7573,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, "requires": { "code-point-at": "1.1.0", "is-fullwidth-code-point": "1.0.0", @@ -7860,6 +7595,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, "requires": { "safe-buffer": "5.1.1" } @@ -7874,6 +7610,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, "requires": { "ansi-regex": "2.1.1" } @@ -7882,6 +7619,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, "requires": { "is-utf8": "0.2.1" } @@ -7906,6 +7644,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz", "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=", + "dev": true, "requires": { "is-hex-prefixed": "1.0.0" } @@ -7913,12 +7652,14 @@ "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "dev": true }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true }, "symbol-observable": { "version": "1.0.1", @@ -8053,6 +7794,7 @@ "version": "1.15.3", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.3.tgz", "integrity": "sha1-7M+TXpQUk9gVECjmNuUc5MPKfyA=", + "dev": true, "requires": { "chownr": "1.0.1", "mkdirp": "0.5.1", @@ -8064,6 +7806,7 @@ "version": "1.5.4", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz", "integrity": "sha1-NlSc8E7RrumyowwBQyUiONr5QBY=", + "dev": true, "requires": { "bl": "1.2.1", "end-of-stream": "1.4.0", @@ -8135,7 +7878,8 @@ "to-fast-properties": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=" + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "dev": true }, "to-iso-string": { "version": "0.0.2", @@ -8161,17 +7905,18 @@ "trim-right": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=" + "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", + "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": { @@ -8224,9 +7969,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", @@ -8244,98 +7989,31 @@ "requires": { "has-flag": "1.0.0" } - } - } - }, - "truffle-blockchain-utils": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/truffle-blockchain-utils/-/truffle-blockchain-utils-0.0.4.tgz", - "integrity": "sha512-wgRrhwqh0aea08Hz28hUV4tuF2uTVQH/e9kBou+WK04cqrutB5cxQVQ6HGjeZLltxBYOFvhrGOOq4l3WJFnPEA==" - }, - "truffle-contract": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/truffle-contract/-/truffle-contract-3.0.5.tgz", - "integrity": "sha512-lRayhvX73OrLJ6TDvc0iYbzcB+Y1F9FCj9N1FXQ2EKOkqyIjmgZNMZFHGjvfTws1gsmonYd6sND0ahipiUYy8g==", - "requires": { - "ethjs-abi": "0.1.8", - "truffle-blockchain-utils": "0.0.4", - "truffle-contract-schema": "2.0.0", - "truffle-error": "0.0.2", - "web3": "0.20.6" - }, - "dependencies": { - "bignumber.js": { - "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934" }, - "bn.js": { - "version": "4.11.6", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" - }, - "ethjs-abi": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.1.8.tgz", - "integrity": "sha1-zSiFg+1ijN+tr4re+juh28vKbBg=", + "yargs": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", + "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", + "dev": true, "requires": { - "bn.js": "4.11.6", - "js-sha3": "0.5.5", - "number-to-bn": "1.7.0" - } - }, - "js-sha3": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz", - "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=" - }, - "web3": { - "version": "0.20.6", - "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.6.tgz", - "integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=", - "requires": { - "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", - "crypto-js": "3.1.8", - "utf8": "2.1.2", - "xhr2": "0.1.4", - "xmlhttprequest": "1.8.0" + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "lodash.assign": "4.2.0", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "window-size": "0.2.0", + "y18n": "3.2.1", + "yargs-parser": "2.4.1" } } } }, - "truffle-contract-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/truffle-contract-schema/-/truffle-contract-schema-2.0.0.tgz", - "integrity": "sha512-nLlspmu1GKDaluWksBwitHi/7Z3IpRjmBYeO9N+T1nVJD2V4IWJaptCKP1NqnPiJA+FChB7+F7pI6Br51/FtXQ==", - "requires": { - "ajv": "5.5.2", - "crypto-js": "3.1.9-1", - "debug": "3.1.0" - }, - "dependencies": { - "crypto-js": { - "version": "3.1.9-1", - "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz", - "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=" - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "requires": { - "ms": "2.0.0" - } - } - } - }, - "truffle-error": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/truffle-error/-/truffle-error-0.0.2.tgz", - "integrity": "sha1-AbGJt4UFVmrhaJwjnHyi3RIc/kw=" - }, - "truffle-expect": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/truffle-expect/-/truffle-expect-0.0.3.tgz", - "integrity": "sha1-m3XO80O9WW5+XbyHj18bLjGKlEw=" - }, "truffle-hdwallet-provider": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/truffle-hdwallet-provider/-/truffle-hdwallet-provider-0.0.3.tgz", @@ -8357,10 +8035,6 @@ "lodash": "4.17.4" } }, - "bignumber.js": { - "version": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", - "dev": true - }, "ethereum-common": { "version": "0.0.18", "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.0.18.tgz", @@ -8401,7 +8075,7 @@ "ethereumjs-block": "1.2.2", "ethereumjs-tx": "1.3.3", "ethereumjs-util": "5.1.2", - "ethereumjs-vm": "git+https://github.com/sc-forks/ethereumjs-vm-sc.git#328771cace30ed16ad5c1d13a69cda13d31173f9", + "ethereumjs-vm": "2.3.5", "isomorphic-fetch": "2.2.1", "request": "2.79.0", "semaphore": "1.1.0", @@ -8416,6 +8090,61 @@ "version": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9", "dev": true }, + "ethereum-common": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.2.0.tgz", + "integrity": "sha512-XOnAR/3rntJgbCdGhqdaLIxDLWKLmsZOGhHdBKadEr6gEnJLH52k93Ou+TUdFaPN3hJc3isBZBal3U/XZ15abA==", + "dev": true + }, + "ethereumjs-vm": { + "version": "2.3.5", + "resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-2.3.5.tgz", + "integrity": "sha512-AJ7x44+xqyE5+UO3Nns19WkTdZfyqFZ+sEjIEpvme7Ipbe3iBU1uwCcHEdiu/yY9bdhr3IfSa/NfIKNeXPaRVQ==", + "dev": true, + "requires": { + "async": "2.5.0", + "async-eventemitter": "0.2.3", + "ethereum-common": "0.2.0", + "ethereumjs-account": "2.0.4", + "ethereumjs-block": "1.7.1", + "ethereumjs-util": "5.2.0", + "fake-merkle-patricia-tree": "1.0.1", + "functional-red-black-tree": "1.0.1", + "merkle-patricia-tree": "2.1.2", + "rustbn.js": "0.1.2", + "safe-buffer": "5.1.1" + }, + "dependencies": { + "ethereumjs-block": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/ethereumjs-block/-/ethereumjs-block-1.7.1.tgz", + "integrity": "sha512-B+sSdtqm78fmKkBq78/QLKJbu/4Ts4P2KFISdgcuZUPDm9x+N7qgBPIIFUGbaakQh8bzuquiRVbdmvPKqbILRg==", + "dev": true, + "requires": { + "async": "2.5.0", + "ethereum-common": "0.2.0", + "ethereumjs-tx": "1.3.3", + "ethereumjs-util": "5.2.0", + "merkle-patricia-tree": "2.1.2" + } + }, + "ethereumjs-util": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.2.0.tgz", + "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", + "dev": true, + "requires": { + "bn.js": "4.11.8", + "create-hash": "1.1.3", + "ethjs-util": "0.1.4", + "keccak": "1.3.0", + "rlp": "2.0.0", + "safe-buffer": "5.1.1", + "secp256k1": "3.3.0" + } + } + } + }, "web3": { "version": "0.16.0", "resolved": "https://registry.npmjs.org/web3/-/web3-0.16.0.tgz", @@ -8432,32 +8161,6 @@ } } }, - "truffle-provisioner": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/truffle-provisioner/-/truffle-provisioner-0.1.0.tgz", - "integrity": "sha1-Ap5SScEBUwBzhTXgT97ZMaU8T2I=" - }, - "truffle-resolver": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/truffle-resolver/-/truffle-resolver-4.0.3.tgz", - "integrity": "sha512-CXzfXcG6LxQm5cWXH/HJE85pnvHvPDB16l2pzk9/q1F9Y4BWD2xS4rYzvrXGjkPNGrYTkNY+baF5YN/6eIGGgQ==", - "requires": { - "async": "2.6.0", - "truffle-contract": "3.0.5", - "truffle-expect": "0.0.3", - "truffle-provisioner": "0.1.0" - }, - "dependencies": { - "async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", - "requires": { - "lodash": "4.17.4" - } - } - } - }, "tryit": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz", @@ -8508,54 +8211,6 @@ "source-map": "0.5.6", "uglify-to-browserify": "1.0.2", "yargs": "3.10.0" - }, - "dependencies": { - "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true, - "optional": true - }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, - "optional": true, - "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", - "wordwrap": "0.0.2" - } - }, - "window-size": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true, - "optional": true - }, - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true, - "optional": true - }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "optional": true, - "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", - "window-size": "0.1.0" - } - } } }, "uglify-to-browserify": { @@ -8586,7 +8241,8 @@ "unzip-response": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz", - "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=" + "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=", + "dev": true }, "url-parse-lax": { "version": "3.0.0", @@ -8603,20 +8259,17 @@ "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=", "dev": true }, - "user-home": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", - "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=" - }, "utf8": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", - "integrity": "sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY=" + "integrity": "sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY=", + "dev": true }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true }, "uuid": { "version": "3.1.0", @@ -8630,18 +8283,11 @@ "integrity": "sha512-ejdrifsIydN1XDH7EuR2hn8ZrkRKUYF7tUcBjBy/lhrCvs2K+zRlbW9UHc0IQ9RsYFZJFqJrieoIHfkCa0DBRA==", "dev": true }, - "v8flags": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", - "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", - "requires": { - "user-home": "1.1.1" - } - }, "validate-npm-package-license": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "dev": true, "requires": { "spdx-correct": "1.0.2", "spdx-expression-parse": "1.0.4" @@ -9044,12 +8690,14 @@ "which-module": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", + "dev": true }, "wide-align": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "dev": true, "requires": { "string-width": "1.0.2" } @@ -9057,7 +8705,8 @@ "window-size": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz", - "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" + "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=", + "dev": true }, "wordwrap": { "version": "1.0.0", @@ -9069,6 +8718,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "dev": true, "requires": { "string-width": "1.0.2", "strip-ansi": "3.0.1" @@ -9077,7 +8727,8 @@ "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true }, "write": { "version": "0.2.1", @@ -9114,22 +8765,26 @@ "xhr2": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.1.4.tgz", - "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8=" + "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8=", + "dev": true }, "xmlhttprequest": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", - "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=" + "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=", + "dev": true }, "xtend": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "dev": true }, "y18n": { "version": "3.2.1", "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", + "dev": true }, "yallist": { "version": "2.1.2", @@ -9138,30 +8793,58 @@ "dev": true }, "yargs": { - "version": "4.8.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", - "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "dev": true, + "optional": true, "requires": { - "cliui": "3.2.0", + "camelcase": "1.2.1", + "cliui": "2.1.0", "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "lodash.assign": "4.2.0", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "window-size": "0.2.0", - "y18n": "3.2.1", - "yargs-parser": "2.4.1" + "window-size": "0.1.0" + }, + "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", + "dev": true, + "optional": true + }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "dev": true, + "optional": true, + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + } + }, + "window-size": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", + "dev": true, + "optional": true + }, + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", + "dev": true, + "optional": true + } } }, "yargs-parser": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz", "integrity": "sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=", + "dev": true, "requires": { "camelcase": "3.0.0", "lodash.assign": "4.2.0" @@ -9439,201 +9122,6 @@ } } } - }, - "zeppelin-solidity": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/zeppelin-solidity/-/zeppelin-solidity-1.8.0.tgz", - "integrity": "sha512-7Mxq6Y7EES0PSLrRF6v0EVYqBVRRo8hFrr7m3jEs69VbbQ5kpANzizeEdbP1/PWKSOmBOg208qP2vSA0FlzFLA==", - "requires": { - "dotenv": "4.0.0", - "ethjs-abi": "0.2.1" - } - }, - "zos": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/zos/-/zos-0.3.7.tgz", - "integrity": "sha512-V17wDh5fsOZ33+qkeE/x7K+/hYnCvzZW57RhrrbeVilmUwXgK26NF+E1hAzcqSzLN57ecsSH+aASjtzOZQsZxg==", - "requires": { - "babel-cli": "6.26.0", - "babel-polyfill": "6.26.0", - "colors": "1.2.1", - "commander": "2.15.1", - "ethereumjs-abi": "0.6.5", - "lodash": "4.17.5", - "npm-programmatic": "0.0.10", - "shelljs": "0.8.1", - "truffle": "4.1.7", - "truffle-contract": "3.0.5", - "truffle-provisioner": "0.1.0", - "truffle-resolver": "4.0.3", - "zos-kernel": "0.1.1", - "zos-lib": "0.0.3" - }, - "dependencies": { - "babel-polyfill": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz", - "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=", - "requires": { - "babel-runtime": "6.26.0", - "core-js": "2.5.0", - "regenerator-runtime": "0.10.5" - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "requires": { - "core-js": "2.5.0", - "regenerator-runtime": "0.11.1" - }, - "dependencies": { - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" - } - } - }, - "colors": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.1.tgz", - "integrity": "sha512-s8+wktIuDSLffCywiwSxQOMqtPxML11a/dtHE17tMn4B1MSWw/C22EKf7M2KGUBcDaVFEGT+S8N02geDXeuNKg==" - }, - "commander": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", - "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" - }, - "diff": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz", - "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=" - }, - "lodash": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.5.tgz", - "integrity": "sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==" - }, - "mocha": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz", - "integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==", - "requires": { - "browser-stdout": "1.3.0", - "commander": "2.9.0", - "debug": "2.6.8", - "diff": "3.2.0", - "escape-string-regexp": "1.0.5", - "glob": "7.1.1", - "growl": "1.9.2", - "he": "1.1.1", - "json3": "3.3.2", - "lodash.create": "3.1.1", - "mkdirp": "0.5.1", - "supports-color": "3.1.2" - }, - "dependencies": { - "commander": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", - "requires": { - "graceful-readlink": "1.0.1" - } - }, - "glob": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", - "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=", - "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" - } - } - } - }, - "shelljs": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.1.tgz", - "integrity": "sha512-YA/iYtZpzFe5HyWVGrb02FjPxc4EMCfpoU/Phg9fQoyMC72u9598OUBrsU8IrtwAKG0tO8IYaqbaLIw+k3IRGA==", - "requires": { - "glob": "7.1.2", - "interpret": "1.0.3", - "rechoir": "0.6.2" - } - }, - "solc": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.23.tgz", - "integrity": "sha512-AT7anLHY6uIRg2It6N0UlCHeZ7YeecIkUhnlirrCgCPCUevtnoN48BxvgigN/4jJTRljv5oFhAJtI6gvHzT5DQ==", - "requires": { - "fs-extra": "0.30.0", - "memorystream": "0.3.1", - "require-from-string": "1.2.1", - "semver": "5.4.1", - "yargs": "4.8.1" - } - }, - "supports-color": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", - "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", - "requires": { - "has-flag": "1.0.0" - } - }, - "truffle": { - "version": "4.1.7", - "resolved": "https://registry.npmjs.org/truffle/-/truffle-4.1.7.tgz", - "integrity": "sha512-fe6BIcD9xo6iIJvV1m6ZhOk56kmB8k38kdoWOKYnPPw7ZUUSupgojeTb2K5e+4qIpIHvEvmET4yLUjSGR+hvwA==", - "requires": { - "mocha": "3.5.3", - "original-require": "1.0.1", - "solc": "0.4.23" - } - }, - "zos-lib": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-0.0.3.tgz", - "integrity": "sha512-OHMCw0JW1dvnKx4CNJqhaBbrBeldDJBNV74Z22irIi2Yh4kPBMc7ZVt7VSdEHD1wUL5Ez7RXPUwk9drL9QvKjQ==", - "requires": { - "zeppelin-solidity": "1.8.0" - } - } - } - }, - "zos-kernel": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/zos-kernel/-/zos-kernel-0.1.1.tgz", - "integrity": "sha512-xXoVLe08CWc9mofY4ckVBpFB5jr15/kgm2sz8VG+fFvFl4H0inC1AufGEdSwYWC4Hu9EOfc592LAg3tYjke+sQ==", - "requires": { - "zeppelin-solidity": "1.8.0", - "zos-lib": "0.0.2" - }, - "dependencies": { - "zos-lib": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-0.0.2.tgz", - "integrity": "sha512-wVPK3+lwguz4Bm4rWRcvQMPMa933BbtNMGqgoVNWIi6r2ZLZVYC93y1bxk19pWzBEdpcZyWDZ4yZwij2AsC9tw==", - "requires": { - "zeppelin-solidity": "1.8.0" - } - } - } - }, - "zos-lib": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-0.0.5.tgz", - "integrity": "sha512-UVINaUZ9WuGGlljKaTXaxzaLGW9F/5AViSsOYy/oagFyQIY6Ch9WQ1fnUx3L8O4p1XGne9rG2JXY4B9f6YPHsA==", - "requires": { - "zeppelin-solidity": "1.8.0" - } } } } From 5284a6df88f94054dc671470183c1f0be56e94c0 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Thu, 17 May 2018 19:37:06 -0300 Subject: [PATCH 19/54] update nan 2.6.2 -> 2.10.0 for node 10 compatibility --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6c16b07ed..0d83c195f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5825,9 +5825,9 @@ "dev": true }, "nan": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz", - "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", + "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", "dev": true }, "natural-compare": { From 6f1c67af0d97297242e0ccc6d4a68466ada26a42 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 18 May 2018 18:55:24 -0300 Subject: [PATCH 20/54] commit new package-lock.json format generated by npm 6 --- package-lock.json | 6898 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 5260 insertions(+), 1638 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0d83c195f..c85124a00 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,19 @@ "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==", "dev": true }, + "@types/node": { + "version": "10.1.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.1.2.tgz", + "integrity": "sha512-bjk1RIeZBCe/WukrFToIVegOf91Pebr8cXYBwLBIsfiGWVQ+ifwWsT59H3RxrWzWrzd1l/Amk1/ioY5Fq3/bpA==", + "dev": true + }, + "abab": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", + "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=", + "dev": true, + "optional": true + }, "abbrev": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", @@ -22,7 +35,50 @@ "integrity": "sha512-6RmGuGZSsvwIYS9otANM+Rie7/6UNdE0IbxwUiXFjXmjHNCJZEjyX2Pltl5BvIYszLODlsnXtyA7A7Ujlca4Gw==", "dev": true, "requires": { - "xtend": "4.0.1" + "xtend": "~4.0.0" + } + }, + "accepts": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", + "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", + "dev": true, + "requires": { + "mime-types": "~2.1.18", + "negotiator": "0.6.1" + }, + "dependencies": { + "mime-db": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", + "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==", + "dev": true + }, + "mime-types": { + "version": "2.1.18", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", + "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", + "dev": true, + "requires": { + "mime-db": "~1.33.0" + } + } + } + }, + "acorn": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz", + "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=", + "dev": true + }, + "acorn-globals": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz", + "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=", + "dev": true, + "optional": true, + "requires": { + "acorn": "^2.1.0" } }, "acorn-jsx": { @@ -31,7 +87,7 @@ "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", "dev": true, "requires": { - "acorn": "3.3.0" + "acorn": "^3.0.4" }, "dependencies": { "acorn": { @@ -42,6 +98,12 @@ } } }, + "adm-zip": { + "version": "0.4.11", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.11.tgz", + "integrity": "sha512-L8vcjDTCOIJk7wFvmlEUN7AsSb8T+2JrdP7KINBjzr24TJ5Mwj590sLu3BC7zNZowvJWa/JtPmD8eJCzdtDWjA==", + "dev": true + }, "aes-js": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-0.2.4.tgz", @@ -54,10 +116,10 @@ "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "dev": true, "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.0.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, "ajv-keywords": { @@ -72,9 +134,9 @@ "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "dev": true, "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" } }, "amdefine": { @@ -113,8 +175,8 @@ "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", "dev": true, "requires": { - "micromatch": "2.3.11", - "normalize-path": "2.1.1" + "micromatch": "^2.1.5", + "normalize-path": "^2.0.0" } }, "aproba": { @@ -129,8 +191,8 @@ "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", "dev": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.3" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "argparse": { @@ -139,7 +201,7 @@ "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", "dev": true, "requires": { - "sprintf-js": "1.0.3" + "sprintf-js": "~1.0.2" } }, "arr-diff": { @@ -148,7 +210,7 @@ "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", "dev": true, "requires": { - "arr-flatten": "1.1.0" + "arr-flatten": "^1.0.1" } }, "arr-flatten": { @@ -163,13 +225,19 @@ "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", "dev": true }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", + "dev": true + }, "array-union": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", "dev": true, "requires": { - "array-uniq": "1.0.3" + "array-uniq": "^1.0.1" } }, "array-uniq": { @@ -190,6 +258,12 @@ "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", "dev": true }, + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", + "dev": true + }, "asn1": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", @@ -232,7 +306,7 @@ "integrity": "sha1-959IDf2mZFqXvWFCwBcVDWO05w4=", "dev": true, "requires": { - "async": "2.5.0" + "async": "^2.4.0" }, "dependencies": { "async": { @@ -241,7 +315,7 @@ "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", "dev": true, "requires": { - "lodash": "4.17.4" + "lodash": "^4.14.0" } } } @@ -264,15 +338,235 @@ "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", "dev": true }, + "babel-cli": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.26.0.tgz", + "integrity": "sha1-UCq1SHTX24itALiHoGODzgPQAvE=", + "dev": true, + "requires": { + "babel-core": "^6.26.0", + "babel-polyfill": "^6.26.0", + "babel-register": "^6.26.0", + "babel-runtime": "^6.26.0", + "chokidar": "^1.6.1", + "commander": "^2.11.0", + "convert-source-map": "^1.5.0", + "fs-readdir-recursive": "^1.0.0", + "glob": "^7.1.2", + "lodash": "^4.17.4", + "output-file-sync": "^1.1.2", + "path-is-absolute": "^1.0.1", + "slash": "^1.0.0", + "source-map": "^0.5.6", + "v8flags": "^2.1.1" + }, + "dependencies": { + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "dev": true, + "requires": { + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" + } + }, + "babel-core": { + "version": "6.26.3", + "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz", + "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", + "dev": true, + "requires": { + "babel-code-frame": "^6.26.0", + "babel-generator": "^6.26.0", + "babel-helpers": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-register": "^6.26.0", + "babel-runtime": "^6.26.0", + "babel-template": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "convert-source-map": "^1.5.1", + "debug": "^2.6.9", + "json5": "^0.5.1", + "lodash": "^4.17.4", + "minimatch": "^3.0.4", + "path-is-absolute": "^1.0.1", + "private": "^0.1.8", + "slash": "^1.0.0", + "source-map": "^0.5.7" + }, + "dependencies": { + "convert-source-map": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", + "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "babel-generator": { + "version": "6.26.1", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", + "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", + "dev": true, + "requires": { + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.7", + "trim-right": "^1.0.1" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "babel-polyfill": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz", + "integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=", + "dev": true, + "requires": { + "babel-runtime": "^6.26.0", + "core-js": "^2.5.0", + "regenerator-runtime": "^0.10.5" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.10.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz", + "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=", + "dev": true + } + } + }, + "babel-register": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", + "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", + "dev": true, + "requires": { + "babel-core": "^6.26.0", + "babel-runtime": "^6.26.0", + "core-js": "^2.5.0", + "home-or-tmp": "^2.0.0", + "lodash": "^4.17.4", + "mkdirp": "^0.5.1", + "source-map-support": "^0.4.15" + } + }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + } + }, + "babel-template": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", + "dev": true, + "requires": { + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" + } + }, + "babel-traverse": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", + "dev": true, + "requires": { + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" + } + }, + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "dev": true, + "requires": { + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" + } + }, + "babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "dev": true + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "jsesc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", + "dev": true + }, + "private": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", + "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", + "dev": true + }, + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "dev": true + } + } + }, "babel-code-frame": { "version": "6.22.0", "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=", "dev": true, "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" + "chalk": "^1.1.0", + "esutils": "^2.0.2", + "js-tokens": "^3.0.0" } }, "babel-core": { @@ -281,25 +575,25 @@ "integrity": "sha1-fdQrBGPHQunVKW3rPsZ6kyLa1yk=", "dev": true, "requires": { - "babel-code-frame": "6.22.0", - "babel-generator": "6.25.0", - "babel-helpers": "6.24.1", - "babel-messages": "6.23.0", - "babel-register": "6.24.1", - "babel-runtime": "6.25.0", - "babel-template": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0", - "babylon": "6.17.4", - "convert-source-map": "1.5.0", - "debug": "2.6.8", - "json5": "0.5.1", - "lodash": "4.17.4", - "minimatch": "3.0.4", - "path-is-absolute": "1.0.1", - "private": "0.1.7", - "slash": "1.0.0", - "source-map": "0.5.6" + "babel-code-frame": "^6.22.0", + "babel-generator": "^6.25.0", + "babel-helpers": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-register": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.25.0", + "babel-traverse": "^6.25.0", + "babel-types": "^6.25.0", + "babylon": "^6.17.2", + "convert-source-map": "^1.1.0", + "debug": "^2.1.1", + "json5": "^0.5.0", + "lodash": "^4.2.0", + "minimatch": "^3.0.2", + "path-is-absolute": "^1.0.0", + "private": "^0.1.6", + "slash": "^1.0.0", + "source-map": "^0.5.0" } }, "babel-generator": { @@ -308,14 +602,14 @@ "integrity": "sha1-M6GvcNXyiQrrRlpKd5PB32qeqfw=", "dev": true, "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.25.0", - "babel-types": "6.25.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.4", - "source-map": "0.5.6", - "trim-right": "1.0.1" + "babel-messages": "^6.23.0", + "babel-runtime": "^6.22.0", + "babel-types": "^6.25.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.2.0", + "source-map": "^0.5.0", + "trim-right": "^1.0.1" }, "dependencies": { "jsesc": { @@ -332,9 +626,9 @@ "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=", "dev": true, "requires": { - "babel-runtime": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-builder-binary-assignment-operator-visitor": { @@ -343,9 +637,9 @@ "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", "dev": true, "requires": { - "babel-helper-explode-assignable-expression": "6.24.1", - "babel-runtime": "6.25.0", - "babel-types": "6.25.0" + "babel-helper-explode-assignable-expression": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-call-delegate": { @@ -354,10 +648,10 @@ "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", "dev": true, "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0" + "babel-helper-hoist-variables": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-define-map": { @@ -366,10 +660,10 @@ "integrity": "sha1-epdH8ljYlH0y1RX2qhx70CIEoIA=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.25.0", - "babel-types": "6.25.0", - "lodash": "4.17.4" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1", + "lodash": "^4.2.0" } }, "babel-helper-explode-assignable-expression": { @@ -378,9 +672,9 @@ "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", "dev": true, "requires": { - "babel-runtime": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-explode-class": { @@ -389,10 +683,10 @@ "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=", "dev": true, "requires": { - "babel-helper-bindify-decorators": "6.24.1", - "babel-runtime": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0" + "babel-helper-bindify-decorators": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-function-name": { @@ -401,11 +695,11 @@ "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", "dev": true, "requires": { - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.25.0", - "babel-template": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0" + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-get-function-arity": { @@ -414,8 +708,8 @@ "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", "dev": true, "requires": { - "babel-runtime": "6.25.0", - "babel-types": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-hoist-variables": { @@ -424,8 +718,8 @@ "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", "dev": true, "requires": { - "babel-runtime": "6.25.0", - "babel-types": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-optimise-call-expression": { @@ -434,8 +728,8 @@ "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", "dev": true, "requires": { - "babel-runtime": "6.25.0", - "babel-types": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-helper-regex": { @@ -444,9 +738,9 @@ "integrity": "sha1-024i+rEAjXnYhkjjIRaGgShFbOg=", "dev": true, "requires": { - "babel-runtime": "6.25.0", - "babel-types": "6.25.0", - "lodash": "4.17.4" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1", + "lodash": "^4.2.0" } }, "babel-helper-remap-async-to-generator": { @@ -455,11 +749,11 @@ "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.25.0", - "babel-template": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helper-replace-supers": { @@ -468,12 +762,12 @@ "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", "dev": true, "requires": { - "babel-helper-optimise-call-expression": "6.24.1", - "babel-messages": "6.23.0", - "babel-runtime": "6.25.0", - "babel-template": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0" + "babel-helper-optimise-call-expression": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-helpers": { @@ -482,8 +776,8 @@ "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", "dev": true, "requires": { - "babel-runtime": "6.25.0", - "babel-template": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-messages": { @@ -492,7 +786,7 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "babel-runtime": "6.25.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-check-es2015-constants": { @@ -501,7 +795,7 @@ "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", "dev": true, "requires": { - "babel-runtime": "6.25.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-syntax-async-functions": { @@ -576,9 +870,9 @@ "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=", "dev": true, "requires": { - "babel-helper-remap-async-to-generator": "6.24.1", - "babel-plugin-syntax-async-generators": "6.13.0", - "babel-runtime": "6.25.0" + "babel-helper-remap-async-to-generator": "^6.24.1", + "babel-plugin-syntax-async-generators": "^6.5.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-async-to-generator": { @@ -587,9 +881,9 @@ "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", "dev": true, "requires": { - "babel-helper-remap-async-to-generator": "6.24.1", - "babel-plugin-syntax-async-functions": "6.13.0", - "babel-runtime": "6.25.0" + "babel-helper-remap-async-to-generator": "^6.24.1", + "babel-plugin-syntax-async-functions": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-class-constructor-call": { @@ -598,9 +892,9 @@ "integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=", "dev": true, "requires": { - "babel-plugin-syntax-class-constructor-call": "6.18.0", - "babel-runtime": "6.25.0", - "babel-template": "6.25.0" + "babel-plugin-syntax-class-constructor-call": "^6.18.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-class-properties": { @@ -609,10 +903,10 @@ "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-plugin-syntax-class-properties": "6.13.0", - "babel-runtime": "6.25.0", - "babel-template": "6.25.0" + "babel-helper-function-name": "^6.24.1", + "babel-plugin-syntax-class-properties": "^6.8.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-decorators": { @@ -621,11 +915,11 @@ "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=", "dev": true, "requires": { - "babel-helper-explode-class": "6.24.1", - "babel-plugin-syntax-decorators": "6.13.0", - "babel-runtime": "6.25.0", - "babel-template": "6.25.0", - "babel-types": "6.25.0" + "babel-helper-explode-class": "^6.24.1", + "babel-plugin-syntax-decorators": "^6.13.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-arrow-functions": { @@ -634,7 +928,7 @@ "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", "dev": true, "requires": { - "babel-runtime": "6.25.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-block-scoped-functions": { @@ -643,7 +937,7 @@ "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", "dev": true, "requires": { - "babel-runtime": "6.25.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-block-scoping": { @@ -652,11 +946,11 @@ "integrity": "sha1-dsKV3DpHQbFmWt/TFnIV3P8ypXY=", "dev": true, "requires": { - "babel-runtime": "6.25.0", - "babel-template": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0", - "lodash": "4.17.4" + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1", + "lodash": "^4.2.0" } }, "babel-plugin-transform-es2015-classes": { @@ -665,15 +959,15 @@ "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", "dev": true, "requires": { - "babel-helper-define-map": "6.24.1", - "babel-helper-function-name": "6.24.1", - "babel-helper-optimise-call-expression": "6.24.1", - "babel-helper-replace-supers": "6.24.1", - "babel-messages": "6.23.0", - "babel-runtime": "6.25.0", - "babel-template": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0" + "babel-helper-define-map": "^6.24.1", + "babel-helper-function-name": "^6.24.1", + "babel-helper-optimise-call-expression": "^6.24.1", + "babel-helper-replace-supers": "^6.24.1", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-computed-properties": { @@ -682,8 +976,8 @@ "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", "dev": true, "requires": { - "babel-runtime": "6.25.0", - "babel-template": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-destructuring": { @@ -692,7 +986,7 @@ "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", "dev": true, "requires": { - "babel-runtime": "6.25.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-duplicate-keys": { @@ -701,8 +995,8 @@ "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", "dev": true, "requires": { - "babel-runtime": "6.25.0", - "babel-types": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-for-of": { @@ -711,7 +1005,7 @@ "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", "dev": true, "requires": { - "babel-runtime": "6.25.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-function-name": { @@ -720,9 +1014,9 @@ "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", "dev": true, "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.25.0", - "babel-types": "6.25.0" + "babel-helper-function-name": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-literals": { @@ -731,7 +1025,7 @@ "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", "dev": true, "requires": { - "babel-runtime": "6.25.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-modules-amd": { @@ -740,9 +1034,9 @@ "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", "dev": true, "requires": { - "babel-plugin-transform-es2015-modules-commonjs": "6.24.1", - "babel-runtime": "6.25.0", - "babel-template": "6.25.0" + "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-modules-commonjs": { @@ -751,10 +1045,10 @@ "integrity": "sha1-0+MQtA72ZKNmIiAAl8bUQCmPK/4=", "dev": true, "requires": { - "babel-plugin-transform-strict-mode": "6.24.1", - "babel-runtime": "6.25.0", - "babel-template": "6.25.0", - "babel-types": "6.25.0" + "babel-plugin-transform-strict-mode": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-modules-systemjs": { @@ -763,9 +1057,9 @@ "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", "dev": true, "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.25.0", - "babel-template": "6.25.0" + "babel-helper-hoist-variables": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-modules-umd": { @@ -774,9 +1068,9 @@ "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", "dev": true, "requires": { - "babel-plugin-transform-es2015-modules-amd": "6.24.1", - "babel-runtime": "6.25.0", - "babel-template": "6.25.0" + "babel-plugin-transform-es2015-modules-amd": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1" } }, "babel-plugin-transform-es2015-object-super": { @@ -785,8 +1079,8 @@ "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", "dev": true, "requires": { - "babel-helper-replace-supers": "6.24.1", - "babel-runtime": "6.25.0" + "babel-helper-replace-supers": "^6.24.1", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-parameters": { @@ -795,12 +1089,12 @@ "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", "dev": true, "requires": { - "babel-helper-call-delegate": "6.24.1", - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.25.0", - "babel-template": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0" + "babel-helper-call-delegate": "^6.24.1", + "babel-helper-get-function-arity": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-template": "^6.24.1", + "babel-traverse": "^6.24.1", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-shorthand-properties": { @@ -809,8 +1103,8 @@ "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", "dev": true, "requires": { - "babel-runtime": "6.25.0", - "babel-types": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-spread": { @@ -819,7 +1113,7 @@ "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", "dev": true, "requires": { - "babel-runtime": "6.25.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-sticky-regex": { @@ -828,9 +1122,9 @@ "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", "dev": true, "requires": { - "babel-helper-regex": "6.24.1", - "babel-runtime": "6.25.0", - "babel-types": "6.25.0" + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-plugin-transform-es2015-template-literals": { @@ -839,7 +1133,7 @@ "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", "dev": true, "requires": { - "babel-runtime": "6.25.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-typeof-symbol": { @@ -848,7 +1142,7 @@ "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", "dev": true, "requires": { - "babel-runtime": "6.25.0" + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-es2015-unicode-regex": { @@ -857,9 +1151,9 @@ "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", "dev": true, "requires": { - "babel-helper-regex": "6.24.1", - "babel-runtime": "6.25.0", - "regexpu-core": "2.0.0" + "babel-helper-regex": "^6.24.1", + "babel-runtime": "^6.22.0", + "regexpu-core": "^2.0.0" } }, "babel-plugin-transform-exponentiation-operator": { @@ -868,9 +1162,9 @@ "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", "dev": true, "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", - "babel-plugin-syntax-exponentiation-operator": "6.13.0", - "babel-runtime": "6.25.0" + "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1", + "babel-plugin-syntax-exponentiation-operator": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-export-extensions": { @@ -879,8 +1173,8 @@ "integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=", "dev": true, "requires": { - "babel-plugin-syntax-export-extensions": "6.13.0", - "babel-runtime": "6.25.0" + "babel-plugin-syntax-export-extensions": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-flow-strip-types": { @@ -889,8 +1183,8 @@ "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=", "dev": true, "requires": { - "babel-plugin-syntax-flow": "6.18.0", - "babel-runtime": "6.25.0" + "babel-plugin-syntax-flow": "^6.18.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-object-rest-spread": { @@ -899,8 +1193,8 @@ "integrity": "sha1-h11ryb52HFiirj/u5dxIldjH+SE=", "dev": true, "requires": { - "babel-plugin-syntax-object-rest-spread": "6.13.0", - "babel-runtime": "6.25.0" + "babel-plugin-syntax-object-rest-spread": "^6.8.0", + "babel-runtime": "^6.22.0" } }, "babel-plugin-transform-regenerator": { @@ -918,8 +1212,8 @@ "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", "dev": true, "requires": { - "babel-runtime": "6.25.0", - "babel-types": "6.25.0" + "babel-runtime": "^6.22.0", + "babel-types": "^6.24.1" } }, "babel-polyfill": { @@ -928,9 +1222,9 @@ "integrity": "sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0=", "dev": true, "requires": { - "babel-runtime": "6.25.0", - "core-js": "2.5.0", - "regenerator-runtime": "0.10.5" + "babel-runtime": "^6.22.0", + "core-js": "^2.4.0", + "regenerator-runtime": "^0.10.0" } }, "babel-preset-es2015": { @@ -939,30 +1233,30 @@ "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=", "dev": true, "requires": { - "babel-plugin-check-es2015-constants": "6.22.0", - "babel-plugin-transform-es2015-arrow-functions": "6.22.0", - "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0", - "babel-plugin-transform-es2015-block-scoping": "6.24.1", - "babel-plugin-transform-es2015-classes": "6.24.1", - "babel-plugin-transform-es2015-computed-properties": "6.24.1", - "babel-plugin-transform-es2015-destructuring": "6.23.0", - "babel-plugin-transform-es2015-duplicate-keys": "6.24.1", - "babel-plugin-transform-es2015-for-of": "6.23.0", - "babel-plugin-transform-es2015-function-name": "6.24.1", - "babel-plugin-transform-es2015-literals": "6.22.0", - "babel-plugin-transform-es2015-modules-amd": "6.24.1", - "babel-plugin-transform-es2015-modules-commonjs": "6.24.1", - "babel-plugin-transform-es2015-modules-systemjs": "6.24.1", - "babel-plugin-transform-es2015-modules-umd": "6.24.1", - "babel-plugin-transform-es2015-object-super": "6.24.1", - "babel-plugin-transform-es2015-parameters": "6.24.1", - "babel-plugin-transform-es2015-shorthand-properties": "6.24.1", - "babel-plugin-transform-es2015-spread": "6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "6.24.1", - "babel-plugin-transform-es2015-template-literals": "6.22.0", - "babel-plugin-transform-es2015-typeof-symbol": "6.23.0", - "babel-plugin-transform-es2015-unicode-regex": "6.24.1", - "babel-plugin-transform-regenerator": "6.24.1" + "babel-plugin-check-es2015-constants": "^6.22.0", + "babel-plugin-transform-es2015-arrow-functions": "^6.22.0", + "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0", + "babel-plugin-transform-es2015-block-scoping": "^6.24.1", + "babel-plugin-transform-es2015-classes": "^6.24.1", + "babel-plugin-transform-es2015-computed-properties": "^6.24.1", + "babel-plugin-transform-es2015-destructuring": "^6.22.0", + "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1", + "babel-plugin-transform-es2015-for-of": "^6.22.0", + "babel-plugin-transform-es2015-function-name": "^6.24.1", + "babel-plugin-transform-es2015-literals": "^6.22.0", + "babel-plugin-transform-es2015-modules-amd": "^6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", + "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1", + "babel-plugin-transform-es2015-modules-umd": "^6.24.1", + "babel-plugin-transform-es2015-object-super": "^6.24.1", + "babel-plugin-transform-es2015-parameters": "^6.24.1", + "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1", + "babel-plugin-transform-es2015-spread": "^6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "^6.24.1", + "babel-plugin-transform-es2015-template-literals": "^6.22.0", + "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0", + "babel-plugin-transform-es2015-unicode-regex": "^6.24.1", + "babel-plugin-transform-regenerator": "^6.24.1" } }, "babel-preset-stage-1": { @@ -971,9 +1265,9 @@ "integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=", "dev": true, "requires": { - "babel-plugin-transform-class-constructor-call": "6.24.1", - "babel-plugin-transform-export-extensions": "6.22.0", - "babel-preset-stage-2": "6.24.1" + "babel-plugin-transform-class-constructor-call": "^6.24.1", + "babel-plugin-transform-export-extensions": "^6.22.0", + "babel-preset-stage-2": "^6.24.1" } }, "babel-preset-stage-2": { @@ -982,10 +1276,10 @@ "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=", "dev": true, "requires": { - "babel-plugin-syntax-dynamic-import": "6.18.0", - "babel-plugin-transform-class-properties": "6.24.1", - "babel-plugin-transform-decorators": "6.24.1", - "babel-preset-stage-3": "6.24.1" + "babel-plugin-syntax-dynamic-import": "^6.18.0", + "babel-plugin-transform-class-properties": "^6.24.1", + "babel-plugin-transform-decorators": "^6.24.1", + "babel-preset-stage-3": "^6.24.1" } }, "babel-preset-stage-3": { @@ -994,11 +1288,11 @@ "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=", "dev": true, "requires": { - "babel-plugin-syntax-trailing-function-commas": "6.22.0", - "babel-plugin-transform-async-generator-functions": "6.24.1", - "babel-plugin-transform-async-to-generator": "6.24.1", - "babel-plugin-transform-exponentiation-operator": "6.24.1", - "babel-plugin-transform-object-rest-spread": "6.23.0" + "babel-plugin-syntax-trailing-function-commas": "^6.22.0", + "babel-plugin-transform-async-generator-functions": "^6.24.1", + "babel-plugin-transform-async-to-generator": "^6.24.1", + "babel-plugin-transform-exponentiation-operator": "^6.24.1", + "babel-plugin-transform-object-rest-spread": "^6.22.0" } }, "babel-register": { @@ -1007,13 +1301,13 @@ "integrity": "sha1-fhDhOi9xBlvfrVoXh7pFvKbe118=", "dev": true, "requires": { - "babel-core": "6.25.0", - "babel-runtime": "6.25.0", - "core-js": "2.5.0", - "home-or-tmp": "2.0.0", - "lodash": "4.17.4", - "mkdirp": "0.5.1", - "source-map-support": "0.4.15" + "babel-core": "^6.24.1", + "babel-runtime": "^6.22.0", + "core-js": "^2.4.0", + "home-or-tmp": "^2.0.0", + "lodash": "^4.2.0", + "mkdirp": "^0.5.1", + "source-map-support": "^0.4.2" } }, "babel-runtime": { @@ -1022,8 +1316,8 @@ "integrity": "sha1-M7mOql1IK7AajRqmtDetKwGuxBw=", "dev": true, "requires": { - "core-js": "2.5.0", - "regenerator-runtime": "0.10.5" + "core-js": "^2.4.0", + "regenerator-runtime": "^0.10.0" } }, "babel-template": { @@ -1032,11 +1326,11 @@ "integrity": "sha1-ZlJBFmt8KqTGGdceGSlpVSsQwHE=", "dev": true, "requires": { - "babel-runtime": "6.25.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0", - "babylon": "6.17.4", - "lodash": "4.17.4" + "babel-runtime": "^6.22.0", + "babel-traverse": "^6.25.0", + "babel-types": "^6.25.0", + "babylon": "^6.17.2", + "lodash": "^4.2.0" } }, "babel-traverse": { @@ -1045,15 +1339,15 @@ "integrity": "sha1-IldJfi/NGbie3BPEyROB+VEklvE=", "dev": true, "requires": { - "babel-code-frame": "6.22.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.25.0", - "babel-types": "6.25.0", - "babylon": "6.17.4", - "debug": "2.6.8", - "globals": "9.18.0", - "invariant": "2.2.2", - "lodash": "4.17.4" + "babel-code-frame": "^6.22.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.22.0", + "babel-types": "^6.25.0", + "babylon": "^6.17.2", + "debug": "^2.2.0", + "globals": "^9.0.0", + "invariant": "^2.2.0", + "lodash": "^4.2.0" } }, "babel-types": { @@ -1062,10 +1356,10 @@ "integrity": "sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4=", "dev": true, "requires": { - "babel-runtime": "6.25.0", - "esutils": "2.0.2", - "lodash": "4.17.4", - "to-fast-properties": "1.0.3" + "babel-runtime": "^6.22.0", + "esutils": "^2.0.2", + "lodash": "^4.2.0", + "to-fast-properties": "^1.0.1" } }, "babelify": { @@ -1074,8 +1368,8 @@ "integrity": "sha1-qlau3nBn/XvVSWZu4W3ChQh+iOU=", "dev": true, "requires": { - "babel-core": "6.25.0", - "object-assign": "4.1.1" + "babel-core": "^6.0.14", + "object-assign": "^4.0.0" } }, "babylon": { @@ -1090,6 +1384,12 @@ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true }, + "base-64": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz", + "integrity": "sha1-eAqZyE59YAJgNhURxId2E78k9rs=", + "dev": true + }, "base-x": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/base-x/-/base-x-1.1.0.tgz", @@ -1103,7 +1403,7 @@ "dev": true, "optional": true, "requires": { - "tweetnacl": "0.14.5" + "tweetnacl": "^0.14.3" } }, "big.js": { @@ -1114,6 +1414,7 @@ }, "bignumber.js": { "version": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", + "from": "bignumber.js@git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", "dev": true }, "binary-extensions": { @@ -1140,10 +1441,10 @@ "integrity": "sha1-QOc/cGdMJn8UjNv4N08qUL4Waw0=", "dev": true, "requires": { - "create-hash": "1.1.3", - "pbkdf2": "3.0.13", - "randombytes": "2.0.5", - "unorm": "1.4.1" + "create-hash": "^1.1.0", + "pbkdf2": "^3.0.0", + "randombytes": "^2.0.1", + "unorm": "^1.3.3" } }, "bip66": { @@ -1152,7 +1453,7 @@ "integrity": "sha1-AfqHSHhcpwlV1QESF9GzE5lpyiI=", "dev": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "^5.0.1" } }, "bl": { @@ -1161,22 +1462,78 @@ "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=", "dev": true, "requires": { - "readable-stream": "2.3.3" + "readable-stream": "^2.0.5" } }, + "bluebird": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", + "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", + "dev": true + }, "bn.js": { "version": "4.11.8", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", "dev": true }, + "body-parser": { + "version": "1.18.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz", + "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=", + "dev": true, + "requires": { + "bytes": "3.0.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "~1.6.3", + "iconv-lite": "0.4.23", + "on-finished": "~2.3.0", + "qs": "6.5.2", + "raw-body": "2.3.3", + "type-is": "~1.6.16" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "iconv-lite": { + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", + "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "dev": true + } + } + }, + "boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", + "dev": true + }, "boom": { "version": "2.10.1", "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", "dev": true, "requires": { - "hoek": "2.16.3" + "hoek": "2.x.x" } }, "brace-expansion": { @@ -1185,7 +1542,7 @@ "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -1195,9 +1552,9 @@ "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", "dev": true, "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" + "expand-range": "^1.8.1", + "preserve": "^0.2.0", + "repeat-element": "^1.1.2" } }, "brorand": { @@ -1218,11 +1575,11 @@ "integrity": "sha1-Xncl297x/Vkw1OurSFZ85FHEigo=", "dev": true, "requires": { - "buffer-xor": "1.0.3", - "cipher-base": "1.0.4", - "create-hash": "1.1.3", - "evp_bytestokey": "1.0.0", - "inherits": "2.0.3" + "buffer-xor": "^1.0.2", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.0", + "inherits": "^2.0.1" } }, "browserify-sha3": { @@ -1231,7 +1588,7 @@ "integrity": "sha1-P/NKMAbvFcD7NWflQbkaI0ASPRE=", "dev": true, "requires": { - "js-sha3": "0.3.1" + "js-sha3": "^0.3.1" } }, "bs58": { @@ -1240,7 +1597,7 @@ "integrity": "sha1-1MJjiL9IBMrHFBQbGUWqR+XrJI4=", "dev": true, "requires": { - "base-x": "1.1.0" + "base-x": "^1.1.0" } }, "bs58check": { @@ -1249,8 +1606,8 @@ "integrity": "sha1-xSVABzdJEXcU+gQsMEfrj5FRy/g=", "dev": true, "requires": { - "bs58": "3.1.0", - "create-hash": "1.1.3" + "bs58": "^3.1.0", + "create-hash": "^1.1.0" } }, "buffer-from": { @@ -1259,6 +1616,12 @@ "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==", "dev": true }, + "buffer-to-arraybuffer": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/buffer-to-arraybuffer/-/buffer-to-arraybuffer-0.0.5.tgz", + "integrity": "sha1-YGSkD6dutDxyOrqe+PbhIW0QURo=", + "dev": true + }, "buffer-xor": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", @@ -1271,6 +1634,12 @@ "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", "dev": true }, + "bytes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", + "dev": true + }, "cacheable-request": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz", @@ -1300,7 +1669,7 @@ "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", "dev": true, "requires": { - "callsites": "0.2.0" + "callsites": "^0.2.0" } }, "callsites": { @@ -1328,8 +1697,8 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" } }, "chai": { @@ -1338,12 +1707,12 @@ "integrity": "sha1-ZuISeebzxkFf+CMYeCJ5AOIXGzk=", "dev": true, "requires": { - "assertion-error": "1.0.2", - "check-error": "1.0.2", - "deep-eql": "2.0.2", - "get-func-name": "2.0.0", - "pathval": "1.1.0", - "type-detect": "4.0.3" + "assertion-error": "^1.0.1", + "check-error": "^1.0.1", + "deep-eql": "^2.0.1", + "get-func-name": "^2.0.0", + "pathval": "^1.0.0", + "type-detect": "^4.0.0" } }, "chai-as-promised": { @@ -1352,7 +1721,7 @@ "integrity": "sha512-azL6xMoi+uxu6z4rhWQ1jbdUhOMhis2PvscD/xjLqNMkv3BPPp2JyyuTHOrf9BOosGpNQ11v6BKv/g57RXbiaA==", "dev": true, "requires": { - "check-error": "1.0.2" + "check-error": "^1.0.2" } }, "chai-bignumber": { @@ -1367,11 +1736,11 @@ "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "dev": true, "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" } }, "chardet": { @@ -1392,7 +1761,21 @@ "integrity": "sha1-BOTLUWuRQziTWB5tRgGnjpVS6gY=", "dev": true, "requires": { - "functional-red-black-tree": "1.0.1" + "functional-red-black-tree": "^1.0.1" + } + }, + "cheerio": { + "version": "1.0.0-rc.2", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.2.tgz", + "integrity": "sha1-S59TqBsn5NXawxwP/Qz6A8xoMNs=", + "dev": true, + "requires": { + "css-select": "~1.2.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "^3.9.1", + "lodash": "^4.15.0", + "parse5": "^3.0.1" } }, "chokidar": { @@ -1401,15 +1784,15 @@ "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", "dev": true, "requires": { - "anymatch": "1.3.2", - "async-each": "1.0.1", - "fsevents": "1.2.3", - "glob-parent": "2.0.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "2.0.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0" + "anymatch": "^1.3.0", + "async-each": "^1.0.0", + "fsevents": "^1.0.0", + "glob-parent": "^2.0.0", + "inherits": "^2.0.1", + "is-binary-path": "^1.0.0", + "is-glob": "^2.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.0.0" } }, "chownr": { @@ -1424,8 +1807,8 @@ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", "dev": true, "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.1" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, "circular-json": { @@ -1440,7 +1823,7 @@ "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", "dev": true, "requires": { - "restore-cursor": "2.0.0" + "restore-cursor": "^2.0.0" } }, "cli-spinners": { @@ -1473,7 +1856,7 @@ "dev": true, "requires": { "slice-ansi": "0.0.4", - "string-width": "1.0.2" + "string-width": "^1.0.1" }, "dependencies": { "slice-ansi": { @@ -1496,9 +1879,9 @@ "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wrap-ansi": "^2.0.0" } }, "clone": { @@ -1519,7 +1902,7 @@ "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=", "dev": true, "requires": { - "mimic-response": "1.0.0" + "mimic-response": "^1.0.0" } }, "clone-stats": { @@ -1534,9 +1917,9 @@ "integrity": "sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==", "dev": true, "requires": { - "inherits": "2.0.3", - "process-nextick-args": "2.0.0", - "readable-stream": "2.3.6" + "inherits": "^2.0.1", + "process-nextick-args": "^2.0.0", + "readable-stream": "^2.3.5" }, "dependencies": { "process-nextick-args": { @@ -1551,13 +1934,13 @@ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "string_decoder": { @@ -1566,7 +1949,7 @@ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } } } @@ -1589,8 +1972,8 @@ "integrity": "sha1-zbYzY6lhUCQEolr7gsLibV/2J6Q=", "dev": true, "requires": { - "bs58": "2.0.1", - "create-hash": "1.1.3" + "bs58": "^2.0.1", + "create-hash": "^1.1.1" }, "dependencies": { "bs58": { @@ -1607,9 +1990,15 @@ "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", "dev": true, "requires": { - "color-name": "1.1.3" + "color-name": "^1.1.1" } }, + "color-logger": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/color-logger/-/color-logger-0.0.6.tgz", + "integrity": "sha1-5WJF7ymCJlcRDHy3WpzXhstp7Rs=", + "dev": true + }, "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", @@ -1628,7 +2017,7 @@ "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", "dev": true, "requires": { - "delayed-stream": "1.0.0" + "delayed-stream": "~1.0.0" } }, "commander": { @@ -1643,6 +2032,12 @@ "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", "dev": true }, + "component-emitter": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz", + "integrity": "sha1-zNETqGOI0GSC0D3j/H35hSa6jv4=", + "dev": true + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -1655,9 +2050,9 @@ "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", "dev": true, "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.3", - "typedarray": "0.0.6" + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" } }, "console-control-strings": { @@ -1672,12 +2067,36 @@ "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", "dev": true }, + "content-disposition": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", + "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=", + "dev": true + }, + "content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "dev": true + }, "convert-source-map": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz", "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=", "dev": true }, + "cookie": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", + "dev": true + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", + "dev": true + }, "core-js": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.0.tgz", @@ -1690,6 +2109,16 @@ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", "dev": true }, + "cors": { + "version": "2.8.4", + "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.4.tgz", + "integrity": "sha1-K9OB8usgECAQXNUOpZ2mMJBpRoY=", + "dev": true, + "requires": { + "object-assign": "^4", + "vary": "^1" + } + }, "coveralls": { "version": "2.13.1", "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-2.13.1.tgz", @@ -1711,16 +2140,51 @@ } } }, + "cpr": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/cpr/-/cpr-0.4.3.tgz", + "integrity": "sha1-CiPktuwj87jMekBey1z9x3j33iU=", + "dev": true, + "requires": { + "graceful-fs": "~4.1.2", + "mkdirp": "~0.5.0", + "rimraf": "~2.4.3" + }, + "dependencies": { + "glob": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "dev": true, + "requires": { + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "rimraf": { + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", + "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=", + "dev": true, + "requires": { + "glob": "^6.0.1" + } + } + } + }, "create-hash": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=", "dev": true, "requires": { - "cipher-base": "1.0.4", - "inherits": "2.0.3", - "ripemd160": "2.0.1", - "sha.js": "2.4.8" + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "sha.js": "^2.4.0" } }, "create-hmac": { @@ -1729,12 +2193,12 @@ "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=", "dev": true, "requires": { - "cipher-base": "1.0.4", - "create-hash": "1.1.3", - "inherits": "2.0.3", - "ripemd160": "2.0.1", - "safe-buffer": "5.1.1", - "sha.js": "2.4.8" + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, "cross-spawn": { @@ -1743,9 +2207,9 @@ "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "lru-cache": "4.1.1", - "shebang-command": "1.2.0", - "which": "1.3.0" + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" }, "dependencies": { "lru-cache": { @@ -1754,8 +2218,8 @@ "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", "dev": true, "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } } } @@ -1766,7 +2230,7 @@ "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", "dev": true, "requires": { - "boom": "2.10.1" + "boom": "2.x.x" } }, "crypto-js": { @@ -1775,6 +2239,40 @@ "integrity": "sha1-cV8HC/YBTyrpkqmLOSkli3E/CNU=", "dev": true }, + "css-select": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", + "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", + "dev": true, + "requires": { + "boolbase": "~1.0.0", + "css-what": "2.1", + "domutils": "1.5.1", + "nth-check": "~1.0.1" + } + }, + "css-what": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz", + "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=", + "dev": true + }, + "cssom": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz", + "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=", + "dev": true + }, + "cssstyle": { + "version": "0.2.37", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz", + "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=", + "dev": true, + "optional": true, + "requires": { + "cssom": "0.3.x" + } + }, "dargs": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/dargs/-/dargs-5.1.0.tgz", @@ -1787,7 +2285,7 @@ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "dev": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" }, "dependencies": { "assert-plus": { @@ -1843,7 +2341,7 @@ "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=", "dev": true, "requires": { - "mimic-response": "1.0.0" + "mimic-response": "^1.0.0" } }, "deep-eql": { @@ -1852,7 +2350,7 @@ "integrity": "sha1-sbrAblbwp2d3aG1Qyf63XC7XZ5o=", "dev": true, "requires": { - "type-detect": "3.0.0" + "type-detect": "^3.0.0" }, "dependencies": { "type-detect": { @@ -1887,7 +2385,7 @@ "integrity": "sha512-uukrWD2bguRtXilKt6cAWKyoXrTSMo5m7crUdLfWQmu8kIm88w3QZoUL+6nhpfKVmhHANER6Re3sKoNoZ3IKMA==", "dev": true, "requires": { - "abstract-leveldown": "2.6.2" + "abstract-leveldown": "~2.6.0" } }, "define-properties": { @@ -1896,8 +2394,8 @@ "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", "dev": true, "requires": { - "foreach": "2.0.5", - "object-keys": "1.0.11" + "foreach": "^2.0.5", + "object-keys": "^1.0.8" }, "dependencies": { "object-keys": { @@ -1920,13 +2418,13 @@ "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", "dev": true, "requires": { - "globby": "5.0.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.0", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "rimraf": "2.6.1" + "globby": "^5.0.0", + "is-path-cwd": "^1.0.0", + "is-path-in-cwd": "^1.0.0", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "rimraf": "^2.2.8" } }, "delayed-stream": { @@ -1941,6 +2439,18 @@ "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", "dev": true }, + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", + "dev": true + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", + "dev": true + }, "detect-conflict": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/detect-conflict/-/detect-conflict-1.0.1.tgz", @@ -1953,7 +2463,7 @@ "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "diff": { @@ -1968,7 +2478,25 @@ "integrity": "sha512-y0tm5Pq6ywp3qSTZ1vPgVdAnbDEoeoc5wlOHXoY1c4Wug/a7JvqHIl7BTvwodaHmejWkK/9dSb3sCYfyo/om8A==", "dev": true, "requires": { - "esutils": "2.0.2" + "esutils": "^2.0.2" + } + }, + "dom-serializer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", + "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", + "dev": true, + "requires": { + "domelementtype": "~1.1.1", + "entities": "~1.1.1" + }, + "dependencies": { + "domelementtype": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", + "dev": true + } } }, "dom-walk": { @@ -1977,11 +2505,35 @@ "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=", "dev": true }, + "domelementtype": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", + "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", + "dev": true + }, + "domhandler": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", + "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", + "dev": true, + "requires": { + "domelementtype": "1" + } + }, + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "dev": true, + "requires": { + "dom-serializer": "0", + "domelementtype": "1" + } + }, "dotenv": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz", - "integrity": "sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=", - "dev": true + "integrity": "sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=" }, "drbg.js": { "version": "1.0.1", @@ -1989,9 +2541,9 @@ "integrity": "sha1-Pja2xCs3BDgjzbwzLVjzHiRFSAs=", "dev": true, "requires": { - "browserify-aes": "1.0.6", - "create-hash": "1.1.3", - "create-hmac": "1.1.6" + "browserify-aes": "^1.0.6", + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4" } }, "duplexer3": { @@ -2000,6 +2552,12 @@ "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", "dev": true }, + "easy-stack": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/easy-stack/-/easy-stack-1.0.0.tgz", + "integrity": "sha1-EskbMIWjfwuqM26UhurEv5Tj54g=", + "dev": true + }, "ecc-jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", @@ -2007,7 +2565,7 @@ "dev": true, "optional": true, "requires": { - "jsbn": "0.1.1" + "jsbn": "~0.1.0" } }, "editions": { @@ -2016,6 +2574,12 @@ "integrity": "sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==", "dev": true }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", + "dev": true + }, "ejs": { "version": "2.5.8", "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.5.8.tgz", @@ -2034,13 +2598,13 @@ "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", "dev": true, "requires": { - "bn.js": "4.11.8", - "brorand": "1.1.0", - "hash.js": "1.1.3", - "hmac-drbg": "1.0.1", - "inherits": "2.0.3", - "minimalistic-assert": "1.0.0", - "minimalistic-crypto-utils": "1.0.1" + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" } }, "emojis-list": { @@ -2049,13 +2613,19 @@ "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", "dev": true }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", + "dev": true + }, "encoding": { "version": "0.1.12", "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", "dev": true, "requires": { - "iconv-lite": "0.4.18" + "iconv-lite": "~0.4.13" } }, "end-of-stream": { @@ -2064,9 +2634,15 @@ "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=", "dev": true, "requires": { - "once": "1.4.0" + "once": "^1.4.0" } }, + "entities": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", + "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", + "dev": true + }, "envinfo": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-4.4.2.tgz", @@ -2079,7 +2655,7 @@ "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=", "dev": true, "requires": { - "prr": "0.0.0" + "prr": "~0.0.0" }, "dependencies": { "prr": { @@ -2096,8 +2672,8 @@ "integrity": "sha1-pfdf/02ZJhJt2sDqXcOOaJFTywI=", "dev": true, "requires": { - "string-template": "0.2.1", - "xtend": "4.0.1" + "string-template": "~0.2.1", + "xtend": "~4.0.0" } }, "error-ex": { @@ -2106,7 +2682,7 @@ "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", "dev": true, "requires": { - "is-arrayish": "0.2.1" + "is-arrayish": "^0.2.1" } }, "es-abstract": { @@ -2115,11 +2691,11 @@ "integrity": "sha512-Cf9/h5MrXtExM20gSS55YFrGKCyPrRBjIVBtVyy8vmlsDfe0NPKMWj65tPLgzyfPuapWxh5whpXCtW4+AW5mRg==", "dev": true, "requires": { - "es-to-primitive": "1.1.1", - "function-bind": "1.1.0", - "has": "1.0.1", - "is-callable": "1.1.3", - "is-regex": "1.0.4" + "es-to-primitive": "^1.1.1", + "function-bind": "^1.1.0", + "has": "^1.0.1", + "is-callable": "^1.1.3", + "is-regex": "^1.0.4" } }, "es-to-primitive": { @@ -2128,11 +2704,17 @@ "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", "dev": true, "requires": { - "is-callable": "1.1.3", - "is-date-object": "1.0.1", - "is-symbol": "1.0.1" + "is-callable": "^1.1.1", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.1" } }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", + "dev": true + }, "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", @@ -2145,11 +2727,11 @@ "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", "dev": true, "requires": { - "esprima": "2.7.3", - "estraverse": "1.9.3", - "esutils": "2.0.2", - "optionator": "0.8.2", - "source-map": "0.2.0" + "esprima": "^2.7.1", + "estraverse": "^1.9.1", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.2.0" }, "dependencies": { "source-map": { @@ -2159,54 +2741,191 @@ "dev": true, "optional": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } }, + "esdoc": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/esdoc/-/esdoc-1.1.0.tgz", + "integrity": "sha512-vsUcp52XJkOWg9m1vDYplGZN2iDzvmjDL5M/Mp8qkoDG3p2s0yIQCIjKR5wfPBaM3eV14a6zhQNYiNTCVzPnxA==", + "dev": true, + "requires": { + "babel-generator": "6.26.1", + "babel-traverse": "6.26.0", + "babylon": "6.18.0", + "cheerio": "1.0.0-rc.2", + "color-logger": "0.0.6", + "escape-html": "1.0.3", + "fs-extra": "5.0.0", + "ice-cap": "0.0.4", + "marked": "0.3.19", + "minimist": "1.2.0", + "taffydb": "2.7.3" + }, + "dependencies": { + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "dev": true, + "requires": { + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" + } + }, + "babel-generator": { + "version": "6.26.1", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", + "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", + "dev": true, + "requires": { + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.7", + "trim-right": "^1.0.1" + } + }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + } + }, + "babel-traverse": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", + "dev": true, + "requires": { + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" + } + }, + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", + "dev": true, + "requires": { + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" + } + }, + "babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "dev": true + }, + "fs-extra": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-5.0.0.tgz", + "integrity": "sha512-66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "jsesc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", + "dev": true + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, "eslint": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-4.12.0.tgz", "integrity": "sha512-Ohv4NU0FffkEe4so8DBrdfRUbGUtM4XnBTDll2pY7OdW3VkjBOZPerx3Bmuhg6S6D6r8+cli0EezN0xawUfYwg==", "dev": true, "requires": { - "ajv": "5.5.0", - "babel-code-frame": "6.22.0", - "chalk": "2.3.0", - "concat-stream": "1.6.0", - "cross-spawn": "5.1.0", - "debug": "3.1.0", - "doctrine": "2.0.2", - "eslint-scope": "3.7.1", - "espree": "3.5.2", - "esquery": "1.0.0", - "estraverse": "4.2.0", - "esutils": "2.0.2", - "file-entry-cache": "2.0.0", - "functional-red-black-tree": "1.0.1", - "glob": "7.1.2", - "globals": "11.0.1", - "ignore": "3.3.7", - "imurmurhash": "0.1.4", - "inquirer": "3.3.0", - "is-resolvable": "1.0.0", - "js-yaml": "3.10.0", - "json-stable-stringify-without-jsonify": "1.0.1", - "levn": "0.3.0", - "lodash": "4.17.4", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "natural-compare": "1.4.0", - "optionator": "0.8.2", - "path-is-inside": "1.0.2", - "pluralize": "7.0.0", - "progress": "2.0.0", - "require-uncached": "1.0.3", - "semver": "5.4.1", - "strip-ansi": "4.0.0", - "strip-json-comments": "2.0.1", - "table": "4.0.2", - "text-table": "0.2.0" + "ajv": "^5.3.0", + "babel-code-frame": "^6.22.0", + "chalk": "^2.1.0", + "concat-stream": "^1.6.0", + "cross-spawn": "^5.1.0", + "debug": "^3.0.1", + "doctrine": "^2.0.2", + "eslint-scope": "^3.7.1", + "espree": "^3.5.2", + "esquery": "^1.0.0", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "file-entry-cache": "^2.0.0", + "functional-red-black-tree": "^1.0.1", + "glob": "^7.1.2", + "globals": "^11.0.1", + "ignore": "^3.3.3", + "imurmurhash": "^0.1.4", + "inquirer": "^3.0.6", + "is-resolvable": "^1.0.0", + "js-yaml": "^3.9.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.3.0", + "lodash": "^4.17.4", + "minimatch": "^3.0.2", + "mkdirp": "^0.5.1", + "natural-compare": "^1.4.0", + "optionator": "^0.8.2", + "path-is-inside": "^1.0.2", + "pluralize": "^7.0.0", + "progress": "^2.0.0", + "require-uncached": "^1.0.3", + "semver": "^5.3.0", + "strip-ansi": "^4.0.0", + "strip-json-comments": "~2.0.1", + "table": "^4.0.1", + "text-table": "~0.2.0" }, "dependencies": { "ajv": { @@ -2215,10 +2934,10 @@ "integrity": "sha1-6yhAdG6dxIvV4GOjbj/UAMXqtak=", "dev": true, "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.0.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, "ansi-regex": { @@ -2233,7 +2952,7 @@ "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", "dev": true, "requires": { - "color-convert": "1.9.1" + "color-convert": "^1.9.0" } }, "chalk": { @@ -2242,9 +2961,9 @@ "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", "dev": true, "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" + "ansi-styles": "^3.1.0", + "escape-string-regexp": "^1.0.5", + "supports-color": "^4.0.0" } }, "debug": { @@ -2286,8 +3005,8 @@ "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", "dev": true, "requires": { - "argparse": "1.0.9", - "esprima": "4.0.0" + "argparse": "^1.0.7", + "esprima": "^4.0.0" } }, "strip-ansi": { @@ -2296,7 +3015,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "supports-color": { @@ -2305,7 +3024,7 @@ "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", "dev": true, "requires": { - "has-flag": "2.0.0" + "has-flag": "^2.0.0" } } } @@ -2322,8 +3041,8 @@ "integrity": "sha512-yUtXS15gIcij68NmXmP9Ni77AQuCN0itXbCc/jWd8C6/yKZaSNXicpC8cgvjnxVdmfsosIXrjpzFq7GcDryb6A==", "dev": true, "requires": { - "debug": "2.6.8", - "resolve": "1.4.0" + "debug": "^2.6.8", + "resolve": "^1.2.0" } }, "eslint-module-utils": { @@ -2332,8 +3051,8 @@ "integrity": "sha512-jDI/X5l/6D1rRD/3T43q8Qgbls2nq5km5KSqiwlyUbGo5+04fXhMKdCPhjwbqAa6HXWaMxj8Q4hQDIh7IadJQw==", "dev": true, "requires": { - "debug": "2.6.8", - "pkg-dir": "1.0.0" + "debug": "^2.6.8", + "pkg-dir": "^1.0.0" } }, "eslint-plugin-import": { @@ -2342,16 +3061,16 @@ "integrity": "sha512-Rf7dfKJxZ16QuTgVv1OYNxkZcsu/hULFnC+e+w0Gzi6jMC3guQoWQgxYxc54IDRinlb6/0v5z/PxxIKmVctN+g==", "dev": true, "requires": { - "builtin-modules": "1.1.1", - "contains-path": "0.1.0", - "debug": "2.6.8", + "builtin-modules": "^1.1.1", + "contains-path": "^0.1.0", + "debug": "^2.6.8", "doctrine": "1.5.0", - "eslint-import-resolver-node": "0.3.1", - "eslint-module-utils": "2.1.1", - "has": "1.0.1", - "lodash.cond": "4.5.2", - "minimatch": "3.0.4", - "read-pkg-up": "2.0.0" + "eslint-import-resolver-node": "^0.3.1", + "eslint-module-utils": "^2.1.1", + "has": "^1.0.1", + "lodash.cond": "^4.3.0", + "minimatch": "^3.0.3", + "read-pkg-up": "^2.0.0" }, "dependencies": { "doctrine": { @@ -2360,8 +3079,8 @@ "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", "dev": true, "requires": { - "esutils": "2.0.2", - "isarray": "1.0.0" + "esutils": "^2.0.2", + "isarray": "^1.0.0" } }, "find-up": { @@ -2370,7 +3089,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "load-json-file": { @@ -2379,10 +3098,10 @@ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" } }, "path-type": { @@ -2391,7 +3110,7 @@ "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", "dev": true, "requires": { - "pify": "2.3.0" + "pify": "^2.0.0" } }, "read-pkg": { @@ -2400,9 +3119,9 @@ "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", "dev": true, "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.4.0", - "path-type": "2.0.0" + "load-json-file": "^2.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^2.0.0" } }, "read-pkg-up": { @@ -2411,8 +3130,8 @@ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", "dev": true, "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" + "find-up": "^2.0.0", + "read-pkg": "^2.0.0" } }, "strip-bom": { @@ -2429,9 +3148,9 @@ "integrity": "sha512-xhPXrh0Vl/b7870uEbaumb2Q+LxaEcOQ3kS1jtIXanBAwpMre1l5q/l2l/hESYJGEFKuI78bp6Uw50hlpr7B+g==", "dev": true, "requires": { - "ignore": "3.3.7", - "minimatch": "3.0.4", - "resolve": "1.4.0", + "ignore": "^3.3.6", + "minimatch": "^3.0.4", + "resolve": "^1.3.3", "semver": "5.3.0" }, "dependencies": { @@ -2461,8 +3180,8 @@ "integrity": "sha1-PWPD7f2gLgbgGkUq2IyqzHzctug=", "dev": true, "requires": { - "esrecurse": "4.2.0", - "estraverse": "4.2.0" + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" }, "dependencies": { "estraverse": { @@ -2479,8 +3198,8 @@ "integrity": "sha512-sadKeYwaR/aJ3stC2CdvgXu1T16TdYN+qwCpcWbMnGJ8s0zNWemzrvb2GbD4OhmJ/fwpJjudThAlLobGbWZbCQ==", "dev": true, "requires": { - "acorn": "5.2.1", - "acorn-jsx": "3.0.1" + "acorn": "^5.2.1", + "acorn-jsx": "^3.0.0" }, "dependencies": { "acorn": { @@ -2503,7 +3222,7 @@ "integrity": "sha1-z7qLV9f7qT8XKYqKAGoEzaE9gPo=", "dev": true, "requires": { - "estraverse": "4.2.0" + "estraverse": "^4.0.0" }, "dependencies": { "estraverse": { @@ -2520,8 +3239,8 @@ "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", "dev": true, "requires": { - "estraverse": "4.2.0", - "object-assign": "4.1.1" + "estraverse": "^4.1.0", + "object-assign": "^4.0.1" }, "dependencies": { "estraverse": { @@ -2544,20 +3263,41 @@ "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", "dev": true }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", + "dev": true + }, + "eth-lib": { + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/eth-lib/-/eth-lib-0.1.27.tgz", + "integrity": "sha512-B8czsfkJYzn2UIEMwjc7Mbj+Cy72V+/OXH/tb44LV8jhrjizQJJ325xMOMyk3+ETa6r6oi0jsUY14+om8mQMWA==", + "dev": true, + "requires": { + "bn.js": "^4.11.6", + "elliptic": "^6.4.0", + "keccakjs": "^0.2.1", + "nano-json-stream-parser": "^0.1.2", + "servify": "^0.1.12", + "ws": "^3.0.0", + "xhr-request-promise": "^0.1.2" + } + }, "ethereum-common": { "version": "0.0.16", "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.0.16.tgz", "integrity": "sha1-mh4Wnq00q3XgifUMpRK/0PvRJlU=", "dev": true }, - "ethereumjs-account": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/ethereumjs-account/-/ethereumjs-account-2.0.4.tgz", - "integrity": "sha1-+MMCMby3B/RRTYoFLB+doQNiTUc=", + "ethereumjs-abi": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/ethereumjs-abi/-/ethereumjs-abi-0.6.5.tgz", + "integrity": "sha1-WmN+8Wq0NHP6cqKa2QhxQFs/UkE=", "dev": true, "requires": { - "ethereumjs-util": "4.5.0", - "rlp": "2.0.0" + "bn.js": "^4.10.0", + "ethereumjs-util": "^4.3.0" }, "dependencies": { "ethereumjs-util": { @@ -2566,11 +3306,36 @@ "integrity": "sha1-PpQosxfuvaPXJg2FT93alUsfG8Y=", "dev": true, "requires": { - "bn.js": "4.11.8", - "create-hash": "1.1.3", - "keccakjs": "0.2.1", - "rlp": "2.0.0", - "secp256k1": "3.3.0" + "bn.js": "^4.8.0", + "create-hash": "^1.1.2", + "keccakjs": "^0.2.0", + "rlp": "^2.0.0", + "secp256k1": "^3.0.1" + } + } + } + }, + "ethereumjs-account": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/ethereumjs-account/-/ethereumjs-account-2.0.4.tgz", + "integrity": "sha1-+MMCMby3B/RRTYoFLB+doQNiTUc=", + "dev": true, + "requires": { + "ethereumjs-util": "^4.0.1", + "rlp": "^2.0.0" + }, + "dependencies": { + "ethereumjs-util": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-4.5.0.tgz", + "integrity": "sha1-PpQosxfuvaPXJg2FT93alUsfG8Y=", + "dev": true, + "requires": { + "bn.js": "^4.8.0", + "create-hash": "^1.1.2", + "keccakjs": "^0.2.0", + "rlp": "^2.0.0", + "secp256k1": "^3.0.1" } } } @@ -2581,11 +3346,11 @@ "integrity": "sha1-LsdTSlkCG47JuDww5JaQxuuu3aE=", "dev": true, "requires": { - "async": "1.5.2", + "async": "^1.5.2", "ethereum-common": "0.0.16", - "ethereumjs-tx": "1.1.2", - "ethereumjs-util": "4.5.0", - "merkle-patricia-tree": "2.1.2" + "ethereumjs-tx": "^1.0.0", + "ethereumjs-util": "^4.0.1", + "merkle-patricia-tree": "^2.1.2" }, "dependencies": { "ethereumjs-util": { @@ -2594,11 +3359,11 @@ "integrity": "sha1-PpQosxfuvaPXJg2FT93alUsfG8Y=", "dev": true, "requires": { - "bn.js": "4.11.8", - "create-hash": "1.1.3", - "keccakjs": "0.2.1", - "rlp": "2.0.0", - "secp256k1": "3.3.0" + "bn.js": "^4.8.0", + "create-hash": "^1.1.2", + "keccakjs": "^0.2.0", + "rlp": "^2.0.0", + "secp256k1": "^3.0.1" } } } @@ -2609,8 +3374,8 @@ "integrity": "sha512-dBTav4AZQ7zuajmICv1k7bEesqS+8f0u0wciXNUJZb842RTBi0lgKEDF8WgZshzv4ThI+XVQSRNV/A+seiK4aA==", "dev": true, "requires": { - "source-map-support": "0.5.5", - "webpack-cli": "2.0.14" + "source-map-support": "^0.5.3", + "webpack-cli": "^2.0.9" }, "dependencies": { "source-map": { @@ -2620,13 +3385,13 @@ "dev": true }, "source-map-support": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.5.tgz", - "integrity": "sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA==", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz", + "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==", "dev": true, "requires": { - "buffer-from": "1.0.0", - "source-map": "0.6.1" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" } } } @@ -2637,8 +3402,8 @@ "integrity": "sha1-wVFHfGIF0YYGAOKRCMPqyul+Kfo=", "dev": true, "requires": { - "ethereum-common": "0.0.17", - "ethereumjs-util": "4.5.0" + "ethereum-common": "^0.0.17", + "ethereumjs-util": "^4.5.0" }, "dependencies": { "ethereum-common": { @@ -2653,11 +3418,11 @@ "integrity": "sha1-PpQosxfuvaPXJg2FT93alUsfG8Y=", "dev": true, "requires": { - "bn.js": "4.11.8", - "create-hash": "1.1.3", - "keccakjs": "0.2.1", - "rlp": "2.0.0", - "secp256k1": "3.3.0" + "bn.js": "^4.8.0", + "create-hash": "^1.1.2", + "keccakjs": "^0.2.0", + "rlp": "^2.0.0", + "secp256k1": "^3.0.1" } } } @@ -2668,14 +3433,14 @@ "integrity": "sha1-JboCFcu0wvCxCKb5avKi5i5Fkh8=", "dev": true, "requires": { - "babel-preset-es2015": "6.24.1", - "babelify": "7.3.0", - "bn.js": "4.11.8", - "create-hash": "1.1.3", - "ethjs-util": "0.1.4", - "keccak": "1.3.0", - "rlp": "2.0.0", - "secp256k1": "3.3.0" + "babel-preset-es2015": "^6.24.0", + "babelify": "^7.3.0", + "bn.js": "^4.8.0", + "create-hash": "^1.1.2", + "ethjs-util": "^0.1.3", + "keccak": "^1.0.2", + "rlp": "^2.0.0", + "secp256k1": "^3.0.1" } }, "ethereumjs-wallet": { @@ -2684,13 +3449,13 @@ "integrity": "sha1-gnY7Fpfuenlr5xVdqd+0my+Yz9s=", "dev": true, "requires": { - "aes-js": "0.2.4", - "bs58check": "1.3.4", - "ethereumjs-util": "4.5.0", - "hdkey": "0.7.1", - "scrypt.js": "0.2.0", - "utf8": "2.1.2", - "uuid": "2.0.3" + "aes-js": "^0.2.3", + "bs58check": "^1.0.8", + "ethereumjs-util": "^4.4.0", + "hdkey": "^0.7.0", + "scrypt.js": "^0.2.0", + "utf8": "^2.1.1", + "uuid": "^2.0.1" }, "dependencies": { "ethereumjs-util": { @@ -2699,11 +3464,11 @@ "integrity": "sha1-PpQosxfuvaPXJg2FT93alUsfG8Y=", "dev": true, "requires": { - "bn.js": "4.11.8", - "create-hash": "1.1.3", - "keccakjs": "0.2.1", - "rlp": "2.0.0", - "secp256k1": "3.3.0" + "bn.js": "^4.8.0", + "create-hash": "^1.1.2", + "keccakjs": "^0.2.0", + "rlp": "^2.0.0", + "secp256k1": "^3.0.1" } }, "uuid": { @@ -2739,6 +3504,24 @@ } } }, + "ethjs-unit": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/ethjs-unit/-/ethjs-unit-0.1.6.tgz", + "integrity": "sha1-xmWSHkduh7ziqdWIpv4EBbLEFpk=", + "dev": true, + "requires": { + "bn.js": "4.11.6", + "number-to-bn": "1.7.0" + }, + "dependencies": { + "bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", + "dev": true + } + } + }, "ethjs-util": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.4.tgz", @@ -2749,13 +3532,287 @@ "strip-hex-prefix": "1.0.0" } }, + "ethpm": { + "version": "0.0.15", + "resolved": "https://registry.npmjs.org/ethpm/-/ethpm-0.0.15.tgz", + "integrity": "sha512-nf6Im5HIN8WGqmpaxLnIQl73C5aY2K6foz6PDi0WoSaMd00TapeH8O5y608YICudOGDLCGGyRd1wqf078LoZJA==", + "dev": true, + "requires": { + "async": "^2.1.2", + "ethpm-spec": "^1.0.1", + "fs-extra": "^1.0.0", + "glob": "^7.1.1", + "ipfs-mini": "^1.1.2", + "jsonschema": "^1.1.1", + "lodash": "^4.17.1", + "node-dir": "^0.1.16", + "promisify-node": "^0.4.0", + "semver": "^5.3.0", + "wget-improved": "^1.4.0" + }, + "dependencies": { + "async": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", + "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "dev": true, + "requires": { + "lodash": "^4.14.0" + } + }, + "fs-extra": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz", + "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0" + } + }, + "node-dir": { + "version": "0.1.17", + "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", + "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=", + "dev": true, + "requires": { + "minimatch": "^3.0.2" + } + } + } + }, + "ethpm-registry": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/ethpm-registry/-/ethpm-registry-0.0.10.tgz", + "integrity": "sha512-VXrC26KUL18pC0TPe2ZP9BeihXz/Ewy8qJjDVUatxiK9bKJcEuuIjRUJ8eFHvFxCGLhTq0US0CDnjWQJfac4hA==", + "dev": true, + "requires": { + "fs-extra": "^2.0.0", + "left-pad": "^1.1.3", + "semver": "^5.3.0", + "solidity-sha3": "^0.4.1", + "truffle-artifactor": "^2.1.2", + "truffle-contract": "^1.1.6", + "web3": "^0.18.2" + }, + "dependencies": { + "bignumber.js": { + "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git", + "dev": true + }, + "bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", + "dev": true + }, + "ethjs-abi": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.1.8.tgz", + "integrity": "sha1-zSiFg+1ijN+tr4re+juh28vKbBg=", + "dev": true, + "requires": { + "bn.js": "4.11.6", + "js-sha3": "0.5.5", + "number-to-bn": "1.7.0" + } + }, + "fs-extra": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz", + "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0" + } + }, + "js-sha3": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz", + "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=", + "dev": true + }, + "truffle-artifactor": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/truffle-artifactor/-/truffle-artifactor-2.1.5.tgz", + "integrity": "sha1-k51sszOYS1ZSmFDgPD3aykkAaHA=", + "dev": true, + "requires": { + "async": "^1.5.2", + "fs-extra": "^1.0.0", + "lodash": "^4.11.2", + "truffle-contract": "^2.0.3", + "truffle-contract-schema": "^0.0.5" + }, + "dependencies": { + "fs-extra": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz", + "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0" + } + }, + "truffle-contract": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/truffle-contract/-/truffle-contract-2.0.5.tgz", + "integrity": "sha512-ItnN85wh4qVYPg6T4CpubI40c8dWEArtUcWcDoZ7xzj9DL7cwxqstJ0yRxyQIh4u8SRSlrOtm1dh0B7R8jtG+w==", + "dev": true, + "requires": { + "ethjs-abi": "0.1.8", + "truffle-blockchain-utils": "^0.0.3", + "truffle-contract-schema": "^0.0.5", + "web3": "^0.20.1" + } + }, + "web3": { + "version": "0.20.6", + "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.6.tgz", + "integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=", + "dev": true, + "requires": { + "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "crypto-js": "^3.1.4", + "utf8": "^2.1.1", + "xhr2": "*", + "xmlhttprequest": "*" + } + } + } + }, + "truffle-blockchain-utils": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/truffle-blockchain-utils/-/truffle-blockchain-utils-0.0.3.tgz", + "integrity": "sha1-rooRHsEk2WUE8OBCxvIFwLOBfik=", + "dev": true, + "requires": { + "web3": "^0.20.1" + }, + "dependencies": { + "web3": { + "version": "0.20.6", + "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.6.tgz", + "integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=", + "dev": true, + "requires": { + "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "crypto-js": "^3.1.4", + "utf8": "^2.1.1", + "xhr2": "*", + "xmlhttprequest": "*" + } + } + } + }, + "truffle-contract": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/truffle-contract/-/truffle-contract-1.1.11.tgz", + "integrity": "sha1-zh+nh/eXdYr/Vy9F6LEXRSf27ao=", + "dev": true, + "requires": { + "ethjs-abi": "0.1.8", + "truffle-blockchain-utils": "0.0.1", + "truffle-contract-schema": "0.0.5", + "web3": "^0.16.0" + }, + "dependencies": { + "bignumber.js": { + "version": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", + "from": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", + "dev": true + }, + "truffle-blockchain-utils": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/truffle-blockchain-utils/-/truffle-blockchain-utils-0.0.1.tgz", + "integrity": "sha1-B6WOVbsFVaZCCMkRnAsE/+FGSqQ=", + "dev": true, + "requires": { + "web3": "^0.18.0" + }, + "dependencies": { + "web3": { + "version": "0.18.4", + "resolved": "https://registry.npmjs.org/web3/-/web3-0.18.4.tgz", + "integrity": "sha1-gewXhBRUkfLqqJVbMcBgSeB8Xn0=", + "dev": true, + "requires": { + "bignumber.js": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", + "crypto-js": "^3.1.4", + "utf8": "^2.1.1", + "xhr2": "*", + "xmlhttprequest": "*" + } + } + } + }, + "web3": { + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/web3/-/web3-0.16.0.tgz", + "integrity": "sha1-pFVBdc1GKUMDWx8dOUMvdBxrYBk=", + "dev": true, + "requires": { + "bignumber.js": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9", + "crypto-js": "^3.1.4", + "utf8": "^2.1.1", + "xmlhttprequest": "*" + }, + "dependencies": { + "bignumber.js": { + "version": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9", + "from": "git+https://github.com/debris/bignumber.js.git#master", + "dev": true + } + } + } + } + }, + "truffle-contract-schema": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/truffle-contract-schema/-/truffle-contract-schema-0.0.5.tgz", + "integrity": "sha1-Xp0gvQvyon/pQxB0gknUhO7kmWE=", + "dev": true, + "requires": { + "crypto-js": "^3.1.9-1" + }, + "dependencies": { + "crypto-js": { + "version": "3.1.9-1", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz", + "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=", + "dev": true + } + } + } + } + }, + "ethpm-spec": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ethpm-spec/-/ethpm-spec-1.0.1.tgz", + "integrity": "sha1-rTwJrgSSrT0+x7lLf1/YBX1N65E=", + "dev": true, + "requires": { + "json-schema-to-markdown": "^1.0.3" + } + }, + "event-pubsub": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/event-pubsub/-/event-pubsub-4.3.0.tgz", + "integrity": "sha512-z7IyloorXvKbFx9Bpie2+vMJKKx1fH1EN5yiTfp8CiLOTptSYy1g8H4yDpGlEdshL1PBiFtBHepF2cNsqeEeFQ==", + "dev": true + }, "evp_bytestokey": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz", "integrity": "sha1-SXtmrZ/vZc18CKYYCCS6FHa2blM=", "dev": true, "requires": { - "create-hash": "1.1.3" + "create-hash": "^1.1.1" } }, "execa": { @@ -2764,13 +3821,13 @@ "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } }, "exit-hook": { @@ -2785,7 +3842,7 @@ "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", "dev": true, "requires": { - "is-posix-bracket": "0.1.1" + "is-posix-bracket": "^0.1.0" } }, "expand-range": { @@ -2794,7 +3851,7 @@ "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "dev": true, "requires": { - "fill-range": "2.2.3" + "fill-range": "^2.1.0" } }, "expand-template": { @@ -2809,7 +3866,139 @@ "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", "dev": true, "requires": { - "homedir-polyfill": "1.0.1" + "homedir-polyfill": "^1.0.1" + } + }, + "express": { + "version": "4.16.3", + "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz", + "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=", + "dev": true, + "requires": { + "accepts": "~1.3.5", + "array-flatten": "1.1.1", + "body-parser": "1.18.2", + "content-disposition": "0.5.2", + "content-type": "~1.0.4", + "cookie": "0.3.1", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.1.1", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.2", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.3", + "qs": "6.5.1", + "range-parser": "~1.2.0", + "safe-buffer": "5.1.1", + "send": "0.16.2", + "serve-static": "1.13.2", + "setprototypeof": "1.1.0", + "statuses": "~1.4.0", + "type-is": "~1.6.16", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "dependencies": { + "body-parser": { + "version": "1.18.2", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz", + "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", + "dev": true, + "requires": { + "bytes": "3.0.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.1", + "http-errors": "~1.6.2", + "iconv-lite": "0.4.19", + "on-finished": "~2.3.0", + "qs": "6.5.1", + "raw-body": "2.3.2", + "type-is": "~1.6.15" + } + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "finalhandler": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", + "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", + "dev": true, + "requires": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.2", + "statuses": "~1.4.0", + "unpipe": "~1.0.0" + } + }, + "iconv-lite": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", + "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", + "dev": true + }, + "qs": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", + "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", + "dev": true + }, + "raw-body": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz", + "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=", + "dev": true, + "requires": { + "bytes": "3.0.0", + "http-errors": "1.6.2", + "iconv-lite": "0.4.19", + "unpipe": "1.0.0" + }, + "dependencies": { + "depd": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", + "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", + "dev": true + }, + "http-errors": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", + "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", + "dev": true, + "requires": { + "depd": "1.1.1", + "inherits": "2.0.3", + "setprototypeof": "1.0.3", + "statuses": ">= 1.3.1 < 2" + } + }, + "setprototypeof": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", + "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=", + "dev": true + } + } + } } }, "extend": { @@ -2824,9 +4013,9 @@ "integrity": "sha512-E44iT5QVOUJBKij4IIV3uvxuNlbKS38Tw1HiupxEIHPv9qtC2PrDYohbXV5U+1jnfIXttny8gUhj+oZvflFlzA==", "dev": true, "requires": { - "chardet": "0.4.2", - "iconv-lite": "0.4.18", - "tmp": "0.0.33" + "chardet": "^0.4.0", + "iconv-lite": "^0.4.17", + "tmp": "^0.0.33" } }, "extglob": { @@ -2835,7 +4024,7 @@ "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "extsprintf": { @@ -2850,7 +4039,7 @@ "integrity": "sha1-S4w6z7Ugr635hgsfFM2M40As3dM=", "dev": true, "requires": { - "checkpoint-store": "1.1.0" + "checkpoint-store": "^1.1.0" } }, "fast-deep-equal": { @@ -2877,7 +4066,7 @@ "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", "dev": true, "requires": { - "escape-string-regexp": "1.0.5" + "escape-string-regexp": "^1.0.5" } }, "file-entry-cache": { @@ -2886,8 +4075,8 @@ "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", "dev": true, "requires": { - "flat-cache": "1.3.0", - "object-assign": "4.1.1" + "flat-cache": "^1.2.1", + "object-assign": "^4.0.1" } }, "filename-regex": { @@ -2902,11 +4091,40 @@ "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", "dev": true, "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "1.1.7", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" + "is-number": "^2.1.0", + "isobject": "^2.0.0", + "randomatic": "^1.1.3", + "repeat-element": "^1.1.2", + "repeat-string": "^1.5.2" + } + }, + "finalhandler": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz", + "integrity": "sha1-haF8bFmpRxfSYtYSMNSw6+PUoU0=", + "dev": true, + "requires": { + "debug": "~2.2.0", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "unpipe": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "dev": true, + "requires": { + "ms": "0.7.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", + "dev": true + } } }, "find-up": { @@ -2915,8 +4133,8 @@ "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" + "path-exists": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "first-chunk-stream": { @@ -2925,7 +4143,7 @@ "integrity": "sha1-G97NuOCDwGZLkZRVgVd6Q6nzHXA=", "dev": true, "requires": { - "readable-stream": "2.3.3" + "readable-stream": "^2.0.2" } }, "flat-cache": { @@ -2934,10 +4152,10 @@ "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=", "dev": true, "requires": { - "circular-json": "0.3.3", - "del": "2.2.2", - "graceful-fs": "4.1.11", - "write": "0.2.1" + "circular-json": "^0.3.1", + "del": "^2.0.2", + "graceful-fs": "^4.1.2", + "write": "^0.2.1" } }, "flow-parser": { @@ -2952,7 +4170,7 @@ "integrity": "sha1-LEBFC5NI6X8oEyJZO6lnBLmr1NQ=", "dev": true, "requires": { - "is-function": "1.0.1" + "is-function": "~1.0.0" } }, "for-in": { @@ -2967,7 +4185,7 @@ "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", "dev": true, "requires": { - "for-in": "1.0.2" + "for-in": "^1.0.1" } }, "foreach": { @@ -2988,34 +4206,58 @@ "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", "dev": true, "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.16" + "asynckit": "^0.4.0", + "combined-stream": "^1.0.5", + "mime-types": "^2.1.12" } }, + "forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "dev": true + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", + "dev": true + }, "from2": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", "dev": true, "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.3" + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" } }, + "fs": { + "version": "0.0.1-security", + "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz", + "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ=", + "dev": true + }, "fs-extra": { "version": "0.30.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "jsonfile": "2.4.0", - "klaw": "1.3.1", - "path-is-absolute": "1.0.1", - "rimraf": "2.6.1" + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0", + "path-is-absolute": "^1.0.0", + "rimraf": "^2.2.8" } }, + "fs-readdir-recursive": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz", + "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==", + "dev": true + }, "fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -3029,8 +4271,8 @@ "dev": true, "optional": true, "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.9.1" + "nan": "^2.9.2", + "node-pre-gyp": "^0.9.0" }, "dependencies": { "abbrev": { @@ -3056,8 +4298,8 @@ "dev": true, "optional": true, "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" } }, "balanced-match": { @@ -3070,7 +4312,7 @@ "bundled": true, "dev": true, "requires": { - "balanced-match": "1.0.0", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, @@ -3134,7 +4376,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "fs.realpath": { @@ -3149,14 +4391,14 @@ "dev": true, "optional": true, "requires": { - "aproba": "1.2.0", - "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" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "glob": { @@ -3165,12 +4407,12 @@ "dev": true, "optional": 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" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "has-unicode": { @@ -3185,7 +4427,7 @@ "dev": true, "optional": true, "requires": { - "safer-buffer": "2.1.2" + "safer-buffer": "^2.1.0" } }, "ignore-walk": { @@ -3194,7 +4436,7 @@ "dev": true, "optional": true, "requires": { - "minimatch": "3.0.4" + "minimatch": "^3.0.4" } }, "inflight": { @@ -3203,8 +4445,8 @@ "dev": true, "optional": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -3223,7 +4465,7 @@ "bundled": true, "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "isarray": { @@ -3237,7 +4479,7 @@ "bundled": true, "dev": true, "requires": { - "brace-expansion": "1.1.11" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -3250,8 +4492,8 @@ "bundled": true, "dev": true, "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" + "safe-buffer": "^5.1.1", + "yallist": "^3.0.0" } }, "minizlib": { @@ -3260,7 +4502,7 @@ "dev": true, "optional": true, "requires": { - "minipass": "2.2.4" + "minipass": "^2.2.1" } }, "mkdirp": { @@ -3290,9 +4532,9 @@ "dev": true, "optional": true, "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" + "debug": "^2.1.2", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" } }, "node-pre-gyp": { @@ -3301,16 +4543,16 @@ "dev": true, "optional": true, "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "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" + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.0", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.1.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4" } }, "nopt": { @@ -3319,8 +4561,8 @@ "dev": true, "optional": true, "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" + "abbrev": "1", + "osenv": "^0.1.4" } }, "npm-bundled": { @@ -3335,8 +4577,8 @@ "dev": true, "optional": true, "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" } }, "npmlog": { @@ -3345,10 +4587,10 @@ "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" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" } }, "number-is-nan": { @@ -3367,7 +4609,7 @@ "bundled": true, "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "os-homedir": { @@ -3388,8 +4630,8 @@ "dev": true, "optional": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" } }, "path-is-absolute": { @@ -3410,10 +4652,10 @@ "dev": true, "optional": true, "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "~0.4.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -3430,13 +4672,13 @@ "dev": true, "optional": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" } }, "rimraf": { @@ -3445,7 +4687,7 @@ "dev": true, "optional": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "safe-buffer": { @@ -3488,9 +4730,9 @@ "bundled": true, "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string_decoder": { @@ -3499,7 +4741,7 @@ "dev": true, "optional": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "strip-ansi": { @@ -3507,7 +4749,7 @@ "bundled": true, "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-json-comments": { @@ -3522,13 +4764,13 @@ "dev": true, "optional": true, "requires": { - "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" + "chownr": "^1.0.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.2.4", + "minizlib": "^1.1.0", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.1", + "yallist": "^3.0.2" } }, "util-deprecate": { @@ -3543,7 +4785,7 @@ "dev": true, "optional": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2" } }, "wrappy": { @@ -3576,8 +4818,8 @@ "integrity": "sha512-FdTeyk4uLRHGeFiMe+Qnh4Hc5KiTVqvRVVvLDFJEVVKC1P1yHhEgZeh9sp1KhuvxSrxToxgJS25UapYQwH4zHw==", "dev": true, "requires": { - "source-map-support": "0.5.4", - "webpack-cli": "2.0.14" + "source-map-support": "^0.5.3", + "webpack-cli": "^2.0.9" }, "dependencies": { "source-map": { @@ -3592,7 +4834,7 @@ "integrity": "sha512-PETSPG6BjY1AHs2t64vS2aqAgu6dMIMXJULWFBGbh2Gr8nVLbCFDo6i/RMMvviIQ2h1Z8+5gQhVKSn2je9nmdg==", "dev": true, "requires": { - "source-map": "0.6.1" + "source-map": "^0.6.0" } } } @@ -3603,14 +4845,14 @@ "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, "requires": { - "aproba": "1.1.2", - "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" + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" } }, "generate-function": { @@ -3625,7 +4867,7 @@ "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", "dev": true, "requires": { - "is-property": "1.0.2" + "is-property": "^1.0.0" } }, "get-caller-file": { @@ -3640,6 +4882,12 @@ "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=", "dev": true }, + "get-params": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/get-params/-/get-params-0.1.2.tgz", + "integrity": "sha1-uuDfq6WIoMYNeDTA2Nwv9g7u8v4=", + "dev": true + }, "get-stream": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", @@ -3652,7 +4900,7 @@ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "dev": true, "requires": { - "assert-plus": "1.0.0" + "assert-plus": "^1.0.0" }, "dependencies": { "assert-plus": { @@ -3669,8 +4917,8 @@ "integrity": "sha512-F/mS+fsWQMo1zfgG9MD8KWvTWPPzzhuVwY++fhQ5Ggd+0P+CAMHtzMZhNxG+TqGfHDChJKsbh6otfMGqO2AKBw==", "dev": true, "requires": { - "got": "7.1.0", - "is-plain-obj": "1.1.0" + "got": "^7.0.0", + "is-plain-obj": "^1.1.0" }, "dependencies": { "got": { @@ -3679,20 +4927,20 @@ "integrity": "sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==", "dev": true, "requires": { - "decompress-response": "3.3.0", - "duplexer3": "0.1.4", - "get-stream": "3.0.0", - "is-plain-obj": "1.1.0", - "is-retry-allowed": "1.1.0", - "is-stream": "1.1.0", - "isurl": "1.0.0", - "lowercase-keys": "1.0.1", - "p-cancelable": "0.3.0", - "p-timeout": "1.2.1", - "safe-buffer": "5.1.1", - "timed-out": "4.0.1", - "url-parse-lax": "1.0.0", - "url-to-options": "1.0.1" + "decompress-response": "^3.2.0", + "duplexer3": "^0.1.4", + "get-stream": "^3.0.0", + "is-plain-obj": "^1.1.0", + "is-retry-allowed": "^1.0.0", + "is-stream": "^1.0.0", + "isurl": "^1.0.0-alpha5", + "lowercase-keys": "^1.0.0", + "p-cancelable": "^0.3.0", + "p-timeout": "^1.1.1", + "safe-buffer": "^5.0.1", + "timed-out": "^4.0.0", + "url-parse-lax": "^1.0.0", + "url-to-options": "^1.0.1" } }, "p-cancelable": { @@ -3707,7 +4955,7 @@ "integrity": "sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=", "dev": true, "requires": { - "p-finally": "1.0.0" + "p-finally": "^1.0.0" } }, "prepend-http": { @@ -3722,7 +4970,33 @@ "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", "dev": true, "requires": { - "prepend-http": "1.0.4" + "prepend-http": "^1.0.1" + } + } + } + }, + "github-download": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/github-download/-/github-download-0.5.0.tgz", + "integrity": "sha1-92R6cKrEMm+wkeV4bI9mrhV9pRs=", + "dev": true, + "requires": { + "adm-zip": "~0.4.3", + "fs-extra": "^0.24.0", + "request": "^2.12.0", + "vcsurl": "~0.1.0" + }, + "dependencies": { + "fs-extra": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.24.0.tgz", + "integrity": "sha1-1OQ0KpZnXLeEZjOmCZJJMytTmVI=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "path-is-absolute": "^1.0.0", + "rimraf": "^2.2.8" } } } @@ -3739,7 +5013,7 @@ "integrity": "sha1-y+KABBiDIG2kISrp5LXxacML9Bc=", "dev": true, "requires": { - "gh-got": "6.0.0" + "gh-got": "^6.0.0" } }, "glob": { @@ -3748,12 +5022,12 @@ "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "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" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "glob-all": { @@ -3762,8 +5036,8 @@ "integrity": "sha1-iRPd+17hrHgSZWJBsD1SF8ZLAqs=", "dev": true, "requires": { - "glob": "7.1.2", - "yargs": "1.2.6" + "glob": "^7.0.5", + "yargs": "~1.2.6" }, "dependencies": { "minimist": { @@ -3778,7 +5052,7 @@ "integrity": "sha1-nHtKgv1dWVsr8Xq23MQxNUMv40s=", "dev": true, "requires": { - "minimist": "0.1.0" + "minimist": "^0.1.0" } } } @@ -3789,8 +5063,8 @@ "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", "dev": true, "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" + "glob-parent": "^2.0.0", + "is-glob": "^2.0.0" } }, "glob-parent": { @@ -3799,7 +5073,7 @@ "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", "dev": true, "requires": { - "is-glob": "2.0.1" + "is-glob": "^2.0.0" } }, "global": { @@ -3808,8 +5082,8 @@ "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=", "dev": true, "requires": { - "min-document": "2.19.0", - "process": "0.5.2" + "min-document": "^2.19.0", + "process": "~0.5.1" } }, "global-modules": { @@ -3818,9 +5092,9 @@ "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", "dev": true, "requires": { - "global-prefix": "1.0.2", - "is-windows": "1.0.2", - "resolve-dir": "1.0.1" + "global-prefix": "^1.0.1", + "is-windows": "^1.0.1", + "resolve-dir": "^1.0.0" } }, "global-prefix": { @@ -3829,11 +5103,11 @@ "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", "dev": true, "requires": { - "expand-tilde": "2.0.2", - "homedir-polyfill": "1.0.1", - "ini": "1.3.4", - "is-windows": "1.0.2", - "which": "1.3.0" + "expand-tilde": "^2.0.2", + "homedir-polyfill": "^1.0.1", + "ini": "^1.3.4", + "is-windows": "^1.0.1", + "which": "^1.2.14" } }, "globals": { @@ -3848,12 +5122,12 @@ "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", "dev": true, "requires": { - "array-union": "1.0.2", - "arrify": "1.0.1", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "arrify": "^1.0.0", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "got": { @@ -3862,23 +5136,23 @@ "integrity": "sha512-kBNy/S2CGwrYgDSec5KTWGKUvupwkkTVAjIsVFF2shXO13xpZdFP4d4kxa//CLX2tN/rV0aYwK8vY6UKWGn2vQ==", "dev": true, "requires": { - "@sindresorhus/is": "0.7.0", - "cacheable-request": "2.1.4", - "decompress-response": "3.3.0", - "duplexer3": "0.1.4", - "get-stream": "3.0.0", - "into-stream": "3.1.0", - "is-retry-allowed": "1.1.0", - "isurl": "1.0.0", - "lowercase-keys": "1.0.1", - "mimic-response": "1.0.0", - "p-cancelable": "0.4.1", - "p-timeout": "2.0.1", - "pify": "3.0.0", - "safe-buffer": "5.1.1", - "timed-out": "4.0.1", - "url-parse-lax": "3.0.0", - "url-to-options": "1.0.1" + "@sindresorhus/is": "^0.7.0", + "cacheable-request": "^2.1.1", + "decompress-response": "^3.3.0", + "duplexer3": "^0.1.4", + "get-stream": "^3.0.0", + "into-stream": "^3.1.0", + "is-retry-allowed": "^1.1.0", + "isurl": "^1.0.0-alpha5", + "lowercase-keys": "^1.0.0", + "mimic-response": "^1.0.0", + "p-cancelable": "^0.4.0", + "p-timeout": "^2.0.1", + "pify": "^3.0.0", + "safe-buffer": "^5.1.1", + "timed-out": "^4.0.1", + "url-parse-lax": "^3.0.0", + "url-to-options": "^1.0.1" }, "dependencies": { "pify": { @@ -3901,13 +5175,22 @@ "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", "dev": true }, + "graphlib": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.5.tgz", + "integrity": "sha512-XvtbqCcw+EM5SqQrIetIKKD+uZVNQtDPD1goIg7K73RuRZtVI5rYMdcCVSHm/AS1sCBZ7vt0p5WgXouucHQaOA==", + "dev": true, + "requires": { + "lodash": "^4.11.1" + } + }, "grouped-queue": { "version": "0.3.3", "resolved": "https://registry.npmjs.org/grouped-queue/-/grouped-queue-0.3.3.tgz", "integrity": "sha1-wWfSpTGcWg4JZO9qJbfC34mWyFw=", "dev": true, "requires": { - "lodash": "4.17.4" + "lodash": "^4.17.2" } }, "growl": { @@ -3922,10 +5205,10 @@ "integrity": "sha1-Ywo13+ApS8KB7a5v/F0yn8eYLcw=", "dev": true, "requires": { - "async": "1.5.2", - "optimist": "0.6.1", - "source-map": "0.4.4", - "uglify-js": "2.8.29" + "async": "^1.4.0", + "optimist": "^0.6.1", + "source-map": "^0.4.4", + "uglify-js": "^2.6" }, "dependencies": { "source-map": { @@ -3934,21 +5217,27 @@ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "dev": true, "requires": { - "amdefine": "1.0.1" + "amdefine": ">=0.0.4" } } } }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "dev": true + }, "har-validator": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", "dev": true, "requires": { - "chalk": "1.1.3", - "commander": "2.11.0", - "is-my-json-valid": "2.16.0", - "pinkie-promise": "2.0.1" + "chalk": "^1.1.1", + "commander": "^2.9.0", + "is-my-json-valid": "^2.12.4", + "pinkie-promise": "^2.0.0" } }, "has": { @@ -3957,7 +5246,7 @@ "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=", "dev": true, "requires": { - "function-bind": "1.1.0" + "function-bind": "^1.0.2" } }, "has-ansi": { @@ -3966,7 +5255,7 @@ "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "has-color": { @@ -3993,7 +5282,7 @@ "integrity": "sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==", "dev": true, "requires": { - "has-symbol-support-x": "1.4.2" + "has-symbol-support-x": "^1.4.1" } }, "has-unicode": { @@ -4008,7 +5297,7 @@ "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=", "dev": true, "requires": { - "inherits": "2.0.3" + "inherits": "^2.0.1" } }, "hash.js": { @@ -4017,8 +5306,8 @@ "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", "dev": true, "requires": { - "inherits": "2.0.3", - "minimalistic-assert": "1.0.0" + "inherits": "^2.0.3", + "minimalistic-assert": "^1.0.0" } }, "hawk": { @@ -4027,10 +5316,10 @@ "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", "dev": true, "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" + "boom": "2.x.x", + "cryptiles": "2.x.x", + "hoek": "2.x.x", + "sntp": "1.x.x" } }, "hdkey": { @@ -4039,8 +5328,8 @@ "integrity": "sha1-yu5L6BqneSHpCbjSKN0PKayu5jI=", "dev": true, "requires": { - "coinstring": "2.3.0", - "secp256k1": "3.3.0" + "coinstring": "^2.0.0", + "secp256k1": "^3.0.1" } }, "he": { @@ -4055,9 +5344,9 @@ "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", "dev": true, "requires": { - "hash.js": "1.1.3", - "minimalistic-assert": "1.0.0", - "minimalistic-crypto-utils": "1.0.1" + "hash.js": "^1.0.3", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.1" } }, "hoek": { @@ -4072,8 +5361,8 @@ "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", "dev": true, "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.1" } }, "homedir-polyfill": { @@ -4082,7 +5371,7 @@ "integrity": "sha1-TCu8inWJmP7r9e1oWA921GdotLw=", "dev": true, "requires": { - "parse-passwd": "1.0.0" + "parse-passwd": "^1.0.0" } }, "hosted-git-info": { @@ -4091,21 +5380,133 @@ "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==", "dev": true }, + "htmlparser2": { + "version": "3.9.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", + "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", + "dev": true, + "requires": { + "domelementtype": "^1.3.0", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^2.0.2" + } + }, "http-cache-semantics": { "version": "3.8.1", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", "integrity": "sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==", "dev": true }, + "http-errors": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", + "dev": true, + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.0", + "statuses": ">= 1.4.0 < 2" + } + }, "http-signature": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", "dev": true, "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.1", - "sshpk": "1.13.1" + "assert-plus": "^0.2.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "ice-cap": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/ice-cap/-/ice-cap-0.0.4.tgz", + "integrity": "sha1-im0xq0ysjUtW3k+pRt8zUlYbbhg=", + "dev": true, + "requires": { + "cheerio": "0.20.0", + "color-logger": "0.0.3" + }, + "dependencies": { + "cheerio": { + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.20.0.tgz", + "integrity": "sha1-XHEPK6uVZTJyhCugHG6mGzVF7DU=", + "dev": true, + "requires": { + "css-select": "~1.2.0", + "dom-serializer": "~0.1.0", + "entities": "~1.1.1", + "htmlparser2": "~3.8.1", + "jsdom": "^7.0.2", + "lodash": "^4.1.0" + } + }, + "color-logger": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/color-logger/-/color-logger-0.0.3.tgz", + "integrity": "sha1-2bIt0dlz4Waxi/MT+fSBu6TfIBg=", + "dev": true + }, + "domhandler": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", + "integrity": "sha1-LeWaCCLVAn+r/28DLCsloqir5zg=", + "dev": true, + "requires": { + "domelementtype": "1" + } + }, + "htmlparser2": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz", + "integrity": "sha1-mWwosZFRaovoZQGn15dX5ccMEGg=", + "dev": true, + "requires": { + "domelementtype": "1", + "domhandler": "2.3", + "domutils": "1.5", + "entities": "1.0", + "readable-stream": "1.1" + }, + "dependencies": { + "entities": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz", + "integrity": "sha1-sph6o4ITR/zeZCsk/fyeT7cSvyY=", + "dev": true + } + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", + "isarray": "0.0.1", + "string_decoder": "~0.10.x" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } } }, "iconv-lite": { @@ -4132,8 +5533,8 @@ "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==", "dev": true, "requires": { - "pkg-dir": "2.0.0", - "resolve-cwd": "2.0.0" + "pkg-dir": "^2.0.0", + "resolve-cwd": "^2.0.0" }, "dependencies": { "find-up": { @@ -4142,7 +5543,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "pkg-dir": { @@ -4151,7 +5552,7 @@ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", "dev": true, "requires": { - "find-up": "2.1.0" + "find-up": "^2.1.0" } } } @@ -4168,7 +5569,7 @@ "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "dev": true, "requires": { - "repeating": "2.0.1" + "repeating": "^2.0.0" } }, "inflight": { @@ -4177,8 +5578,8 @@ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "dev": true, "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" + "once": "^1.3.0", + "wrappy": "1" } }, "inherits": { @@ -4199,20 +5600,20 @@ "integrity": "sha512-h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==", "dev": true, "requires": { - "ansi-escapes": "3.0.0", - "chalk": "2.3.0", - "cli-cursor": "2.1.0", - "cli-width": "2.2.0", - "external-editor": "2.1.0", - "figures": "2.0.0", - "lodash": "4.17.4", + "ansi-escapes": "^3.0.0", + "chalk": "^2.0.0", + "cli-cursor": "^2.1.0", + "cli-width": "^2.0.0", + "external-editor": "^2.0.4", + "figures": "^2.0.0", + "lodash": "^4.3.0", "mute-stream": "0.0.7", - "run-async": "2.3.0", - "rx-lite": "4.0.8", - "rx-lite-aggregates": "4.0.8", - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "through": "2.3.8" + "run-async": "^2.2.0", + "rx-lite": "^4.0.8", + "rx-lite-aggregates": "^4.0.8", + "string-width": "^2.1.0", + "strip-ansi": "^4.0.0", + "through": "^2.3.6" }, "dependencies": { "ansi-regex": { @@ -4227,7 +5628,7 @@ "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", "dev": true, "requires": { - "color-convert": "1.9.1" + "color-convert": "^1.9.0" } }, "chalk": { @@ -4236,9 +5637,9 @@ "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", "dev": true, "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" + "ansi-styles": "^3.1.0", + "escape-string-regexp": "^1.0.5", + "supports-color": "^4.0.0" } }, "has-flag": { @@ -4259,8 +5660,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -4269,7 +5670,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "supports-color": { @@ -4278,7 +5679,7 @@ "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", "dev": true, "requires": { - "has-flag": "2.0.0" + "has-flag": "^2.0.0" } } } @@ -4295,8 +5696,8 @@ "integrity": "sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=", "dev": true, "requires": { - "from2": "2.3.0", - "p-is-promise": "1.1.0" + "from2": "^2.1.1", + "p-is-promise": "^1.1.0" } }, "invariant": { @@ -4305,7 +5706,7 @@ "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", "dev": true, "requires": { - "loose-envify": "1.3.1" + "loose-envify": "^1.0.0" } }, "invert-kv": { @@ -4314,6 +5715,21 @@ "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", "dev": true }, + "ipaddr.js": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz", + "integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs=", + "dev": true + }, + "ipfs-mini": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/ipfs-mini/-/ipfs-mini-1.1.2.tgz", + "integrity": "sha1-nA+tP6AKgsgsrtGuBLO5ntOz6V0=", + "dev": true, + "requires": { + "xmlhttprequest": "^1.8.0" + } + }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", @@ -4326,7 +5742,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "1.11.0" + "binary-extensions": "^1.0.0" } }, "is-buffer": { @@ -4341,7 +5757,7 @@ "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", "dev": true, "requires": { - "builtin-modules": "1.1.1" + "builtin-modules": "^1.0.0" } }, "is-callable": { @@ -4368,7 +5784,7 @@ "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", "dev": true, "requires": { - "is-primitive": "2.0.0" + "is-primitive": "^2.0.0" } }, "is-extendable": { @@ -4389,7 +5805,7 @@ "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-fullwidth-code-point": { @@ -4398,7 +5814,7 @@ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, "requires": { - "number-is-nan": "1.0.1" + "number-is-nan": "^1.0.0" } }, "is-function": { @@ -4413,7 +5829,7 @@ "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", "dev": true, "requires": { - "is-extglob": "1.0.0" + "is-extglob": "^1.0.0" } }, "is-hex-prefixed": { @@ -4428,10 +5844,10 @@ "integrity": "sha1-8Hndm/2uZe4gOKrorLyGqxCeNpM=", "dev": true, "requires": { - "generate-function": "2.0.0", - "generate-object-property": "1.2.0", - "jsonpointer": "4.0.1", - "xtend": "4.0.1" + "generate-function": "^2.0.0", + "generate-object-property": "^1.1.0", + "jsonpointer": "^4.0.0", + "xtend": "^4.0.0" } }, "is-number": { @@ -4440,7 +5856,7 @@ "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" } }, "is-object": { @@ -4455,7 +5871,7 @@ "integrity": "sha1-s2ExHYPG5dcmyr9eJQsCNxBvWuI=", "dev": true, "requires": { - "symbol-observable": "0.2.4" + "symbol-observable": "^0.2.2" }, "dependencies": { "symbol-observable": { @@ -4478,7 +5894,7 @@ "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", "dev": true, "requires": { - "is-path-inside": "1.0.0" + "is-path-inside": "^1.0.0" } }, "is-path-inside": { @@ -4487,7 +5903,7 @@ "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=", "dev": true, "requires": { - "path-is-inside": "1.0.2" + "path-is-inside": "^1.0.1" } }, "is-plain-obj": { @@ -4526,7 +5942,7 @@ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", "dev": true, "requires": { - "has": "1.0.1" + "has": "^1.0.1" } }, "is-resolvable": { @@ -4535,7 +5951,7 @@ "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=", "dev": true, "requires": { - "tryit": "1.0.3" + "tryit": "^1.0.1" } }, "is-retry-allowed": { @@ -4550,7 +5966,7 @@ "integrity": "sha1-RJypgpnnEwOCViieyytUDcQ3yzA=", "dev": true, "requires": { - "scoped-regex": "1.0.0" + "scoped-regex": "^1.0.0" } }, "is-stream": { @@ -4610,8 +6026,8 @@ "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", "dev": true, "requires": { - "node-fetch": "1.7.2", - "whatwg-fetch": "2.0.3" + "node-fetch": "^1.0.1", + "whatwg-fetch": ">=0.10.0" } }, "isstream": { @@ -4626,20 +6042,20 @@ "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=", "dev": true, "requires": { - "abbrev": "1.0.9", - "async": "1.5.2", - "escodegen": "1.8.1", - "esprima": "2.7.3", - "glob": "5.0.15", - "handlebars": "4.0.11", - "js-yaml": "3.6.1", - "mkdirp": "0.5.1", - "nopt": "3.0.6", - "once": "1.4.0", - "resolve": "1.1.7", - "supports-color": "3.2.3", - "which": "1.3.0", - "wordwrap": "1.0.0" + "abbrev": "1.0.x", + "async": "1.x", + "escodegen": "1.8.x", + "esprima": "2.7.x", + "glob": "^5.0.15", + "handlebars": "^4.0.1", + "js-yaml": "3.x", + "mkdirp": "0.5.x", + "nopt": "3.x", + "once": "1.x", + "resolve": "1.1.x", + "supports-color": "^3.1.0", + "which": "^1.1.1", + "wordwrap": "^1.0.0" }, "dependencies": { "glob": { @@ -4648,11 +6064,11 @@ "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", "dev": true, "requires": { - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "2 || 3", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "resolve": { @@ -4667,7 +6083,7 @@ "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" } } } @@ -4678,9 +6094,9 @@ "integrity": "sha512-TS+hoFl8Z5FAFMK38nhBkdLt44CclNRgDHWeMgsV8ko3nDlr/9UI2Sf839sW7enijf8oKsZYXRvM8g0it9Zmcw==", "dev": true, "requires": { - "binaryextensions": "2.1.1", - "editions": "1.3.4", - "textextensions": "2.2.0" + "binaryextensions": "2", + "editions": "^1.3.3", + "textextensions": "2" } }, "isurl": { @@ -4689,8 +6105,8 @@ "integrity": "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==", "dev": true, "requires": { - "has-to-string-tag-x": "1.4.1", - "is-object": "1.0.1" + "has-to-string-tag-x": "^1.2.0", + "is-object": "^1.0.1" } }, "jade": { @@ -4717,6 +6133,21 @@ } } }, + "js-message": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/js-message/-/js-message-1.0.5.tgz", + "integrity": "sha1-IwDSSxrwjondCVvBpMnJz8uJLRU=", + "dev": true + }, + "js-queue": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/js-queue/-/js-queue-2.0.0.tgz", + "integrity": "sha1-NiITz4YPRo8BJfxslqvBdCUx+Ug=", + "dev": true, + "requires": { + "easy-stack": "^1.0.0" + } + }, "js-sha3": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.3.1.tgz", @@ -4741,10 +6172,16 @@ "integrity": "sha1-bl/mfYsgXOTSL60Ft3geja3MSzA=", "dev": true, "requires": { - "argparse": "1.0.9", - "esprima": "2.7.3" + "argparse": "^1.0.7", + "esprima": "^2.6.0" } }, + "jsan": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/jsan/-/jsan-3.1.10.tgz", + "integrity": "sha512-Rpme/mJFG3BlIM8/9L+0qAIGccx6dyYEODdkZUHYKyJI3NIl6d13buXa7aE3lO1kZAGMalG0/6QzalXdDdUc4g==", + "dev": true + }, "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", @@ -4758,21 +6195,21 @@ "integrity": "sha512-JAcQINNMFpdzzpKJN8k5xXjF3XDuckB1/48uScSzcnNyK199iWEc9AxKL9OoX5144M2w5zEx9Qs4/E/eBZZUlw==", "dev": true, "requires": { - "babel-plugin-transform-flow-strip-types": "6.22.0", - "babel-preset-es2015": "6.24.1", - "babel-preset-stage-1": "6.24.1", - "babel-register": "6.24.1", - "babylon": "7.0.0-beta.44", - "colors": "1.1.2", - "flow-parser": "0.69.0", - "lodash": "4.17.4", - "micromatch": "2.3.11", - "neo-async": "2.5.0", + "babel-plugin-transform-flow-strip-types": "^6.8.0", + "babel-preset-es2015": "^6.9.0", + "babel-preset-stage-1": "^6.5.0", + "babel-register": "^6.9.0", + "babylon": "^7.0.0-beta.30", + "colors": "^1.1.2", + "flow-parser": "^0.*", + "lodash": "^4.13.1", + "micromatch": "^2.3.7", + "neo-async": "^2.5.0", "node-dir": "0.1.8", - "nomnom": "1.8.1", - "recast": "0.14.7", - "temp": "0.8.3", - "write-file-atomic": "1.3.4" + "nomnom": "^1.8.1", + "recast": "^0.14.1", + "temp": "^0.8.1", + "write-file-atomic": "^1.2.0" }, "dependencies": { "babylon": { @@ -4783,6 +6220,39 @@ } } }, + "jsdom": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz", + "integrity": "sha1-QLQCdwwr2iNGkJa+6Rq2deOx/G4=", + "dev": true, + "optional": true, + "requires": { + "abab": "^1.0.0", + "acorn": "^2.4.0", + "acorn-globals": "^1.0.4", + "cssom": ">= 0.3.0 < 0.4.0", + "cssstyle": ">= 0.2.29 < 0.3.0", + "escodegen": "^1.6.1", + "nwmatcher": ">= 1.3.7 < 2.0.0", + "parse5": "^1.5.1", + "request": "^2.55.0", + "sax": "^1.1.4", + "symbol-tree": ">= 3.1.0 < 4.0.0", + "tough-cookie": "^2.2.0", + "webidl-conversions": "^2.0.0", + "whatwg-url-compat": "~0.6.5", + "xml-name-validator": ">= 2.0.1 < 3.0.0" + }, + "dependencies": { + "parse5": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz", + "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=", + "dev": true, + "optional": true + } + } + }, "jsesc": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", @@ -4801,12 +6271,27 @@ "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==", "dev": true }, + "json-pointer": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/json-pointer/-/json-pointer-0.6.0.tgz", + "integrity": "sha1-jlAFUKaqxUZKRzN32leqbMIoKNc=", + "dev": true, + "requires": { + "foreach": "^2.0.4" + } + }, "json-schema": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", "dev": true }, + "json-schema-to-markdown": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/json-schema-to-markdown/-/json-schema-to-markdown-1.0.3.tgz", + "integrity": "sha1-RBHKIisrZ2DmFmY/C7K9drsm67g=", + "dev": true + }, "json-schema-traverse": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", @@ -4843,7 +6328,7 @@ "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.6" } }, "jsonpointer": { @@ -4852,6 +6337,12 @@ "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", "dev": true }, + "jsonschema": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/jsonschema/-/jsonschema-1.2.4.tgz", + "integrity": "sha512-lz1nOH69GbsVHeVgEdvyavc/33oymY1AZwtePMiMj4HZPMbP5OIKK3zT9INMWjwua/V4Z4yq7wSlBbSG+g4AEw==", + "dev": true + }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -4878,11 +6369,11 @@ "integrity": "sha512-JgsKPxYhcJxKrV+TrCyg/GwZbOjhpRPrz2kG8xbAsUaIDelUlKjm08YcwBO9Fm8sqf/Kg8ZWkk6nWujhLykfvw==", "dev": true, "requires": { - "bindings": "1.3.0", - "inherits": "2.0.3", - "nan": "2.6.2", - "prebuild-install": "2.2.2", - "safe-buffer": "5.1.1" + "bindings": "^1.2.1", + "inherits": "^2.0.3", + "nan": "^2.2.1", + "prebuild-install": "^2.0.0", + "safe-buffer": "^5.1.0" } }, "keccakjs": { @@ -4891,8 +6382,8 @@ "integrity": "sha1-HWM6+QfvMFu/ny+mFtVsRFYd+k0=", "dev": true, "requires": { - "browserify-sha3": "0.0.1", - "sha3": "1.2.2" + "browserify-sha3": "^0.0.1", + "sha3": "^1.1.0" } }, "keyv": { @@ -4910,7 +6401,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.5" + "is-buffer": "^1.1.5" } }, "klaw": { @@ -4919,7 +6410,7 @@ "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", "dev": true, "requires": { - "graceful-fs": "4.1.11" + "graceful-fs": "^4.1.9" } }, "lazy-cache": { @@ -4935,7 +6426,7 @@ "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", "dev": true, "requires": { - "invert-kv": "1.0.0" + "invert-kv": "^1.0.0" } }, "lcov-parse": { @@ -4944,6 +6435,12 @@ "integrity": "sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=", "dev": true }, + "left-pad": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/left-pad/-/left-pad-1.3.0.tgz", + "integrity": "sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA==", + "dev": true + }, "level-codec": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/level-codec/-/level-codec-7.0.0.tgz", @@ -4956,7 +6453,7 @@ "integrity": "sha1-NYXmI5dMc3qTdVSSpDwCZ82kQl8=", "dev": true, "requires": { - "errno": "0.1.4" + "errno": "~0.1.1" } }, "level-iterator-stream": { @@ -4965,10 +6462,10 @@ "integrity": "sha1-5Dt4sagUPm+pek9IXrjqUwNS8u0=", "dev": true, "requires": { - "inherits": "2.0.3", - "level-errors": "1.0.4", - "readable-stream": "1.1.14", - "xtend": "4.0.1" + "inherits": "^2.0.1", + "level-errors": "^1.0.3", + "readable-stream": "^1.0.33", + "xtend": "^4.0.0" }, "dependencies": { "isarray": { @@ -4983,10 +6480,10 @@ "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" } }, "string_decoder": { @@ -5003,8 +6500,8 @@ "integrity": "sha1-Ny5RIXeSSgBCSwtDrvK7QkltIos=", "dev": true, "requires": { - "readable-stream": "1.0.34", - "xtend": "2.1.2" + "readable-stream": "~1.0.15", + "xtend": "~2.1.1" }, "dependencies": { "isarray": { @@ -5019,10 +6516,10 @@ "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", + "core-util-is": "~1.0.0", + "inherits": "~2.0.1", "isarray": "0.0.1", - "string_decoder": "0.10.31" + "string_decoder": "~0.10.x" } }, "string_decoder": { @@ -5037,7 +6534,7 @@ "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=", "dev": true, "requires": { - "object-keys": "0.4.0" + "object-keys": "~0.4.0" } } } @@ -5048,13 +6545,13 @@ "integrity": "sha512-VVGHfKIlmw8w1XqpGOAGwq6sZm2WwWLmlDcULkKWQXEA5EopA8OBNJ2Ck2v6bdk8HeEZSbCSEgzXadyQFm76sQ==", "dev": true, "requires": { - "deferred-leveldown": "1.2.2", - "level-codec": "7.0.0", - "level-errors": "1.0.4", - "level-iterator-stream": "1.3.1", - "prr": "1.0.1", - "semver": "5.4.1", - "xtend": "4.0.1" + "deferred-leveldown": "~1.2.1", + "level-codec": "~7.0.0", + "level-errors": "~1.0.3", + "level-iterator-stream": "~1.3.0", + "prr": "~1.0.1", + "semver": "~5.4.1", + "xtend": "~4.0.0" } }, "levn": { @@ -5063,33 +6560,39 @@ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", "dev": true, "requires": { - "prelude-ls": "1.1.2", - "type-check": "0.3.2" + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" } }, + "linked-list": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/linked-list/-/linked-list-0.1.0.tgz", + "integrity": "sha1-eYsP+X0bkqT9CEgPVa6k6dSdN78=", + "dev": true + }, "listr": { "version": "0.13.0", "resolved": "https://registry.npmjs.org/listr/-/listr-0.13.0.tgz", "integrity": "sha1-ILsLowuuZg7oTMBQPfS+PVYjiH0=", "dev": true, "requires": { - "chalk": "1.1.3", - "cli-truncate": "0.2.1", - "figures": "1.7.0", - "indent-string": "2.1.0", - "is-observable": "0.2.0", - "is-promise": "2.1.0", - "is-stream": "1.1.0", - "listr-silent-renderer": "1.1.1", - "listr-update-renderer": "0.4.0", - "listr-verbose-renderer": "0.4.1", - "log-symbols": "1.0.2", - "log-update": "1.0.2", - "ora": "0.2.3", - "p-map": "1.2.0", - "rxjs": "5.5.8", - "stream-to-observable": "0.2.0", - "strip-ansi": "3.0.1" + "chalk": "^1.1.3", + "cli-truncate": "^0.2.1", + "figures": "^1.7.0", + "indent-string": "^2.1.0", + "is-observable": "^0.2.0", + "is-promise": "^2.1.0", + "is-stream": "^1.1.0", + "listr-silent-renderer": "^1.1.1", + "listr-update-renderer": "^0.4.0", + "listr-verbose-renderer": "^0.4.0", + "log-symbols": "^1.0.2", + "log-update": "^1.0.2", + "ora": "^0.2.3", + "p-map": "^1.1.1", + "rxjs": "^5.4.2", + "stream-to-observable": "^0.2.0", + "strip-ansi": "^3.0.1" }, "dependencies": { "figures": { @@ -5098,8 +6601,8 @@ "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", "dev": true, "requires": { - "escape-string-regexp": "1.0.5", - "object-assign": "4.1.1" + "escape-string-regexp": "^1.0.5", + "object-assign": "^4.1.0" } }, "log-symbols": { @@ -5108,7 +6611,7 @@ "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=", "dev": true, "requires": { - "chalk": "1.1.3" + "chalk": "^1.0.0" } } } @@ -5125,14 +6628,14 @@ "integrity": "sha1-NE2YDaLKLosUW6MFkI8yrj9MyKc=", "dev": true, "requires": { - "chalk": "1.1.3", - "cli-truncate": "0.2.1", - "elegant-spinner": "1.0.1", - "figures": "1.7.0", - "indent-string": "3.2.0", - "log-symbols": "1.0.2", - "log-update": "1.0.2", - "strip-ansi": "3.0.1" + "chalk": "^1.1.3", + "cli-truncate": "^0.2.1", + "elegant-spinner": "^1.0.1", + "figures": "^1.7.0", + "indent-string": "^3.0.0", + "log-symbols": "^1.0.2", + "log-update": "^1.0.2", + "strip-ansi": "^3.0.1" }, "dependencies": { "figures": { @@ -5141,8 +6644,8 @@ "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", "dev": true, "requires": { - "escape-string-regexp": "1.0.5", - "object-assign": "4.1.1" + "escape-string-regexp": "^1.0.5", + "object-assign": "^4.1.0" } }, "indent-string": { @@ -5157,7 +6660,7 @@ "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=", "dev": true, "requires": { - "chalk": "1.1.3" + "chalk": "^1.0.0" } } } @@ -5168,10 +6671,10 @@ "integrity": "sha1-ggb0z21S3cWCfl/RSYng6WWTOjU=", "dev": true, "requires": { - "chalk": "1.1.3", - "cli-cursor": "1.0.2", - "date-fns": "1.29.0", - "figures": "1.7.0" + "chalk": "^1.1.3", + "cli-cursor": "^1.0.2", + "date-fns": "^1.27.2", + "figures": "^1.7.0" }, "dependencies": { "cli-cursor": { @@ -5180,7 +6683,7 @@ "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", "dev": true, "requires": { - "restore-cursor": "1.0.1" + "restore-cursor": "^1.0.1" } }, "figures": { @@ -5189,8 +6692,8 @@ "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", "dev": true, "requires": { - "escape-string-regexp": "1.0.5", - "object-assign": "4.1.1" + "escape-string-regexp": "^1.0.5", + "object-assign": "^4.1.0" } }, "onetime": { @@ -5205,8 +6708,8 @@ "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", "dev": true, "requires": { - "exit-hook": "1.1.1", - "onetime": "1.1.0" + "exit-hook": "^1.0.0", + "onetime": "^1.0.0" } } } @@ -5217,11 +6720,11 @@ "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0" } }, "loader-utils": { @@ -5230,9 +6733,9 @@ "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", "dev": true, "requires": { - "big.js": "3.1.3", - "emojis-list": "2.1.0", - "json5": "0.5.1" + "big.js": "^3.1.3", + "emojis-list": "^2.0.0", + "json5": "^0.5.0" } }, "locate-path": { @@ -5241,8 +6744,8 @@ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", "dev": true, "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" }, "dependencies": { "path-exists": { @@ -5259,14 +6762,20 @@ "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", "dev": true }, + "lodash-es": { + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.10.tgz", + "integrity": "sha512-iesFYPmxYYGTcmQK0sL8bX3TGHyM6b2qREaB4kamHfQyfPJP0xgoGxp19nsH16nsfquLdiyKyX3mQkfiSGV8Rg==", + "dev": true + }, "lodash._baseassign": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", "dev": true, "requires": { - "lodash._basecopy": "3.0.1", - "lodash.keys": "3.1.2" + "lodash._basecopy": "^3.0.0", + "lodash.keys": "^3.0.0" } }, "lodash._basecopy": { @@ -5311,9 +6820,9 @@ "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=", "dev": true, "requires": { - "lodash._baseassign": "3.2.0", - "lodash._basecreate": "3.0.3", - "lodash._isiterateecall": "3.0.9" + "lodash._baseassign": "^3.0.0", + "lodash._basecreate": "^3.0.0", + "lodash._isiterateecall": "^3.0.0" } }, "lodash.isarguments": { @@ -5334,11 +6843,17 @@ "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", "dev": true, "requires": { - "lodash._getnative": "3.9.1", - "lodash.isarguments": "3.1.0", - "lodash.isarray": "3.0.4" + "lodash._getnative": "^3.0.0", + "lodash.isarguments": "^3.0.0", + "lodash.isarray": "^3.0.0" } }, + "lodash.toarray": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz", + "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=", + "dev": true + }, "log-driver": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz", @@ -5351,7 +6866,7 @@ "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", "dev": true, "requires": { - "chalk": "2.3.2" + "chalk": "^2.0.1" }, "dependencies": { "ansi-styles": { @@ -5360,7 +6875,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.1" + "color-convert": "^1.9.0" } }, "chalk": { @@ -5369,9 +6884,9 @@ "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.3.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "has-flag": { @@ -5386,7 +6901,7 @@ "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -5397,8 +6912,8 @@ "integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=", "dev": true, "requires": { - "ansi-escapes": "1.4.0", - "cli-cursor": "1.0.2" + "ansi-escapes": "^1.0.0", + "cli-cursor": "^1.0.2" }, "dependencies": { "ansi-escapes": { @@ -5413,7 +6928,7 @@ "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", "dev": true, "requires": { - "restore-cursor": "1.0.1" + "restore-cursor": "^1.0.1" } }, "onetime": { @@ -5428,8 +6943,8 @@ "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", "dev": true, "requires": { - "exit-hook": "1.1.1", - "onetime": "1.1.0" + "exit-hook": "^1.0.0", + "onetime": "^1.0.0" } } } @@ -5446,7 +6961,7 @@ "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", "dev": true, "requires": { - "js-tokens": "3.0.2" + "js-tokens": "^3.0.0" } }, "lowercase-keys": { @@ -5473,7 +6988,7 @@ "integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==", "dev": true, "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" }, "dependencies": { "pify": { @@ -5484,13 +6999,25 @@ } } }, + "marked": { + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.19.tgz", + "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==", + "dev": true + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", + "dev": true + }, "mem": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", "dev": true, "requires": { - "mimic-fn": "1.1.0" + "mimic-fn": "^1.0.0" } }, "mem-fs": { @@ -5499,9 +7026,9 @@ "integrity": "sha1-uK6NLj/Lb10/kWXBLUVRoGXZicw=", "dev": true, "requires": { - "through2": "2.0.3", - "vinyl": "1.2.0", - "vinyl-file": "2.0.0" + "through2": "^2.0.0", + "vinyl": "^1.1.0", + "vinyl-file": "^2.0.0" } }, "mem-fs-editor": { @@ -5510,16 +7037,16 @@ "integrity": "sha1-3Qpuryu4prN3QAZ6pUnrUwEFr58=", "dev": true, "requires": { - "commondir": "1.0.1", - "deep-extend": "0.4.2", - "ejs": "2.5.8", - "glob": "7.1.2", - "globby": "6.1.0", - "mkdirp": "0.5.1", - "multimatch": "2.1.0", - "rimraf": "2.6.1", - "through2": "2.0.3", - "vinyl": "2.1.0" + "commondir": "^1.0.1", + "deep-extend": "^0.4.0", + "ejs": "^2.3.1", + "glob": "^7.0.3", + "globby": "^6.1.0", + "mkdirp": "^0.5.0", + "multimatch": "^2.0.0", + "rimraf": "^2.2.8", + "through2": "^2.0.0", + "vinyl": "^2.0.1" }, "dependencies": { "clone-stats": { @@ -5534,11 +7061,11 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "1.0.2", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "replace-ext": { @@ -5553,12 +7080,12 @@ "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=", "dev": true, "requires": { - "clone": "2.1.1", - "clone-buffer": "1.0.0", - "clone-stats": "1.0.0", - "cloneable-readable": "1.1.2", - "remove-trailing-separator": "1.0.2", - "replace-ext": "1.0.0" + "clone": "^2.1.1", + "clone-buffer": "^1.0.0", + "clone-stats": "^1.0.0", + "cloneable-readable": "^1.0.0", + "remove-trailing-separator": "^1.0.1", + "replace-ext": "^1.0.0" } } } @@ -5570,10 +7097,10 @@ "dev": true, "requires": { "abstract-leveldown": "2.4.1", - "functional-red-black-tree": "1.0.1", - "immediate": "3.2.3", - "inherits": "2.0.3", - "ltgt": "2.1.3" + "functional-red-black-tree": "^1.0.1", + "immediate": "^3.2.3", + "inherits": "~2.0.1", + "ltgt": "~2.1.3" }, "dependencies": { "abstract-leveldown": { @@ -5582,7 +7109,7 @@ "integrity": "sha1-s7/tuITraToSd18MVenwpCDM7mQ=", "dev": true, "requires": { - "xtend": "4.0.1" + "xtend": "~4.0.0" } } } @@ -5593,8 +7120,8 @@ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", "dev": true, "requires": { - "errno": "0.1.4", - "readable-stream": "2.3.3" + "errno": "^0.1.3", + "readable-stream": "^2.0.1" } }, "memorystream": { @@ -5603,20 +7130,26 @@ "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=", "dev": true }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", + "dev": true + }, "merkle-patricia-tree": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/merkle-patricia-tree/-/merkle-patricia-tree-2.1.2.tgz", "integrity": "sha1-ckSD1Ut1YxpI/t2lXhFAUXBqcpE=", "dev": true, "requires": { - "async": "1.5.2", - "ethereumjs-util": "4.5.0", + "async": "^1.4.2", + "ethereumjs-util": "^4.0.0", "level-ws": "0.0.0", - "levelup": "1.3.9", - "memdown": "1.2.4", - "readable-stream": "2.3.3", - "rlp": "2.0.0", - "semaphore": "1.1.0" + "levelup": "^1.2.1", + "memdown": "^1.0.0", + "readable-stream": "^2.0.0", + "rlp": "^2.0.0", + "semaphore": ">=1.0.1" }, "dependencies": { "ethereumjs-util": { @@ -5625,36 +7158,48 @@ "integrity": "sha1-PpQosxfuvaPXJg2FT93alUsfG8Y=", "dev": true, "requires": { - "bn.js": "4.11.8", - "create-hash": "1.1.3", - "keccakjs": "0.2.1", - "rlp": "2.0.0", - "secp256k1": "3.3.0" + "bn.js": "^4.8.0", + "create-hash": "^1.1.2", + "keccakjs": "^0.2.0", + "rlp": "^2.0.0", + "secp256k1": "^3.0.1" } } } }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "dev": true + }, "micromatch": { "version": "2.3.11", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", "dev": true, "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.3" + "arr-diff": "^2.0.0", + "array-unique": "^0.2.1", + "braces": "^1.8.2", + "expand-brackets": "^0.1.4", + "extglob": "^0.3.1", + "filename-regex": "^2.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.1", + "kind-of": "^3.0.2", + "normalize-path": "^2.0.1", + "object.omit": "^2.0.0", + "parse-glob": "^3.0.4", + "regex-cache": "^0.4.2" } }, + "mime": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", + "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", + "dev": true + }, "mime-db": { "version": "1.29.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz", @@ -5667,7 +7212,7 @@ "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=", "dev": true, "requires": { - "mime-db": "1.29.0" + "mime-db": "~1.29.0" } }, "mimic-fn": { @@ -5688,7 +7233,7 @@ "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", "dev": true, "requires": { - "dom-walk": "0.1.1" + "dom-walk": "^0.1.0" } }, "minimalistic-assert": { @@ -5709,7 +7254,7 @@ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, "requires": { - "brace-expansion": "1.1.8" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -5772,8 +7317,8 @@ "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=", "dev": true, "requires": { - "inherits": "2.0.3", - "minimatch": "0.3.0" + "inherits": "2", + "minimatch": "0.3" } }, "minimatch": { @@ -5782,8 +7327,8 @@ "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=", "dev": true, "requires": { - "lru-cache": "2.7.3", - "sigmund": "1.0.1" + "lru-cache": "2", + "sigmund": "~1.0.0" } }, "ms": { @@ -5812,10 +7357,10 @@ "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", "dev": true, "requires": { - "array-differ": "1.0.0", - "array-union": "1.0.2", - "arrify": "1.0.1", - "minimatch": "3.0.4" + "array-differ": "^1.0.0", + "array-union": "^1.0.1", + "arrify": "^1.0.0", + "minimatch": "^3.0.0" } }, "mute-stream": { @@ -5830,12 +7375,24 @@ "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", "dev": true }, + "nano-json-stream-parser": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz", + "integrity": "sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18=", + "dev": true + }, "natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "negotiator": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", + "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", + "dev": true + }, "neo-async": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.0.tgz", @@ -5860,14 +7417,52 @@ "integrity": "sha1-VfuN62mQcHB/tn+RpGDwRIKUx30=", "dev": true }, + "node-emoji": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.8.1.tgz", + "integrity": "sha512-+ktMAh1Jwas+TnGodfCfjUbJKoANqPaJFN0z0iqh41eqD8dvguNzcitVSBSVK1pidz0AqGbLKcoVuVLRVZ/aVg==", + "dev": true, + "requires": { + "lodash.toarray": "^4.4.0" + } + }, "node-fetch": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.2.tgz", "integrity": "sha512-xZZUq2yDhKMIn/UgG5q//IZSNLJIwW2QxS14CNH5spuiXkITM2pUitjdq58yLSaU7m4M0wBNaM2Gh/ggY4YJig==", "dev": true, "requires": { - "encoding": "0.1.12", - "is-stream": "1.1.0" + "encoding": "^0.1.11", + "is-stream": "^1.0.1" + } + }, + "node-interval-tree": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/node-interval-tree/-/node-interval-tree-1.3.3.tgz", + "integrity": "sha512-K9vk96HdTK5fEipJwxSvIIqwTqr4e3HRJeJrNxBSeVMNSC/JWARRaX7etOLOuTmrRMeOI/K5TCJu3aWIwZiNTw==", + "dev": true, + "requires": { + "shallowequal": "^1.0.2" + } + }, + "node-ipc": { + "version": "9.1.1", + "resolved": "https://registry.npmjs.org/node-ipc/-/node-ipc-9.1.1.tgz", + "integrity": "sha512-FAyICv0sIRJxVp3GW5fzgaf9jwwRQxAKDJlmNFUL5hOy+W4X/I5AypyHoq0DXXbo9o/gt79gj++4cMr4jVWE/w==", + "dev": true, + "requires": { + "event-pubsub": "4.3.0", + "js-message": "1.0.5", + "js-queue": "2.0.0" + } + }, + "nodegit-promise": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/nodegit-promise/-/nodegit-promise-4.0.0.tgz", + "integrity": "sha1-VyKxhPLfcycWEGSnkdLoQskWezQ=", + "dev": true, + "requires": { + "asap": "~2.0.3" } }, "nomnom": { @@ -5876,8 +7471,8 @@ "integrity": "sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=", "dev": true, "requires": { - "chalk": "0.4.0", - "underscore": "1.6.0" + "chalk": "~0.4.0", + "underscore": "~1.6.0" }, "dependencies": { "ansi-styles": { @@ -5892,9 +7487,9 @@ "integrity": "sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=", "dev": true, "requires": { - "ansi-styles": "1.0.0", - "has-color": "0.1.7", - "strip-ansi": "0.1.1" + "ansi-styles": "~1.0.0", + "has-color": "~0.1.0", + "strip-ansi": "~0.1.0" } }, "strip-ansi": { @@ -5917,7 +7512,7 @@ "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", "dev": true, "requires": { - "abbrev": "1.0.9" + "abbrev": "1" } }, "normalize-package-data": { @@ -5926,10 +7521,10 @@ "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", "dev": true, "requires": { - "hosted-git-info": "2.5.0", - "is-builtin-module": "1.0.0", - "semver": "5.4.1", - "validate-npm-package-license": "3.0.1" + "hosted-git-info": "^2.1.4", + "is-builtin-module": "^1.0.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" } }, "normalize-path": { @@ -5938,7 +7533,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "1.0.2" + "remove-trailing-separator": "^1.0.1" } }, "normalize-url": { @@ -5947,9 +7542,18 @@ "integrity": "sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==", "dev": true, "requires": { - "prepend-http": "2.0.0", - "query-string": "5.1.1", - "sort-keys": "2.0.0" + "prepend-http": "^2.0.0", + "query-string": "^5.0.1", + "sort-keys": "^2.0.0" + } + }, + "npm-programmatic": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/npm-programmatic/-/npm-programmatic-0.0.10.tgz", + "integrity": "sha512-SklCZ26RRGi7hLIz/oaSnHy8ZT0gh8r6N3FMuKRye3ZcRo4HI/saldc8b7OqlY/Ov8FXnA1+I+Od+WtesWEp2Q==", + "dev": true, + "requires": { + "bluebird": "^3.4.1" } }, "npm-run-path": { @@ -5958,7 +7562,7 @@ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "dev": true, "requires": { - "path-key": "2.0.1" + "path-key": "^2.0.0" } }, "npmlog": { @@ -5967,10 +7571,19 @@ "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "nth-check": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", + "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", + "dev": true, + "requires": { + "boolbase": "~1.0.0" } }, "number-is-nan": { @@ -5997,6 +7610,13 @@ } } }, + "nwmatcher": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.4.tgz", + "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==", + "dev": true, + "optional": true + }, "oauth-sign": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", @@ -6027,8 +7647,17 @@ "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", "dev": true, "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" + "for-own": "^0.1.4", + "is-extendable": "^0.1.1" + } + }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "dev": true, + "requires": { + "ee-first": "1.1.1" } }, "once": { @@ -6037,7 +7666,7 @@ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, "requires": { - "wrappy": "1.0.2" + "wrappy": "1" } }, "onetime": { @@ -6046,7 +7675,7 @@ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", "dev": true, "requires": { - "mimic-fn": "1.1.0" + "mimic-fn": "^1.0.0" } }, "optimist": { @@ -6055,8 +7684,8 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "0.0.8", - "wordwrap": "0.0.3" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" }, "dependencies": { "wordwrap": { @@ -6073,12 +7702,12 @@ "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", "dev": true, "requires": { - "deep-is": "0.1.3", - "fast-levenshtein": "2.0.6", - "levn": "0.3.0", - "prelude-ls": "1.1.2", - "type-check": "0.3.2", - "wordwrap": "1.0.0" + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.4", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "wordwrap": "~1.0.0" } }, "ora": { @@ -6087,10 +7716,10 @@ "integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=", "dev": true, "requires": { - "chalk": "1.1.3", - "cli-cursor": "1.0.2", - "cli-spinners": "0.1.2", - "object-assign": "4.1.1" + "chalk": "^1.1.1", + "cli-cursor": "^1.0.2", + "cli-spinners": "^0.1.2", + "object-assign": "^4.0.1" }, "dependencies": { "cli-cursor": { @@ -6099,7 +7728,7 @@ "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", "dev": true, "requires": { - "restore-cursor": "1.0.1" + "restore-cursor": "^1.0.1" } }, "onetime": { @@ -6114,8 +7743,8 @@ "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", "dev": true, "requires": { - "exit-hook": "1.1.1", - "onetime": "1.1.0" + "exit-hook": "^1.0.0", + "onetime": "^1.0.0" } } } @@ -6138,7 +7767,7 @@ "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { - "lcid": "1.0.0" + "lcid": "^1.0.0" } }, "os-tmpdir": { @@ -6147,6 +7776,17 @@ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", "dev": true }, + "output-file-sync": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz", + "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.4", + "mkdirp": "^0.5.1", + "object-assign": "^4.1.0" + } + }, "p-cancelable": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-0.4.1.tgz", @@ -6159,7 +7799,7 @@ "integrity": "sha1-kw89Et0fUOdDRFeiLNbwSsatf3E=", "dev": true, "requires": { - "p-reduce": "1.0.0" + "p-reduce": "^1.0.0" } }, "p-finally": { @@ -6192,7 +7832,7 @@ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", "dev": true, "requires": { - "p-limit": "1.1.0" + "p-limit": "^1.1.0" } }, "p-map": { @@ -6213,7 +7853,7 @@ "integrity": "sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==", "dev": true, "requires": { - "p-finally": "1.0.0" + "p-finally": "^1.0.0" } }, "parse-glob": { @@ -6222,10 +7862,10 @@ "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", "dev": true, "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" + "glob-base": "^0.3.0", + "is-dotfile": "^1.0.0", + "is-extglob": "^1.0.0", + "is-glob": "^2.0.0" } }, "parse-headers": { @@ -6234,7 +7874,7 @@ "integrity": "sha1-aug6eqJanZtwCswoaYzR8e1+lTY=", "dev": true, "requires": { - "for-each": "0.3.2", + "for-each": "^0.3.2", "trim": "0.0.1" } }, @@ -6244,7 +7884,7 @@ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", "dev": true, "requires": { - "error-ex": "1.3.1" + "error-ex": "^1.2.0" } }, "parse-passwd": { @@ -6253,13 +7893,28 @@ "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", "dev": true }, + "parse5": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz", + "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==", + "dev": true, + "requires": { + "@types/node": "*" + } + }, + "parseurl": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", + "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", + "dev": true + }, "path-exists": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, "requires": { - "pinkie-promise": "2.0.1" + "pinkie-promise": "^2.0.0" } }, "path-is-absolute": { @@ -6286,15 +7941,21 @@ "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", "dev": true }, + "path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", + "dev": true + }, "path-type": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "graceful-fs": "^4.1.2", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "pathval": { @@ -6309,11 +7970,11 @@ "integrity": "sha512-+dCHxDH+djNtjgWmvVC/my3SYBAKpKNqKSjLkp+GtWWYe4XPE+e/PSD2aCanlEZZnqPk2uekTKNC/ccbwd2X2Q==", "dev": true, "requires": { - "create-hash": "1.1.3", - "create-hmac": "1.1.6", - "ripemd160": "2.0.1", - "safe-buffer": "5.1.1", - "sha.js": "2.4.8" + "create-hash": "^1.1.2", + "create-hmac": "^1.1.4", + "ripemd160": "^2.0.1", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" } }, "pegjs": { @@ -6322,6 +7983,12 @@ "integrity": "sha1-z4uvrm7d/0tafvsYUmnqr0YQ3b0=", "dev": true }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "dev": true + }, "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -6340,7 +8007,7 @@ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", "dev": true, "requires": { - "pinkie": "2.0.4" + "pinkie": "^2.0.0" } }, "pkg-dir": { @@ -6349,7 +8016,7 @@ "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", "dev": true, "requires": { - "find-up": "1.1.2" + "find-up": "^1.0.0" } }, "pluralize": { @@ -6364,19 +8031,19 @@ "integrity": "sha512-F46pcvDxtQhbV3B+dm+exHuKxIyJK26fVNiJRmbTW/5D7o0Z2yzc8CKeu7UWbo9XxQZoVOC88aKgySAsza+cWw==", "dev": true, "requires": { - "expand-template": "1.0.3", + "expand-template": "^1.0.2", "github-from-package": "0.0.0", - "minimist": "1.2.0", - "mkdirp": "0.5.1", - "node-abi": "2.1.0", - "noop-logger": "0.1.1", - "npmlog": "4.1.2", - "os-homedir": "1.0.2", - "pump": "1.0.2", - "rc": "1.2.1", - "simple-get": "1.4.3", - "tar-fs": "1.15.3", - "tunnel-agent": "0.6.0", + "minimist": "^1.2.0", + "mkdirp": "^0.5.1", + "node-abi": "^2.0.0", + "noop-logger": "^0.1.1", + "npmlog": "^4.0.1", + "os-homedir": "^1.0.1", + "pump": "^1.0.1", + "rc": "^1.1.6", + "simple-get": "^1.4.2", + "tar-fs": "^1.13.0", + "tunnel-agent": "^0.6.0", "xtend": "4.0.1" }, "dependencies": { @@ -6392,7 +8059,7 @@ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "dev": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "^5.0.1" } } } @@ -6451,6 +8118,26 @@ "integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=", "dev": true }, + "promisify-node": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/promisify-node/-/promisify-node-0.4.0.tgz", + "integrity": "sha1-MoA4dOxBF4TkeGwzmQKoeheaRpw=", + "dev": true, + "requires": { + "nodegit-promise": "~4.0.0", + "object-assign": "^4.0.1" + } + }, + "proxy-addr": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz", + "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==", + "dev": true, + "requires": { + "forwarded": "~0.1.2", + "ipaddr.js": "1.6.0" + } + }, "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -6469,8 +8156,8 @@ "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=", "dev": true, "requires": { - "end-of-stream": "1.4.0", - "once": "1.4.0" + "end-of-stream": "^1.1.0", + "once": "^1.3.1" } }, "punycode": { @@ -6491,19 +8178,25 @@ "integrity": "sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==", "dev": true, "requires": { - "decode-uri-component": "0.2.0", - "object-assign": "4.1.1", - "strict-uri-encode": "1.1.0" + "decode-uri-component": "^0.2.0", + "object-assign": "^4.1.0", + "strict-uri-encode": "^1.0.0" } }, + "querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "dev": true + }, "randomatic": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", "dev": true, "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" + "is-number": "^3.0.0", + "kind-of": "^4.0.0" }, "dependencies": { "is-number": { @@ -6512,7 +8205,7 @@ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "kind-of": "3.2.2" + "kind-of": "^3.0.2" }, "dependencies": { "kind-of": { @@ -6521,7 +8214,7 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { - "is-buffer": "1.1.5" + "is-buffer": "^1.1.5" } } } @@ -6532,7 +8225,7 @@ "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { - "is-buffer": "1.1.5" + "is-buffer": "^1.1.5" } } } @@ -6543,7 +8236,42 @@ "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==", "dev": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "^5.1.0" + } + }, + "randomhex": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/randomhex/-/randomhex-0.1.5.tgz", + "integrity": "sha1-us7vmCMpCRQA8qKRLGzQLxCU9YU=", + "dev": true + }, + "range-parser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", + "dev": true + }, + "raw-body": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz", + "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==", + "dev": true, + "requires": { + "bytes": "3.0.0", + "http-errors": "1.6.3", + "iconv-lite": "0.4.23", + "unpipe": "1.0.0" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.23", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", + "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + } } }, "rc": { @@ -6552,10 +8280,10 @@ "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", "dev": true, "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.4", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" + "deep-extend": "~0.4.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" }, "dependencies": { "minimist": { @@ -6572,8 +8300,8 @@ "integrity": "sha1-agTAkoAF7Z1C4aasVgDhnLx/9lU=", "dev": true, "requires": { - "pify": "3.0.0", - "safe-buffer": "5.1.1" + "pify": "^3.0.0", + "safe-buffer": "^5.1.1" }, "dependencies": { "pify": { @@ -6590,9 +8318,9 @@ "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" + "load-json-file": "^1.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^1.0.0" } }, "read-pkg-up": { @@ -6601,8 +8329,8 @@ "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" + "find-up": "^1.0.0", + "read-pkg": "^1.0.0" } }, "readable-stream": { @@ -6611,13 +8339,13 @@ "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", "dev": true, "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "safe-buffer": "5.1.1", - "string_decoder": "1.0.3", - "util-deprecate": "1.0.2" + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~1.0.6", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.0.3", + "util-deprecate": "~1.0.1" } }, "readdirp": { @@ -6626,10 +8354,10 @@ "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "readable-stream": "2.3.3", - "set-immediate-shim": "1.0.1" + "graceful-fs": "^4.1.2", + "minimatch": "^3.0.2", + "readable-stream": "^2.0.2", + "set-immediate-shim": "^1.0.1" } }, "recast": { @@ -6639,9 +8367,9 @@ "dev": true, "requires": { "ast-types": "0.11.3", - "esprima": "4.0.0", - "private": "0.1.7", - "source-map": "0.6.1" + "esprima": "~4.0.0", + "private": "~0.1.5", + "source-map": "~0.6.1" }, "dependencies": { "esprima": { @@ -6664,9 +8392,62 @@ "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "dev": true, "requires": { - "resolve": "1.4.0" + "resolve": "^1.1.6" } }, + "redux": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz", + "integrity": "sha512-pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A==", + "dev": true, + "requires": { + "lodash": "^4.2.1", + "lodash-es": "^4.2.1", + "loose-envify": "^1.1.0", + "symbol-observable": "^1.0.3" + }, + "dependencies": { + "symbol-observable": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", + "dev": true + } + } + }, + "redux-cli-logger": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/redux-cli-logger/-/redux-cli-logger-2.1.0.tgz", + "integrity": "sha512-75mVsggAJRSykWy2qxdGI7osocDWvc3RCMeN93hlvS/FxgdRww12NaXslez+W6gBOrSJKO7W16V0IzuISSfCxg==", + "dev": true, + "requires": { + "colors": "^1.1.2" + } + }, + "redux-devtools-instrument": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/redux-devtools-instrument/-/redux-devtools-instrument-1.8.3.tgz", + "integrity": "sha1-xRDWerTl5FJazW5BDCWrRrhaynw=", + "dev": true, + "requires": { + "lodash": "^4.2.0", + "symbol-observable": "^1.0.2" + }, + "dependencies": { + "symbol-observable": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", + "dev": true + } + } + }, + "redux-saga": { + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/redux-saga/-/redux-saga-0.16.0.tgz", + "integrity": "sha1-CiMdsKFIkwHdmA9vL4jYztQY9yQ=", + "dev": true + }, "regenerate": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz", @@ -6685,9 +8466,9 @@ "integrity": "sha1-On0GdSDLe3F2dp61/4aGkb7+EoM=", "dev": true, "requires": { - "babel-runtime": "6.25.0", - "babel-types": "6.25.0", - "private": "0.1.7" + "babel-runtime": "^6.18.0", + "babel-types": "^6.19.0", + "private": "^0.1.6" } }, "regex-cache": { @@ -6696,8 +8477,8 @@ "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=", "dev": true, "requires": { - "is-equal-shallow": "0.1.3", - "is-primitive": "2.0.0" + "is-equal-shallow": "^0.1.3", + "is-primitive": "^2.0.0" } }, "regexpu-core": { @@ -6706,9 +8487,9 @@ "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", "dev": true, "requires": { - "regenerate": "1.3.2", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" + "regenerate": "^1.2.1", + "regjsgen": "^0.2.0", + "regjsparser": "^0.1.4" } }, "regjsgen": { @@ -6723,7 +8504,43 @@ "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", "dev": true, "requires": { - "jsesc": "0.5.0" + "jsesc": "~0.5.0" + } + }, + "remote-redux-devtools": { + "version": "0.5.12", + "resolved": "https://registry.npmjs.org/remote-redux-devtools/-/remote-redux-devtools-0.5.12.tgz", + "integrity": "sha1-QsuV36nlTB2WcTF8Xnu6QeaMrsI=", + "dev": true, + "requires": { + "jsan": "^3.1.5", + "querystring": "^0.2.0", + "redux-devtools-instrument": "^1.3.3", + "remotedev-utils": "^0.1.1", + "rn-host-detect": "^1.0.1", + "socketcluster-client": "^5.3.1" + } + }, + "remotedev-serialize": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/remotedev-serialize/-/remotedev-serialize-0.1.1.tgz", + "integrity": "sha1-D1mAALfddRXWf5tRph0hHhjOlVQ=", + "dev": true, + "requires": { + "jsan": "^3.1.9" + } + }, + "remotedev-utils": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/remotedev-utils/-/remotedev-utils-0.1.4.tgz", + "integrity": "sha1-ZDcAgZqUNngHPHXrGF6B2WYgs0g=", + "dev": true, + "requires": { + "get-params": "^0.1.2", + "jsan": "^3.1.5", + "lodash": "^4.0.0", + "remotedev-serialize": "^0.1.0", + "shortid": "^2.2.6" } }, "remove-trailing-separator": { @@ -6750,7 +8567,7 @@ "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "dev": true, "requires": { - "is-finite": "1.0.2" + "is-finite": "^1.0.0" } }, "replace-ext": { @@ -6765,7 +8582,7 @@ "integrity": "sha1-DXOurpJm5penj3l2AZZ352rPD/8=", "dev": true, "requires": { - "req-from": "1.0.1" + "req-from": "^1.0.1" } }, "req-from": { @@ -6774,7 +8591,7 @@ "integrity": "sha1-v4HaUUeUfTLRO5R9wSpYrUWHNQ4=", "dev": true, "requires": { - "resolve-from": "2.0.0" + "resolve-from": "^2.0.0" } }, "request": { @@ -6783,26 +8600,26 @@ "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", "dev": true, "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.11.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "2.0.6", - "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.16", - "oauth-sign": "0.8.2", - "qs": "6.3.2", - "stringstream": "0.0.5", - "tough-cookie": "2.3.2", - "tunnel-agent": "0.4.3", - "uuid": "3.1.0" + "aws-sign2": "~0.6.0", + "aws4": "^1.2.1", + "caseless": "~0.11.0", + "combined-stream": "~1.0.5", + "extend": "~3.0.0", + "forever-agent": "~0.6.1", + "form-data": "~2.1.1", + "har-validator": "~2.0.6", + "hawk": "~3.1.3", + "http-signature": "~1.1.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.7", + "oauth-sign": "~0.8.1", + "qs": "~6.3.0", + "stringstream": "~0.0.4", + "tough-cookie": "~2.3.0", + "tunnel-agent": "~0.4.1", + "uuid": "^3.0.0" } }, "require-directory": { @@ -6829,8 +8646,8 @@ "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", "dev": true, "requires": { - "caller-path": "0.1.0", - "resolve-from": "1.0.1" + "caller-path": "^0.1.0", + "resolve-from": "^1.0.0" }, "dependencies": { "resolve-from": { @@ -6841,13 +8658,59 @@ } } }, + "reselect": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz", + "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=", + "dev": true + }, + "reselect-tree": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/reselect-tree/-/reselect-tree-1.2.0.tgz", + "integrity": "sha512-jdM46p0LKFmSpdW9mUrgY8WIbK9icIWPdWrP1WcFMklroq2hHaIHrJLbytlF+jlVFpV5lAbxoAuUkQ9XbUys8A==", + "dev": true, + "requires": { + "debug": "^3.1.0", + "esdoc": "^1.0.4", + "json-pointer": "^0.6.0", + "reselect": "^3.0.1", + "source-map-support": "^0.5.3" + }, + "dependencies": { + "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" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz", + "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + } + } + }, "resolve": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", "dev": true, "requires": { - "path-parse": "1.0.5" + "path-parse": "^1.0.5" } }, "resolve-cwd": { @@ -6856,7 +8719,7 @@ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", "dev": true, "requires": { - "resolve-from": "3.0.0" + "resolve-from": "^3.0.0" }, "dependencies": { "resolve-from": { @@ -6873,8 +8736,8 @@ "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", "dev": true, "requires": { - "expand-tilde": "2.0.2", - "global-modules": "1.0.0" + "expand-tilde": "^2.0.0", + "global-modules": "^1.0.0" } }, "resolve-from": { @@ -6889,7 +8752,7 @@ "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=", "dev": true, "requires": { - "lowercase-keys": "1.0.1" + "lowercase-keys": "^1.0.0" } }, "restore-cursor": { @@ -6898,8 +8761,8 @@ "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", "dev": true, "requires": { - "onetime": "2.0.1", - "signal-exit": "3.0.2" + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" } }, "resumer": { @@ -6908,7 +8771,7 @@ "integrity": "sha1-8ej0YeQGS6Oegq883CqMiT0HZ1k=", "dev": true, "requires": { - "through": "2.3.8" + "through": "~2.3.4" } }, "right-align": { @@ -6918,7 +8781,7 @@ "dev": true, "optional": true, "requires": { - "align-text": "0.1.4" + "align-text": "^0.1.1" } }, "rimraf": { @@ -6927,7 +8790,7 @@ "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "ripemd160": { @@ -6936,8 +8799,8 @@ "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=", "dev": true, "requires": { - "hash-base": "2.0.2", - "inherits": "2.0.3" + "hash-base": "^2.0.0", + "inherits": "^2.0.1" } }, "rlp": { @@ -6946,13 +8809,19 @@ "integrity": "sha1-nbOE/0uJqPYVY9kjldhiWxjzr7A=", "dev": true }, + "rn-host-detect": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/rn-host-detect/-/rn-host-detect-1.1.3.tgz", + "integrity": "sha1-JC124vpIXEjXUUFuZbfM5ZaWnpE=", + "dev": true + }, "run-async": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", "dev": true, "requires": { - "is-promise": "2.1.0" + "is-promise": "^2.1.0" } }, "rustbn.js": { @@ -6973,7 +8842,7 @@ "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", "dev": true, "requires": { - "rx-lite": "4.0.8" + "rx-lite": "*" } }, "rxjs": { @@ -6991,6 +8860,55 @@ "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", "dev": true }, + "safe-eval": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/safe-eval/-/safe-eval-0.3.0.tgz", + "integrity": "sha1-Bs4RHuvZwYWrr/AI7A/P/Fxb4Aw=", + "dev": true + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "dev": true, + "optional": true + }, + "sc-channel": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/sc-channel/-/sc-channel-1.0.6.tgz", + "integrity": "sha1-s4vUepk+eCkPvFNGeGf2sqCghjk=", + "dev": true, + "requires": { + "sc-emitter": "1.x.x" + } + }, + "sc-emitter": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/sc-emitter/-/sc-emitter-1.1.0.tgz", + "integrity": "sha1-7xGdQiL0xk+Ie0hpZO8REWzdDnU=", + "dev": true, + "requires": { + "component-emitter": "1.2.0" + } + }, + "sc-errors": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/sc-errors/-/sc-errors-1.3.3.tgz", + "integrity": "sha1-wAvEx2apcMyNWTfQjNWOkx19rgU=", + "dev": true + }, + "sc-formatter": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/sc-formatter/-/sc-formatter-3.0.2.tgz", + "integrity": "sha512-9PbqYBpCq+OoEeRQ3QfFIGE6qwjjBcd2j7UjgDlhnZbtSnuGgHdcRklPKYGuYFH82V/dwd+AIpu8XvA1zqTd+A==", + "dev": true + }, "scoped-regex": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/scoped-regex/-/scoped-regex-1.0.0.tgz", @@ -7003,7 +8921,7 @@ "integrity": "sha1-BOAUpWgrU/pQwtXM4WfXGcBthw0=", "dev": true, "requires": { - "nan": "2.6.2" + "nan": "^2.0.8" } }, "scrypt.js": { @@ -7012,8 +8930,8 @@ "integrity": "sha1-r40UZbcemZARC+38WTuUeeA6ito=", "dev": true, "requires": { - "scrypt": "6.0.3", - "scryptsy": "1.2.1" + "scrypt": "^6.0.2", + "scryptsy": "^1.2.1" } }, "scryptsy": { @@ -7022,7 +8940,7 @@ "integrity": "sha1-oyJfpLJST4AnAHYeKFW987LZIWM=", "dev": true, "requires": { - "pbkdf2": "3.0.13" + "pbkdf2": "^3.0.3" } }, "secp256k1": { @@ -7031,15 +8949,15 @@ "integrity": "sha512-CbrQoeGG5V0kQ1ohEMGI+J7oKerapLTpivLICBaXR0R4HyQcN3kM9itLsV5fdpV1UR1bD14tOkJ1xughmlDIiQ==", "dev": true, "requires": { - "bindings": "1.3.0", - "bip66": "1.1.5", - "bn.js": "4.11.8", - "create-hash": "1.1.3", - "drbg.js": "1.0.1", - "elliptic": "6.4.0", - "nan": "2.6.2", - "prebuild-install": "2.2.2", - "safe-buffer": "5.1.1" + "bindings": "^1.2.1", + "bip66": "^1.1.3", + "bn.js": "^4.11.3", + "create-hash": "^1.1.2", + "drbg.js": "^1.0.1", + "elliptic": "^6.2.3", + "nan": "^2.2.1", + "prebuild-install": "^2.0.0", + "safe-buffer": "^5.1.0" } }, "semaphore": { @@ -7054,6 +8972,63 @@ "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==", "dev": true }, + "send": { + "version": "0.16.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", + "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", + "dev": true, + "requires": { + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.6.2", + "mime": "1.4.1", + "ms": "2.0.0", + "on-finished": "~2.3.0", + "range-parser": "~1.2.0", + "statuses": "~1.4.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, + "serve-static": { + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", + "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", + "dev": true, + "requires": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.2", + "send": "0.16.2" + } + }, + "servify": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/servify/-/servify-0.1.12.tgz", + "integrity": "sha512-/xE6GvsKKqyo1BAY+KxOWXcLpPsUUyji7Qg3bVD7hh1eRze5bR1uYiuDA/k3Gof1s9BTzQZEJK8sNcNGFIzeWw==", + "dev": true, + "requires": { + "body-parser": "^1.16.0", + "cors": "^2.8.1", + "express": "^4.14.0", + "request": "^2.79.0", + "xhr": "^2.3.3" + } + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -7066,31 +9041,43 @@ "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", "dev": true }, + "setprototypeof": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", + "dev": true + }, "sha.js": { "version": "2.4.8", "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz", "integrity": "sha1-NwaMLEdra69ALRSknGf1l5IfY08=", "dev": true, "requires": { - "inherits": "2.0.3" + "inherits": "^2.0.1" } }, "sha3": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/sha3/-/sha3-1.2.2.tgz", - "integrity": "sha1-pmxQmN5MJbyIM27ItIF9AFvKe6k=", + "integrity": "sha1-pmxQmN5MJbyIM27ItIF9AFvKe6k=", "dev": true, "requires": { - "nan": "2.6.2" + "nan": "2.10.0" } }, + "shallowequal": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.0.2.tgz", + "integrity": "sha512-zlVXeVUKvo+HEv1e2KQF/csyeMKx2oHvatQ9l6XjCUj3agvC8XGf6R9HvIPDSmp8FNPvx7b5kaEJTRi7CqxtEw==", + "dev": true + }, "shebang-command": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "dev": true, "requires": { - "shebang-regex": "1.0.0" + "shebang-regex": "^1.0.0" } }, "shebang-regex": { @@ -7105,11 +9092,17 @@ "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=", "dev": true, "requires": { - "glob": "7.1.2", - "interpret": "1.0.3", - "rechoir": "0.6.2" + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" } }, + "shortid": { + "version": "2.2.8", + "resolved": "https://registry.npmjs.org/shortid/-/shortid-2.2.8.tgz", + "integrity": "sha1-AzsRfWoul1gE9vCWnb59PQs1UTE=", + "dev": true + }, "sigmund": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz", @@ -7122,15 +9115,21 @@ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", "dev": true }, + "simple-concat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.0.tgz", + "integrity": "sha1-c0TLuLbib7J9ZrL8hvn21Zl1IcY=", + "dev": true + }, "simple-get": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz", "integrity": "sha1-6XVe2kB+ltpAxeUVjJ6jezO+y+s=", "dev": true, "requires": { - "once": "1.4.0", - "unzip-response": "1.0.2", - "xtend": "4.0.1" + "once": "^1.3.1", + "unzip-response": "^1.0.0", + "xtend": "^4.0.0" } }, "slash": { @@ -7145,7 +9144,7 @@ "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0" + "is-fullwidth-code-point": "^2.0.0" }, "dependencies": { "is-fullwidth-code-point": { @@ -7168,7 +9167,24 @@ "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", "dev": true, "requires": { - "hoek": "2.16.3" + "hoek": "2.x.x" + } + }, + "socketcluster-client": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/socketcluster-client/-/socketcluster-client-5.5.2.tgz", + "integrity": "sha1-nUNp4Oci/35V5UIsLUT1r+Gv8Sg=", + "dev": true, + "requires": { + "base-64": "0.1.0", + "clone": "2.1.1", + "linked-list": "0.1.0", + "querystring": "0.2.0", + "sc-channel": "~1.0.6", + "sc-emitter": "~1.1.0", + "sc-errors": "~1.3.0", + "sc-formatter": "~3.0.0", + "ws": "3.0.0" } }, "sol-digger": { @@ -7189,11 +9205,11 @@ "integrity": "sha1-lqu+4SZjQa6X+0vcOrzJvBtQUqs=", "dev": true, "requires": { - "fs-extra": "0.30.0", - "memorystream": "0.3.1", - "require-from-string": "1.2.1", - "semver": "5.4.1", - "yargs": "4.8.1" + "fs-extra": "^0.30.0", + "memorystream": "^0.3.1", + "require-from-string": "^1.1.0", + "semver": "^5.3.0", + "yargs": "^4.7.1" }, "dependencies": { "yargs": { @@ -7202,50 +9218,50 @@ "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", "dev": true, "requires": { - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "lodash.assign": "4.2.0", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "window-size": "0.2.0", - "y18n": "3.2.1", - "yargs-parser": "2.4.1" + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "lodash.assign": "^4.0.3", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^1.0.1", + "which-module": "^1.0.0", + "window-size": "^0.2.0", + "y18n": "^3.2.1", + "yargs-parser": "^2.4.1" } } } }, "solidity-coverage": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.5.0.tgz", - "integrity": "sha512-JUVh30DZaK0V61dUZWh4b+PXkD+FFEWpP2PuGj1LAMJNGdMWs3bo7I0hLlCTJiqJ2YZ1YF9v8hQyndFPhkIuCw==", + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.4.15.tgz", + "integrity": "sha512-iA3MT20rh1LllcNwfxAKU3ZBDu8R/4K8jANJAk7BcJU1foOjEh3tYhGqL8w2kRJPIo5XtoW0wxyVt95X2eJk/A==", "dev": true, "requires": { - "death": "1.1.0", + "death": "^1.1.0", "ethereumjs-testrpc-sc": "6.1.2", - "istanbul": "0.4.5", - "keccakjs": "0.2.1", - "req-cwd": "1.0.1", - "shelljs": "0.7.8", - "sol-explore": "1.6.2", - "solidity-parser-sc": "0.4.8", - "web3": "0.18.4" + "istanbul": "^0.4.5", + "keccakjs": "^0.2.1", + "req-cwd": "^1.0.1", + "shelljs": "^0.7.4", + "sol-explore": "^1.6.2", + "solidity-parser-sc": "0.4.7", + "web3": "^0.18.4" } }, "solidity-parser-sc": { - "version": "0.4.8", - "resolved": "https://registry.npmjs.org/solidity-parser-sc/-/solidity-parser-sc-0.4.8.tgz", - "integrity": "sha512-Suenp3ireAbJ1E58yXwcFbkxvuhX10VTKdmrPKVzharjMji1jySfvE8PuzIw3FivtkNwUsQtijQ/k6t21RFohg==", + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/solidity-parser-sc/-/solidity-parser-sc-0.4.7.tgz", + "integrity": "sha512-wbX2806sm6thZME1aniqLcLH9HYwNwuKke6aw/FEgupCvoT9Iq5PdwuN9OyHWKGBOVeczpM5tCrnRXWNQ04YVw==", "dev": true, "requires": { - "mocha": "2.5.3", - "pegjs": "0.10.0", - "yargs": "4.8.1" + "mocha": "^2.4.5", + "pegjs": "^0.10.0", + "yargs": "^4.6.0" }, "dependencies": { "yargs": { @@ -7254,20 +9270,47 @@ "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", "dev": true, "requires": { - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "lodash.assign": "4.2.0", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "window-size": "0.2.0", - "y18n": "3.2.1", - "yargs-parser": "2.4.1" + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "lodash.assign": "^4.0.3", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^1.0.1", + "which-module": "^1.0.0", + "window-size": "^0.2.0", + "y18n": "^3.2.1", + "yargs-parser": "^2.4.1" + } + } + } + }, + "solidity-sha3": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/solidity-sha3/-/solidity-sha3-0.4.1.tgz", + "integrity": "sha1-F1d+k/bP1YSJxOx/LaMEdTAynsE=", + "dev": true, + "requires": { + "babel-cli": "*", + "babel-preset-es2015": "*", + "babel-register": "*", + "left-pad": "^1.1.1", + "web3": "^0.16.0" + }, + "dependencies": { + "web3": { + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/web3/-/web3-0.16.0.tgz", + "integrity": "sha1-pFVBdc1GKUMDWx8dOUMvdBxrYBk=", + "dev": true, + "requires": { + "bignumber.js": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", + "crypto-js": "^3.1.4", + "utf8": "^2.1.1", + "xmlhttprequest": "*" } } } @@ -7278,17 +9321,17 @@ "integrity": "sha512-yYbalsrzJCU+QJ0HZvxAT4IQIqI1e6KPW2vop0NaHwdijqhQC9fJkVioCrL18NbO2Z8rdcnx8Y0JpvYJWrIjRg==", "dev": true, "requires": { - "ajv": "5.5.2", - "chokidar": "1.7.0", - "colors": "1.1.2", - "commander": "2.11.0", - "js-string-escape": "1.0.1", - "lodash": "4.17.4", + "ajv": "^5.2.2", + "chokidar": "^1.6.0", + "colors": "^1.1.2", + "commander": "^2.9.0", + "js-string-escape": "^1.0.1", + "lodash": "^4.14.2", "sol-digger": "0.0.2", "sol-explore": "1.6.1", "solium-plugin-security": "0.1.1", "solparse": "2.2.5", - "text-table": "0.2.0" + "text-table": "^0.2.0" }, "dependencies": { "ansi-regex": { @@ -7309,9 +9352,9 @@ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" } }, "debug": { @@ -7335,7 +9378,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "growl": { @@ -7380,9 +9423,9 @@ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, "sol-explore": { @@ -7397,9 +9440,9 @@ "integrity": "sha512-t7tvtR6KU6QfPYLMv1nlCh9DA8HYIu5tbjHpKu0fhGFZ1NuSp0KKDHfFHv07g6v1xgcuUY3rVqNFjZt5b9+5qA==", "dev": true, "requires": { - "mocha": "4.1.0", - "pegjs": "0.10.0", - "yargs": "10.1.2" + "mocha": "^4.0.1", + "pegjs": "^0.10.0", + "yargs": "^10.0.3" } }, "string-width": { @@ -7408,8 +9451,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -7418,7 +9461,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "supports-color": { @@ -7427,7 +9470,7 @@ "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", "dev": true, "requires": { - "has-flag": "2.0.0" + "has-flag": "^2.0.0" } }, "which-module": { @@ -7442,18 +9485,18 @@ "integrity": "sha512-ivSoxqBGYOqQVruxD35+EyCFDYNEFL/Uo6FcOnz+9xZdZzK0Zzw4r4KhbrME1Oo2gOggwJod2MnsdamSG7H9ig==", "dev": true, "requires": { - "cliui": "4.1.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" + "cliui": "^4.0.0", + "decamelize": "^1.1.1", + "find-up": "^2.1.0", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^8.1.0" } }, "yargs-parser": { @@ -7462,7 +9505,7 @@ "integrity": "sha512-yP+6QqN8BmrgW2ggLtTbdrOyBNSI7zBa4IykmiV5R1wl1JWNxQvWhMfMdmzIYtKU7oP3OOInY/tl2ov3BDjnJQ==", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" } } } @@ -7479,7 +9522,7 @@ "integrity": "sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=", "dev": true, "requires": { - "is-plain-obj": "1.1.0" + "is-plain-obj": "^1.0.0" } }, "source-map": { @@ -7494,16 +9537,22 @@ "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=", "dev": true, "requires": { - "source-map": "0.5.6" + "source-map": "^0.5.6" } }, + "spawn-args": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/spawn-args/-/spawn-args-0.1.0.tgz", + "integrity": "sha1-PgIyoFcbOHkH+LP1RKpTHGIkhIw=", + "dev": true + }, "spdx-correct": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", "dev": true, "requires": { - "spdx-license-ids": "1.2.2" + "spdx-license-ids": "^1.0.2" } }, "spdx-expression-parse": { @@ -7530,14 +9579,14 @@ "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", "dev": 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", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "tweetnacl": "~0.14.0" }, "dependencies": { "assert-plus": { @@ -7548,13 +9597,19 @@ } } }, + "statuses": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", + "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==", + "dev": true + }, "stream-to-observable": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/stream-to-observable/-/stream-to-observable-0.2.0.tgz", "integrity": "sha1-WdbqOT2HwsDdrBCqDVYbxrpvDhA=", "dev": true, "requires": { - "any-observable": "0.2.0" + "any-observable": "^0.2.0" } }, "strict-uri-encode": { @@ -7575,9 +9630,9 @@ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" } }, "string.prototype.trim": { @@ -7586,9 +9641,9 @@ "integrity": "sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=", "dev": true, "requires": { - "define-properties": "1.1.2", - "es-abstract": "1.8.0", - "function-bind": "1.1.0" + "define-properties": "^1.1.2", + "es-abstract": "^1.5.0", + "function-bind": "^1.0.2" } }, "string_decoder": { @@ -7597,7 +9652,7 @@ "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", "dev": true, "requires": { - "safe-buffer": "5.1.1" + "safe-buffer": "~5.1.0" } }, "stringstream": { @@ -7612,7 +9667,7 @@ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, "requires": { - "ansi-regex": "2.1.1" + "ansi-regex": "^2.0.0" } }, "strip-bom": { @@ -7621,7 +9676,7 @@ "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, "requires": { - "is-utf8": "0.2.1" + "is-utf8": "^0.2.0" } }, "strip-bom-stream": { @@ -7630,8 +9685,8 @@ "integrity": "sha1-+H217yYT9paKpUWr/h7HKLaoKco=", "dev": true, "requires": { - "first-chunk-stream": "2.0.0", - "strip-bom": "2.0.0" + "first-chunk-stream": "^2.0.0", + "strip-bom": "^2.0.0" } }, "strip-eof": { @@ -7667,18 +9722,25 @@ "integrity": "sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=", "dev": true }, + "symbol-tree": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz", + "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=", + "dev": true, + "optional": true + }, "table": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/table/-/table-4.0.2.tgz", "integrity": "sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==", "dev": true, "requires": { - "ajv": "5.5.0", - "ajv-keywords": "2.1.0", - "chalk": "2.3.0", - "lodash": "4.17.4", + "ajv": "^5.2.3", + "ajv-keywords": "^2.1.0", + "chalk": "^2.1.0", + "lodash": "^4.17.4", "slice-ansi": "1.0.0", - "string-width": "2.1.1" + "string-width": "^2.1.1" }, "dependencies": { "ajv": { @@ -7687,10 +9749,10 @@ "integrity": "sha1-6yhAdG6dxIvV4GOjbj/UAMXqtak=", "dev": true, "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.0.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, "ansi-regex": { @@ -7705,7 +9767,7 @@ "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", "dev": true, "requires": { - "color-convert": "1.9.1" + "color-convert": "^1.9.0" } }, "chalk": { @@ -7714,9 +9776,9 @@ "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", "dev": true, "requires": { - "ansi-styles": "3.2.0", - "escape-string-regexp": "1.0.5", - "supports-color": "4.5.0" + "ansi-styles": "^3.1.0", + "escape-string-regexp": "^1.0.5", + "supports-color": "^4.0.0" } }, "has-flag": { @@ -7737,8 +9799,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -7747,7 +9809,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "supports-color": { @@ -7756,30 +9818,36 @@ "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", "dev": true, "requires": { - "has-flag": "2.0.0" + "has-flag": "^2.0.0" } } } }, + "taffydb": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.7.3.tgz", + "integrity": "sha1-KtNxaWKUmPylvIQkMJbTzeDsOjQ=", + "dev": true + }, "tape": { "version": "4.8.0", "resolved": "https://registry.npmjs.org/tape/-/tape-4.8.0.tgz", "integrity": "sha512-TWILfEnvO7I8mFe35d98F6T5fbLaEtbFTG/lxWvid8qDfFTxt19EBijWmB4j3+Hoh5TfHE2faWs73ua+EphuBA==", "dev": true, "requires": { - "deep-equal": "1.0.1", - "defined": "1.0.0", - "for-each": "0.3.2", - "function-bind": "1.1.0", - "glob": "7.1.2", - "has": "1.0.1", - "inherits": "2.0.3", - "minimist": "1.2.0", - "object-inspect": "1.3.0", - "resolve": "1.4.0", - "resumer": "0.0.0", - "string.prototype.trim": "1.1.2", - "through": "2.3.8" + "deep-equal": "~1.0.1", + "defined": "~1.0.0", + "for-each": "~0.3.2", + "function-bind": "~1.1.0", + "glob": "~7.1.2", + "has": "~1.0.1", + "inherits": "~2.0.3", + "minimist": "~1.2.0", + "object-inspect": "~1.3.0", + "resolve": "~1.4.0", + "resumer": "~0.0.0", + "string.prototype.trim": "~1.1.2", + "through": "~2.3.8" }, "dependencies": { "minimist": { @@ -7796,10 +9864,10 @@ "integrity": "sha1-7M+TXpQUk9gVECjmNuUc5MPKfyA=", "dev": true, "requires": { - "chownr": "1.0.1", - "mkdirp": "0.5.1", - "pump": "1.0.2", - "tar-stream": "1.5.4" + "chownr": "^1.0.1", + "mkdirp": "^0.5.1", + "pump": "^1.0.0", + "tar-stream": "^1.1.2" } }, "tar-stream": { @@ -7808,10 +9876,10 @@ "integrity": "sha1-NlSc8E7RrumyowwBQyUiONr5QBY=", "dev": true, "requires": { - "bl": "1.2.1", - "end-of-stream": "1.4.0", - "readable-stream": "2.3.3", - "xtend": "4.0.1" + "bl": "^1.0.0", + "end-of-stream": "^1.0.0", + "readable-stream": "^2.0.0", + "xtend": "^4.0.0" } }, "temp": { @@ -7820,8 +9888,8 @@ "integrity": "sha1-4Ma8TSa5AxJEEOT+2BEDAU38H1k=", "dev": true, "requires": { - "os-tmpdir": "1.0.2", - "rimraf": "2.2.8" + "os-tmpdir": "^1.0.0", + "rimraf": "~2.2.6" }, "dependencies": { "rimraf": { @@ -7856,8 +9924,8 @@ "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", "dev": true, "requires": { - "readable-stream": "2.3.3", - "xtend": "4.0.1" + "readable-stream": "^2.1.5", + "xtend": "~4.0.1" } }, "timed-out": { @@ -7872,7 +9940,7 @@ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, "requires": { - "os-tmpdir": "1.0.2" + "os-tmpdir": "~1.0.2" } }, "to-fast-properties": { @@ -7893,9 +9961,16 @@ "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", "dev": true, "requires": { - "punycode": "1.4.1" + "punycode": "^1.4.1" } }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", + "dev": true, + "optional": true + }, "trim": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz", @@ -7914,8 +9989,8 @@ "integrity": "sha512-btDML3J9Ao+UDqR725ajTybcEqyXzxFzJDC/NAXOyOXoXf2HJwKq6VEvnjP9qc6owA+fJ50d87MmsPRXk+riCg==", "dev": true, "requires": { - "mocha": "3.5.3", - "original-require": "1.0.1", + "mocha": "^3.4.2", + "original-require": "^1.0.1", "solc": "0.4.23" }, "dependencies": { @@ -7925,7 +10000,7 @@ "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", "dev": true, "requires": { - "graceful-readlink": "1.0.1" + "graceful-readlink": ">= 1.0.0" } }, "diff": { @@ -7940,12 +10015,12 @@ "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=", "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" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.2", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } }, "mocha": { @@ -7974,11 +10049,11 @@ "integrity": "sha512-AT7anLHY6uIRg2It6N0UlCHeZ7YeecIkUhnlirrCgCPCUevtnoN48BxvgigN/4jJTRljv5oFhAJtI6gvHzT5DQ==", "dev": true, "requires": { - "fs-extra": "0.30.0", - "memorystream": "0.3.1", - "require-from-string": "1.2.1", - "semver": "5.4.1", - "yargs": "4.8.1" + "fs-extra": "^0.30.0", + "memorystream": "^0.3.1", + "require-from-string": "^1.1.0", + "semver": "^5.3.0", + "yargs": "^4.7.1" } }, "supports-color": { @@ -7987,7 +10062,7 @@ "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", "dev": true, "requires": { - "has-flag": "1.0.0" + "has-flag": "^1.0.0" } }, "yargs": { @@ -7996,34 +10071,624 @@ "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", "dev": true, "requires": { - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "lodash.assign": "4.2.0", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "window-size": "0.2.0", - "y18n": "3.2.1", - "yargs-parser": "2.4.1" + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "lodash.assign": "^4.0.3", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^1.0.1", + "which-module": "^1.0.0", + "window-size": "^0.2.0", + "y18n": "^3.2.1", + "yargs-parser": "^2.4.1" } } } }, + "truffle-artifactor": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/truffle-artifactor/-/truffle-artifactor-3.0.5.tgz", + "integrity": "sha512-nDCdAUTJ9CGDSvO6wBZbor0VtaGx0lOS+AC6qNW4njrN/rF7niKXdz7YRpiNX6snVsUPprY0gVZrgi02f4d+uw==", + "dev": true, + "requires": { + "async": "^1.5.2", + "debug": "^3.1.0", + "fs-extra": "^1.0.0", + "lodash": "^4.11.2", + "truffle-contract": "^3.0.5", + "truffle-contract-schema": "^2.0.0", + "truffle-expect": "^0.0.3" + }, + "dependencies": { + "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" + } + }, + "fs-extra": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz", + "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0", + "klaw": "^1.0.0" + } + } + } + }, + "truffle-blockchain-utils": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/truffle-blockchain-utils/-/truffle-blockchain-utils-0.0.4.tgz", + "integrity": "sha512-wgRrhwqh0aea08Hz28hUV4tuF2uTVQH/e9kBou+WK04cqrutB5cxQVQ6HGjeZLltxBYOFvhrGOOq4l3WJFnPEA==", + "dev": true + }, + "truffle-box": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/truffle-box/-/truffle-box-1.0.5.tgz", + "integrity": "sha512-r3x+gHaWvac2KcNnvFQDQid7YtOuq32M66z6fdr4cWuCbeSypHUnFOS6NS5QR5zrPyY83YYoinOTyWtEkKXzhw==", + "dev": true, + "requires": { + "fs-extra": "^3.0.1", + "github-download": "^0.5.0", + "request": "^2.83.0", + "tmp": "^0.0.31", + "vcsurl": "^0.1.1" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true + }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "dev": true + }, + "boom": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", + "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", + "dev": true, + "requires": { + "hoek": "4.x.x" + } + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "dev": true + }, + "cryptiles": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", + "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", + "dev": true, + "requires": { + "boom": "5.x.x" + }, + "dependencies": { + "boom": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", + "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", + "dev": true, + "requires": { + "hoek": "4.x.x" + } + } + } + }, + "form-data": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", + "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", + "dev": true, + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "1.0.6", + "mime-types": "^2.1.12" + }, + "dependencies": { + "combined-stream": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", + "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", + "dev": true, + "requires": { + "delayed-stream": "~1.0.0" + } + } + } + }, + "fs-extra": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz", + "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^3.0.0", + "universalify": "^0.1.0" + } + }, + "har-validator": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", + "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", + "dev": true, + "requires": { + "ajv": "^5.1.0", + "har-schema": "^2.0.0" + } + }, + "hawk": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", + "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", + "dev": true, + "requires": { + "boom": "4.x.x", + "cryptiles": "3.x.x", + "hoek": "4.x.x", + "sntp": "2.x.x" + } + }, + "hoek": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", + "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==", + "dev": true + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dev": true, + "requires": { + "assert-plus": "^1.0.0", + "jsprim": "^1.2.2", + "sshpk": "^1.7.0" + } + }, + "jsonfile": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", + "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6" + } + }, + "mime-db": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", + "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==", + "dev": true + }, + "mime-types": { + "version": "2.1.18", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", + "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", + "dev": true, + "requires": { + "mime-db": "~1.33.0" + } + }, + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "dev": true + }, + "request": { + "version": "2.86.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.86.0.tgz", + "integrity": "sha512-BQZih67o9r+Ys94tcIW4S7Uu8pthjrQVxhsZ/weOwHbDfACxvIyvnAbzFQxjy1jMtvFSzv5zf4my6cZsJBbVzw==", + "dev": true, + "requires": { + "aws-sign2": "~0.7.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.3.1", + "har-validator": "~5.0.3", + "hawk": "~6.0.2", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.17", + "oauth-sign": "~0.8.2", + "performance-now": "^2.1.0", + "qs": "~6.5.1", + "safe-buffer": "^5.1.1", + "tough-cookie": "~2.3.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.1.0" + } + }, + "sntp": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", + "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", + "dev": true, + "requires": { + "hoek": "4.x.x" + } + }, + "tmp": { + "version": "0.0.31", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", + "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", + "dev": true, + "requires": { + "os-tmpdir": "~1.0.1" + } + }, + "tough-cookie": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", + "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", + "dev": true, + "requires": { + "punycode": "^1.4.1" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, + "requires": { + "safe-buffer": "^5.0.1" + } + } + } + }, + "truffle-code-utils": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/truffle-code-utils/-/truffle-code-utils-1.1.0.tgz", + "integrity": "sha512-Ge6AMy06BnudvFtuG7FpbVIIh533us7F2KZo/nj5yVJyV9uA4oT8j+lrvPsuGjoa4+1maQvPbltV8A5y9OvjqQ==", + "dev": true + }, + "truffle-compile": { + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/truffle-compile/-/truffle-compile-3.0.10.tgz", + "integrity": "sha512-CC/4WbNd08R8AyRQ9R4Ub1ewso7YqRENlkdKoIfidU2xFMMJ4FlacN3m0oJinBrG5nZmkJOICu68sgfq4ohkew==", + "dev": true, + "requires": { + "async": "^2.1.4", + "colors": "^1.1.2", + "debug": "^3.1.0", + "graphlib": "^2.1.1", + "solc": "0.4.23", + "truffle-config": "^1.0.4", + "truffle-contract-sources": "^0.0.1", + "truffle-error": "^0.0.2", + "truffle-expect": "^0.0.3" + }, + "dependencies": { + "async": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", + "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "dev": true, + "requires": { + "lodash": "^4.14.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" + } + }, + "solc": { + "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", + "memorystream": "^0.3.1", + "require-from-string": "^1.1.0", + "semver": "^5.3.0", + "yargs": "^4.7.1" + } + }, + "yargs": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", + "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", + "dev": true, + "requires": { + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "lodash.assign": "^4.0.3", + "os-locale": "^1.4.0", + "read-pkg-up": "^1.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^1.0.1", + "which-module": "^1.0.0", + "window-size": "^0.2.0", + "y18n": "^3.2.1", + "yargs-parser": "^2.4.1" + } + } + } + }, + "truffle-config": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/truffle-config/-/truffle-config-1.0.4.tgz", + "integrity": "sha512-E8pvJNAIjs7LNsjkYeS2dgoOnLoSBrTwb1xF5lJwfvZmGMFpKvVL1sa5jpFxozpf/WkRn/rfxy8zTdb3pq16jA==", + "dev": true, + "requires": { + "find-up": "^2.1.0", + "lodash": "^4.17.4", + "original-require": "^1.0.0", + "truffle-error": "^0.0.2", + "truffle-provider": "^0.0.4" + }, + "dependencies": { + "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" + } + } + } + }, + "truffle-contract": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/truffle-contract/-/truffle-contract-3.0.5.tgz", + "integrity": "sha512-lRayhvX73OrLJ6TDvc0iYbzcB+Y1F9FCj9N1FXQ2EKOkqyIjmgZNMZFHGjvfTws1gsmonYd6sND0ahipiUYy8g==", + "dev": true, + "requires": { + "ethjs-abi": "0.1.8", + "truffle-blockchain-utils": "^0.0.4", + "truffle-contract-schema": "^2.0.0", + "truffle-error": "0.0.2", + "web3": "^0.20.1" + }, + "dependencies": { + "bignumber.js": { + "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git", + "dev": true + }, + "bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", + "dev": true + }, + "ethjs-abi": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.1.8.tgz", + "integrity": "sha1-zSiFg+1ijN+tr4re+juh28vKbBg=", + "dev": true, + "requires": { + "bn.js": "4.11.6", + "js-sha3": "0.5.5", + "number-to-bn": "1.7.0" + } + }, + "js-sha3": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz", + "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=", + "dev": true + }, + "web3": { + "version": "0.20.6", + "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.6.tgz", + "integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=", + "dev": true, + "requires": { + "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "crypto-js": "^3.1.4", + "utf8": "^2.1.1", + "xhr2": "*", + "xmlhttprequest": "*" + } + } + } + }, + "truffle-contract-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/truffle-contract-schema/-/truffle-contract-schema-2.0.0.tgz", + "integrity": "sha512-nLlspmu1GKDaluWksBwitHi/7Z3IpRjmBYeO9N+T1nVJD2V4IWJaptCKP1NqnPiJA+FChB7+F7pI6Br51/FtXQ==", + "dev": true, + "requires": { + "ajv": "^5.1.1", + "crypto-js": "^3.1.9-1", + "debug": "^3.1.0" + }, + "dependencies": { + "crypto-js": { + "version": "3.1.9-1", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz", + "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=", + "dev": true + }, + "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" + } + } + } + }, + "truffle-contract-sources": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/truffle-contract-sources/-/truffle-contract-sources-0.0.1.tgz", + "integrity": "sha1-KbYnA2bIYQnLsOswdBj8ayeV1/0=", + "dev": true, + "requires": { + "node-dir": "^0.1.16" + }, + "dependencies": { + "node-dir": { + "version": "0.1.17", + "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", + "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=", + "dev": true, + "requires": { + "minimatch": "^3.0.2" + } + } + } + }, + "truffle-debug-utils": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/truffle-debug-utils/-/truffle-debug-utils-1.0.5.tgz", + "integrity": "sha512-LiqDKOl6ePuPiKXiy6uOKJhbOeeIidGljTeCWnleistdSgvrYRp3V/j0O2pjXTCQ1Ez28WGKZZFbVZ2dA01Vtw==", + "dev": true, + "requires": { + "async": "^1.4.2", + "debug": "^3.1.0", + "node-dir": "^0.1.17" + }, + "dependencies": { + "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" + } + }, + "node-dir": { + "version": "0.1.17", + "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", + "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=", + "dev": true, + "requires": { + "minimatch": "^3.0.2" + } + } + } + }, + "truffle-debugger": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/truffle-debugger/-/truffle-debugger-4.0.0.tgz", + "integrity": "sha512-zW/rCCk3eK+AtaPpf5Bebcq4r5j+oMNieL0jWTUTVKryo0w57PTzRolyrvvpBeo1+LCbvcqg/xGQtf8hK3NWBg==", + "dev": true, + "requires": { + "bignumber.js": "^6.0.0", + "debug": "^3.1.0", + "json-pointer": "^0.6.0", + "node-interval-tree": "^1.3.3", + "redux": "^3.7.2", + "redux-cli-logger": "^2.0.1", + "redux-saga": "^0.16.0", + "remote-redux-devtools": "^0.5.12", + "reselect-tree": "^1.2.0", + "truffle-code-utils": "^1.1.0", + "truffle-expect": "0.0.3", + "truffle-solidity-utils": "^1.1.0", + "web3": "^0.20.2", + "web3-eth-abi": "^1.0.0-beta.29" + }, + "dependencies": { + "bignumber.js": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-6.0.0.tgz", + "integrity": "sha512-x247jIuy60/+FtMRvscqfxtVHQf8AGx2hm9c6btkgC0x/hp9yt+teISNhvF8WlwRkCc5yF2fDECH8SIMe8j+GA==", + "dev": true + }, + "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" + } + }, + "web3": { + "version": "0.20.6", + "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.6.tgz", + "integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=", + "dev": true, + "requires": { + "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "crypto-js": "^3.1.4", + "utf8": "^2.1.1", + "xhr2": "*", + "xmlhttprequest": "*" + }, + "dependencies": { + "bignumber.js": { + "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git", + "dev": true + } + } + } + } + }, + "truffle-deployer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/truffle-deployer/-/truffle-deployer-2.0.5.tgz", + "integrity": "sha512-8hT1ksvAUateANJGSYtmuTRhyhBb5mw5r4ilkLNjIVDdVqLzXUHzFAmE3RA6n6iNdTiKEPnIL3V6OztlWM4JCg==", + "dev": true, + "requires": { + "truffle-contract": "^3.0.5", + "truffle-expect": "^0.0.3" + } + }, + "truffle-error": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/truffle-error/-/truffle-error-0.0.2.tgz", + "integrity": "sha1-AbGJt4UFVmrhaJwjnHyi3RIc/kw=", + "dev": true + }, + "truffle-expect": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/truffle-expect/-/truffle-expect-0.0.3.tgz", + "integrity": "sha1-m3XO80O9WW5+XbyHj18bLjGKlEw=", + "dev": true + }, "truffle-hdwallet-provider": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/truffle-hdwallet-provider/-/truffle-hdwallet-provider-0.0.3.tgz", "integrity": "sha1-Dh3gIQS3PTh14c9wkzBbTqii2EM=", "dev": true, "requires": { - "bip39": "2.2.0", - "ethereumjs-wallet": "0.6.0", - "web3": "0.18.4", - "web3-provider-engine": "8.6.1" + "bip39": "^2.2.0", + "ethereumjs-wallet": "^0.6.0", + "web3": "^0.18.2", + "web3-provider-engine": "^8.4.0" }, "dependencies": { "async": { @@ -8032,7 +10697,7 @@ "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", "dev": true, "requires": { - "lodash": "4.17.4" + "lodash": "^4.14.0" } }, "ethereum-common": { @@ -8047,8 +10712,8 @@ "integrity": "sha1-7OBR0+/b53GtKlGNYWMsoqt17Ls=", "dev": true, "requires": { - "ethereum-common": "0.0.18", - "ethereumjs-util": "5.1.2" + "ethereum-common": "^0.0.18", + "ethereumjs-util": "^5.0.0" } }, "web3": { @@ -8058,10 +10723,10 @@ "dev": true, "requires": { "bignumber.js": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", - "crypto-js": "3.1.8", - "utf8": "2.1.2", - "xhr2": "0.1.4", - "xmlhttprequest": "1.8.0" + "crypto-js": "^3.1.4", + "utf8": "^2.1.1", + "xhr2": "*", + "xmlhttprequest": "*" } }, "web3-provider-engine": { @@ -8070,24 +10735,25 @@ "integrity": "sha1-TYbhnjDKr5ffNRUR7A9gE25bMOs=", "dev": true, "requires": { - "async": "2.5.0", - "clone": "2.1.1", - "ethereumjs-block": "1.2.2", - "ethereumjs-tx": "1.3.3", - "ethereumjs-util": "5.1.2", - "ethereumjs-vm": "2.3.5", - "isomorphic-fetch": "2.2.1", - "request": "2.79.0", - "semaphore": "1.1.0", - "solc": "0.4.8", - "tape": "4.8.0", - "web3": "0.16.0", - "xhr": "2.4.0", - "xtend": "4.0.1" + "async": "^2.1.2", + "clone": "^2.0.0", + "ethereumjs-block": "^1.2.2", + "ethereumjs-tx": "^1.2.0", + "ethereumjs-util": "^5.0.1", + "ethereumjs-vm": "^2.0.2", + "isomorphic-fetch": "^2.2.0", + "request": "^2.67.0", + "semaphore": "^1.0.3", + "solc": "^0.4.2", + "tape": "^4.4.0", + "web3": "^0.16.0", + "xhr": "^2.2.0", + "xtend": "^4.0.1" }, "dependencies": { "bignumber.js": { "version": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9", + "from": "bignumber.js@git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9", "dev": true }, "ethereum-common": { @@ -8102,17 +10768,17 @@ "integrity": "sha512-AJ7x44+xqyE5+UO3Nns19WkTdZfyqFZ+sEjIEpvme7Ipbe3iBU1uwCcHEdiu/yY9bdhr3IfSa/NfIKNeXPaRVQ==", "dev": true, "requires": { - "async": "2.5.0", - "async-eventemitter": "0.2.3", + "async": "^2.1.2", + "async-eventemitter": "^0.2.2", "ethereum-common": "0.2.0", - "ethereumjs-account": "2.0.4", - "ethereumjs-block": "1.7.1", - "ethereumjs-util": "5.2.0", - "fake-merkle-patricia-tree": "1.0.1", - "functional-red-black-tree": "1.0.1", - "merkle-patricia-tree": "2.1.2", - "rustbn.js": "0.1.2", - "safe-buffer": "5.1.1" + "ethereumjs-account": "^2.0.3", + "ethereumjs-block": "~1.7.0", + "ethereumjs-util": "^5.1.3", + "fake-merkle-patricia-tree": "^1.0.1", + "functional-red-black-tree": "^1.0.1", + "merkle-patricia-tree": "^2.1.2", + "rustbn.js": "~0.1.1", + "safe-buffer": "^5.1.1" }, "dependencies": { "ethereumjs-block": { @@ -8121,11 +10787,11 @@ "integrity": "sha512-B+sSdtqm78fmKkBq78/QLKJbu/4Ts4P2KFISdgcuZUPDm9x+N7qgBPIIFUGbaakQh8bzuquiRVbdmvPKqbILRg==", "dev": true, "requires": { - "async": "2.5.0", + "async": "^2.0.1", "ethereum-common": "0.2.0", - "ethereumjs-tx": "1.3.3", - "ethereumjs-util": "5.2.0", - "merkle-patricia-tree": "2.1.2" + "ethereumjs-tx": "^1.2.2", + "ethereumjs-util": "^5.0.0", + "merkle-patricia-tree": "^2.1.2" } }, "ethereumjs-util": { @@ -8134,13 +10800,13 @@ "integrity": "sha512-CJAKdI0wgMbQFLlLRtZKGcy/L6pzVRgelIZqRqNbuVFM3K9VEnyfbcvz0ncWMRNCe4kaHWjwRYQcYMucmwsnWA==", "dev": true, "requires": { - "bn.js": "4.11.8", - "create-hash": "1.1.3", - "ethjs-util": "0.1.4", - "keccak": "1.3.0", - "rlp": "2.0.0", - "safe-buffer": "5.1.1", - "secp256k1": "3.3.0" + "bn.js": "^4.11.0", + "create-hash": "^1.1.2", + "ethjs-util": "^0.1.3", + "keccak": "^1.0.2", + "rlp": "^2.0.0", + "safe-buffer": "^5.1.1", + "secp256k1": "^3.0.1" } } } @@ -8152,21 +10818,227 @@ "dev": true, "requires": { "bignumber.js": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9", - "crypto-js": "3.1.8", - "utf8": "2.1.2", - "xmlhttprequest": "1.8.0" + "crypto-js": "^3.1.4", + "utf8": "^2.1.1", + "xmlhttprequest": "*" } } } } } }, + "truffle-init": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/truffle-init/-/truffle-init-1.0.7.tgz", + "integrity": "sha1-w95X+936d66TZCrgJfQcEVfeK6c=", + "dev": true, + "requires": { + "fs-extra": "^2.0.0", + "github-download": "^0.5.0", + "npm-programmatic": "0.0.6", + "rimraf": "^2.5.4", + "temp": "^0.8.3", + "truffle-config": "^1.0.1" + }, + "dependencies": { + "fs-extra": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz", + "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0" + } + }, + "npm-programmatic": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/npm-programmatic/-/npm-programmatic-0.0.6.tgz", + "integrity": "sha1-PI9NuyEO/WW5nualrHbye01da3g=", + "dev": true, + "requires": { + "bluebird": "^3.4.1" + } + } + } + }, + "truffle-migrate": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/truffle-migrate/-/truffle-migrate-2.0.6.tgz", + "integrity": "sha512-3I305tX+ot6dQqwg5NhbI9OlbhUXfZ+M6Wgh1nszFAH07I0Pj7/P7gj84OeoWJl1RWwopLY51KdkSqNAquazhA==", + "dev": true, + "requires": { + "async": "^2.1.4", + "node-dir": "^0.1.16", + "truffle-deployer": "^2.0.5", + "truffle-expect": "^0.0.3", + "truffle-require": "^1.0.5", + "web3": "^0.20.1" + }, + "dependencies": { + "async": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", + "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "dev": true, + "requires": { + "lodash": "^4.14.0" + } + }, + "bignumber.js": { + "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git", + "dev": true + }, + "node-dir": { + "version": "0.1.17", + "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", + "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=", + "dev": true, + "requires": { + "minimatch": "^3.0.2" + } + }, + "web3": { + "version": "0.20.6", + "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.6.tgz", + "integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=", + "dev": true, + "requires": { + "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "crypto-js": "^3.1.4", + "utf8": "^2.1.1", + "xhr2": "*", + "xmlhttprequest": "*" + } + } + } + }, + "truffle-provider": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/truffle-provider/-/truffle-provider-0.0.4.tgz", + "integrity": "sha512-yVxxjocxnJcFspQ0T4Rjq/1wvvm3iLxidb6oa1EAX5LsnSQLPG8wAM5+JLlJ4FDBsqJdZLGOq1RR5Ln/w7x5JA==", + "dev": true, + "requires": { + "truffle-error": "^0.0.2", + "web3": "^0.20.1" + }, + "dependencies": { + "bignumber.js": { + "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git", + "dev": true + }, + "web3": { + "version": "0.20.6", + "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.6.tgz", + "integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=", + "dev": true, + "requires": { + "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "crypto-js": "^3.1.4", + "utf8": "^2.1.1", + "xhr2": "*", + "xmlhttprequest": "*" + } + } + } + }, + "truffle-provisioner": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/truffle-provisioner/-/truffle-provisioner-0.1.0.tgz", + "integrity": "sha1-Ap5SScEBUwBzhTXgT97ZMaU8T2I=", + "dev": true + }, + "truffle-require": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/truffle-require/-/truffle-require-1.0.5.tgz", + "integrity": "sha512-17RymhvR1K5gJUXCn2i3fDARAc3oxkblGkK93bsPaVebTi8QAoy8QcyGVchI7DoYXiGPPxUFE0hIWYK0BMWaXw==", + "dev": true, + "requires": { + "original-require": "^1.0.1", + "truffle-config": "^1.0.4", + "truffle-expect": "^0.0.3", + "web3": "^0.20.1" + }, + "dependencies": { + "bignumber.js": { + "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git", + "dev": true + }, + "web3": { + "version": "0.20.6", + "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.6.tgz", + "integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=", + "dev": true, + "requires": { + "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "crypto-js": "^3.1.4", + "utf8": "^2.1.1", + "xhr2": "*", + "xmlhttprequest": "*" + } + } + } + }, + "truffle-resolver": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/truffle-resolver/-/truffle-resolver-4.0.3.tgz", + "integrity": "sha512-CXzfXcG6LxQm5cWXH/HJE85pnvHvPDB16l2pzk9/q1F9Y4BWD2xS4rYzvrXGjkPNGrYTkNY+baF5YN/6eIGGgQ==", + "dev": true, + "requires": { + "async": "^2.1.4", + "truffle-contract": "^3.0.5", + "truffle-expect": "0.0.3", + "truffle-provisioner": "^0.1.0" + }, + "dependencies": { + "async": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", + "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "dev": true, + "requires": { + "lodash": "^4.14.0" + } + } + } + }, + "truffle-solidity-utils": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/truffle-solidity-utils/-/truffle-solidity-utils-1.1.1.tgz", + "integrity": "sha512-ytm/9nTXCN4Vwf/PCuhj1HMuuDGQElVON4YqW4URycMQqZ+gmjRRDnatcQ2tzEj+gjYeMFaAUO79JzZqfHjEFg==", + "dev": true + }, + "truffle-workflow-compile": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/truffle-workflow-compile/-/truffle-workflow-compile-1.0.3.tgz", + "integrity": "sha512-Vqjm66yBDX5BaVV5SvUs1L1tpXHaOIvt9OSvflrT5RekONAx6YE1HmAvEYIFR68PR4b2tXvc4P41HNGh/Y4/qQ==", + "dev": true, + "requires": { + "async": "^1.4.2", + "lodash": "^4.5.1", + "mkdirp": "^0.5.1", + "truffle-artifactor": "^3.0.5", + "truffle-compile": "^3.0.10", + "truffle-config": "^1.0.4", + "truffle-expect": "^0.0.3", + "truffle-resolver": "^4.0.3" + } + }, "tryit": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz", "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=", "dev": true }, + "tunnel": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.2.tgz", + "integrity": "sha1-8jvNi3p7ioZCYbIIT2b5MZM5YzQ=", + "dev": true + }, "tunnel-agent": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", @@ -8186,7 +11058,7 @@ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", "dev": true, "requires": { - "prelude-ls": "1.1.2" + "prelude-ls": "~1.1.2" } }, "type-detect": { @@ -8195,6 +11067,33 @@ "integrity": "sha1-Dj8mcLRAmbC0bChNE2p+9Jx0wuo=", "dev": true }, + "type-is": { + "version": "1.6.16", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz", + "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", + "dev": true, + "requires": { + "media-typer": "0.3.0", + "mime-types": "~2.1.18" + }, + "dependencies": { + "mime-db": { + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", + "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==", + "dev": true + }, + "mime-types": { + "version": "2.1.18", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", + "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", + "dev": true, + "requires": { + "mime-db": "~1.33.0" + } + } + } + }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", @@ -8208,9 +11107,9 @@ "dev": true, "optional": true, "requires": { - "source-map": "0.5.6", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" } }, "uglify-to-browserify": { @@ -8220,18 +11119,36 @@ "dev": true, "optional": true }, + "ultron": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", + "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==", + "dev": true + }, "underscore": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz", "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=", "dev": true }, + "universalify": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.1.tgz", + "integrity": "sha1-+nG63UQ3r0wUiEHjs7Fl+enlkLc=", + "dev": true + }, "unorm": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz", "integrity": "sha1-NkIA1fE2RsqLzURJAnEzVhR5IwA=", "dev": true }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "dev": true + }, "untildify": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/untildify/-/untildify-3.0.2.tgz", @@ -8250,15 +11167,27 @@ "integrity": "sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=", "dev": true, "requires": { - "prepend-http": "2.0.0" + "prepend-http": "^2.0.0" } }, + "url-set-query": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/url-set-query/-/url-set-query-1.0.0.tgz", + "integrity": "sha1-AW6M/Xwg7gXK/neV6JK9BwL6ozk=", + "dev": true + }, "url-to-options": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz", "integrity": "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=", "dev": true }, + "user-home": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", + "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=", + "dev": true + }, "utf8": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", @@ -8271,6 +11200,12 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", + "dev": true + }, "uuid": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", @@ -8283,25 +11218,46 @@ "integrity": "sha512-ejdrifsIydN1XDH7EuR2hn8ZrkRKUYF7tUcBjBy/lhrCvs2K+zRlbW9UHc0IQ9RsYFZJFqJrieoIHfkCa0DBRA==", "dev": true }, + "v8flags": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", + "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", + "dev": true, + "requires": { + "user-home": "^1.1.1" + } + }, "validate-npm-package-license": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", "dev": true, "requires": { - "spdx-correct": "1.0.2", - "spdx-expression-parse": "1.0.4" + "spdx-correct": "~1.0.0", + "spdx-expression-parse": "~1.0.0" } }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "dev": true + }, + "vcsurl": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/vcsurl/-/vcsurl-0.1.1.tgz", + "integrity": "sha1-XgChCec4G1W11FuJJTPI7DXJMgw=", + "dev": true + }, "verror": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "dev": true, "requires": { - "assert-plus": "1.0.0", + "assert-plus": "^1.0.0", "core-util-is": "1.0.2", - "extsprintf": "1.3.0" + "extsprintf": "^1.2.0" }, "dependencies": { "assert-plus": { @@ -8318,8 +11274,8 @@ "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", "dev": true, "requires": { - "clone": "1.0.4", - "clone-stats": "0.0.1", + "clone": "^1.0.0", + "clone-stats": "^0.0.1", "replace-ext": "0.0.1" }, "dependencies": { @@ -8337,12 +11293,12 @@ "integrity": "sha1-p+v1/779obfRjRQPyweyI++2dRo=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0", - "strip-bom-stream": "2.0.0", - "vinyl": "1.2.0" + "graceful-fs": "^4.1.2", + "pify": "^2.3.0", + "pinkie-promise": "^2.0.0", + "strip-bom": "^2.0.0", + "strip-bom-stream": "^2.0.0", + "vinyl": "^1.1.0" } }, "web3": { @@ -8352,19 +11308,124 @@ "dev": true, "requires": { "bignumber.js": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", - "crypto-js": "3.1.8", - "utf8": "2.1.2", - "xhr2": "0.1.4", - "xmlhttprequest": "1.8.0" + "crypto-js": "^3.1.4", + "utf8": "^2.1.1", + "xhr2": "*", + "xmlhttprequest": "*" } }, + "web3-core-helpers": { + "version": "1.0.0-beta.34", + "resolved": "https://registry.npmjs.org/web3-core-helpers/-/web3-core-helpers-1.0.0-beta.34.tgz", + "integrity": "sha1-sWjaANPhnhVrwVriAyA91N/uLQM=", + "dev": true, + "requires": { + "underscore": "1.8.3", + "web3-eth-iban": "1.0.0-beta.34", + "web3-utils": "1.0.0-beta.34" + }, + "dependencies": { + "underscore": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", + "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", + "dev": true + } + } + }, + "web3-eth-abi": { + "version": "1.0.0-beta.34", + "resolved": "https://registry.npmjs.org/web3-eth-abi/-/web3-eth-abi-1.0.0-beta.34.tgz", + "integrity": "sha1-A0Uz46ovfln/MXk+rqaFwO1a9no=", + "dev": true, + "requires": { + "bn.js": "4.11.6", + "underscore": "1.8.3", + "web3-core-helpers": "1.0.0-beta.34", + "web3-utils": "1.0.0-beta.34" + }, + "dependencies": { + "bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", + "dev": true + }, + "underscore": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", + "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", + "dev": true + } + } + }, + "web3-eth-iban": { + "version": "1.0.0-beta.34", + "resolved": "https://registry.npmjs.org/web3-eth-iban/-/web3-eth-iban-1.0.0-beta.34.tgz", + "integrity": "sha1-mvRYYFhnzPdOqXmq8yazi6alugw=", + "dev": true, + "requires": { + "bn.js": "4.11.6", + "web3-utils": "1.0.0-beta.34" + }, + "dependencies": { + "bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", + "dev": true + } + } + }, + "web3-utils": { + "version": "1.0.0-beta.34", + "resolved": "https://registry.npmjs.org/web3-utils/-/web3-utils-1.0.0-beta.34.tgz", + "integrity": "sha1-lBH8OarvOcpOBhafdiKX2f8CCXA=", + "dev": true, + "requires": { + "bn.js": "4.11.6", + "eth-lib": "0.1.27", + "ethjs-unit": "0.1.6", + "number-to-bn": "1.7.0", + "randomhex": "0.1.5", + "underscore": "1.8.3", + "utf8": "2.1.1" + }, + "dependencies": { + "bn.js": { + "version": "4.11.6", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", + "dev": true + }, + "underscore": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", + "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=", + "dev": true + }, + "utf8": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.1.tgz", + "integrity": "sha1-LgHbAvfY0JRPdxBPFgnrDDBM92g=", + "dev": true + } + } + }, + "webidl-conversions": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-2.0.1.tgz", + "integrity": "sha1-O/glj30xjHRDw28uFpQCoaZwNQY=", + "dev": true, + "optional": true + }, "webpack-addons": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/webpack-addons/-/webpack-addons-1.1.5.tgz", "integrity": "sha512-MGO0nVniCLFAQz1qv22zM02QPjcpAoJdy7ED0i3Zy7SY1IecgXCm460ib7H/Wq7e9oL5VL6S2BxaObxwIcag0g==", "dev": true, "requires": { - "jscodeshift": "0.4.1" + "jscodeshift": "^0.4.0" }, "dependencies": { "ast-types": { @@ -8385,21 +11446,21 @@ "integrity": "sha512-iOX6If+hsw0q99V3n31t4f5VlD1TQZddH08xbT65ZqA7T4Vkx68emrDZMUOLVvCEAJ6NpAk7DECe3fjC/t52AQ==", "dev": true, "requires": { - "async": "1.5.2", - "babel-plugin-transform-flow-strip-types": "6.22.0", - "babel-preset-es2015": "6.24.1", - "babel-preset-stage-1": "6.24.1", - "babel-register": "6.24.1", - "babylon": "6.17.4", - "colors": "1.1.2", - "flow-parser": "0.69.0", - "lodash": "4.17.4", - "micromatch": "2.3.11", + "async": "^1.5.0", + "babel-plugin-transform-flow-strip-types": "^6.8.0", + "babel-preset-es2015": "^6.9.0", + "babel-preset-stage-1": "^6.5.0", + "babel-register": "^6.9.0", + "babylon": "^6.17.3", + "colors": "^1.1.2", + "flow-parser": "^0.*", + "lodash": "^4.13.1", + "micromatch": "^2.3.7", "node-dir": "0.1.8", - "nomnom": "1.8.1", - "recast": "0.12.9", - "temp": "0.8.3", - "write-file-atomic": "1.3.4" + "nomnom": "^1.8.1", + "recast": "^0.12.5", + "temp": "^0.8.1", + "write-file-atomic": "^1.2.0" } }, "recast": { @@ -8409,10 +11470,10 @@ "dev": true, "requires": { "ast-types": "0.10.1", - "core-js": "2.5.0", - "esprima": "4.0.0", - "private": "0.1.7", - "source-map": "0.6.1" + "core-js": "^2.4.1", + "esprima": "~4.0.0", + "private": "~0.1.5", + "source-map": "~0.6.1" } }, "source-map": { @@ -8429,32 +11490,32 @@ "integrity": "sha512-gRoWaxSi2JWiYsn1QgOTb6ENwIeSvN1YExZ+kJ0STsTZK7bWPElW+BBBv1UnTbvcPC3v7E17mK8hlFX8DOYSGw==", "dev": true, "requires": { - "chalk": "2.3.2", - "cross-spawn": "6.0.5", - "diff": "3.5.0", - "enhanced-resolve": "4.0.0", - "envinfo": "4.4.2", - "glob-all": "3.1.0", - "global-modules": "1.0.0", - "got": "8.3.0", - "import-local": "1.0.0", - "inquirer": "5.2.0", - "interpret": "1.1.0", - "jscodeshift": "0.5.0", - "listr": "0.13.0", - "loader-utils": "1.1.0", - "lodash": "4.17.5", - "log-symbols": "2.2.0", - "mkdirp": "0.5.1", - "p-each-series": "1.0.0", - "p-lazy": "1.0.0", - "prettier": "1.11.1", - "supports-color": "5.3.0", - "v8-compile-cache": "1.1.2", - "webpack-addons": "1.1.5", - "yargs": "11.1.0", - "yeoman-environment": "2.0.6", - "yeoman-generator": "2.0.3" + "chalk": "^2.3.2", + "cross-spawn": "^6.0.5", + "diff": "^3.5.0", + "enhanced-resolve": "^4.0.0", + "envinfo": "^4.4.2", + "glob-all": "^3.1.0", + "global-modules": "^1.0.0", + "got": "^8.2.0", + "import-local": "^1.0.0", + "inquirer": "^5.1.0", + "interpret": "^1.0.4", + "jscodeshift": "^0.5.0", + "listr": "^0.13.0", + "loader-utils": "^1.1.0", + "lodash": "^4.17.5", + "log-symbols": "^2.2.0", + "mkdirp": "^0.5.1", + "p-each-series": "^1.0.0", + "p-lazy": "^1.0.0", + "prettier": "^1.5.3", + "supports-color": "^5.3.0", + "v8-compile-cache": "^1.1.2", + "webpack-addons": "^1.1.5", + "yargs": "^11.1.0", + "yeoman-environment": "^2.0.0", + "yeoman-generator": "^2.0.3" }, "dependencies": { "ansi-regex": { @@ -8469,7 +11530,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.1" + "color-convert": "^1.9.0" } }, "camelcase": { @@ -8484,9 +11545,9 @@ "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.3.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "cliui": { @@ -8495,9 +11556,9 @@ "integrity": "sha512-nY3W5Gu2racvdDk//ELReY+dHjb9PlIcVDFXP72nVIhq2Gy3LuVXYwJoPVudwQnv1shtohpgkdCKT2YaKY0CKw==", "dev": true, "requires": { - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "wrap-ansi": "2.1.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" } }, "cross-spawn": { @@ -8506,11 +11567,11 @@ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "nice-try": "1.0.4", - "path-key": "2.0.1", - "semver": "5.5.0", - "shebang-command": "1.2.0", - "which": "1.3.0" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } }, "diff": { @@ -8525,9 +11586,9 @@ "integrity": "sha512-jox/62b2GofV1qTUQTMPEJSDIGycS43evqYzD/KVtEb9OCoki9cnacUPxCrZa7JfPzZSYOCZhu9O9luaMxAX8g==", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "memory-fs": "0.4.1", - "tapable": "1.0.0" + "graceful-fs": "^4.1.2", + "memory-fs": "^0.4.0", + "tapable": "^1.0.0" } }, "find-up": { @@ -8536,7 +11597,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "has-flag": { @@ -8551,19 +11612,19 @@ "integrity": "sha512-E9BmnJbAKLPGonz0HeWHtbKf+EeSP93paWO3ZYoUpq/aowXvYGjjCSuashhXPpzbArIjBbji39THkxTz9ZeEUQ==", "dev": true, "requires": { - "ansi-escapes": "3.0.0", - "chalk": "2.3.2", - "cli-cursor": "2.1.0", - "cli-width": "2.2.0", - "external-editor": "2.1.0", - "figures": "2.0.0", - "lodash": "4.17.5", + "ansi-escapes": "^3.0.0", + "chalk": "^2.0.0", + "cli-cursor": "^2.1.0", + "cli-width": "^2.0.0", + "external-editor": "^2.1.0", + "figures": "^2.0.0", + "lodash": "^4.3.0", "mute-stream": "0.0.7", - "run-async": "2.3.0", - "rxjs": "5.5.8", - "string-width": "2.1.1", - "strip-ansi": "4.0.0", - "through": "2.3.8" + "run-async": "^2.2.0", + "rxjs": "^5.5.2", + "string-width": "^2.1.0", + "strip-ansi": "^4.0.0", + "through": "^2.3.6" } }, "interpret": { @@ -8590,9 +11651,9 @@ "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, "semver": { @@ -8607,8 +11668,8 @@ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { @@ -8617,7 +11678,7 @@ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "ansi-regex": "3.0.0" + "ansi-regex": "^3.0.0" } }, "supports-color": { @@ -8626,7 +11687,7 @@ "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } }, "tapable": { @@ -8647,18 +11708,18 @@ "integrity": "sha512-NwW69J42EsCSanF8kyn5upxvjp5ds+t3+udGBeTbFnERA+lF541DDpMawzo4z6W/QrzNM18D+BPMiOBibnFV5A==", "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": "9.0.2" + "cliui": "^4.0.0", + "decamelize": "^1.1.1", + "find-up": "^2.1.0", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^9.0.2" } }, "yargs-parser": { @@ -8667,24 +11728,52 @@ "integrity": "sha1-nM9qQ0YP5O1Aqbto9I1DuKaMwHc=", "dev": true, "requires": { - "camelcase": "4.1.0" + "camelcase": "^4.1.0" } } } }, + "wget-improved": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/wget-improved/-/wget-improved-1.5.0.tgz", + "integrity": "sha512-t+G+g9SQSy2h2+dg7h54r9adllfdI0fHHtshbl1V4jwIIBj1c10SmHwjP8vFx9fn1dr9QuF27uC7xoZr9YwEmg==", + "dev": true, + "requires": { + "minimist": "1.2.0", + "tunnel": "0.0.2" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } + } + }, "whatwg-fetch": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz", "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ=", "dev": true }, + "whatwg-url-compat": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz", + "integrity": "sha1-AImBEa9om7CXVBzVpFymyHmERb8=", + "dev": true, + "optional": true, + "requires": { + "tr46": "~0.0.1" + } + }, "which": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", "dev": true, "requires": { - "isexe": "2.0.0" + "isexe": "^2.0.0" } }, "which-module": { @@ -8699,7 +11788,7 @@ "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", "dev": true, "requires": { - "string-width": "1.0.2" + "string-width": "^1.0.2" } }, "window-size": { @@ -8720,8 +11809,8 @@ "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", "dev": true, "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" } }, "wrappy": { @@ -8736,7 +11825,7 @@ "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", "dev": true, "requires": { - "mkdirp": "0.5.1" + "mkdirp": "^0.5.1" } }, "write-file-atomic": { @@ -8745,9 +11834,27 @@ "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "imurmurhash": "0.1.4", - "slide": "1.1.6" + "graceful-fs": "^4.1.11", + "imurmurhash": "^0.1.4", + "slide": "^1.1.5" + } + }, + "ws": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.0.0.tgz", + "integrity": "sha1-mN2wAFbIOQy3Ued4h4hJf5kQO2w=", + "dev": true, + "requires": { + "safe-buffer": "~5.0.1", + "ultron": "~1.1.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz", + "integrity": "sha1-0mPKVGls2KMGtcplUekt5XkY++c=", + "dev": true + } } }, "xhr": { @@ -8756,10 +11863,47 @@ "integrity": "sha1-4W5mpF+GmGHu76tBbV7/ci3ECZM=", "dev": true, "requires": { - "global": "4.3.2", - "is-function": "1.0.1", - "parse-headers": "2.0.1", - "xtend": "4.0.1" + "global": "~4.3.0", + "is-function": "^1.0.1", + "parse-headers": "^2.0.0", + "xtend": "^4.0.0" + } + }, + "xhr-request": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/xhr-request/-/xhr-request-1.1.0.tgz", + "integrity": "sha512-Y7qzEaR3FDtL3fP30k9wO/e+FBnBByZeybKOhASsGP30NIkRAAkKD/sCnLvgEfAIEC1rcmK7YG8f4oEnIrrWzA==", + "dev": true, + "requires": { + "buffer-to-arraybuffer": "^0.0.5", + "object-assign": "^4.1.1", + "query-string": "^5.0.1", + "simple-get": "^2.7.0", + "timed-out": "^4.0.1", + "url-set-query": "^1.0.0", + "xhr": "^2.0.4" + }, + "dependencies": { + "simple-get": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-2.8.1.tgz", + "integrity": "sha512-lSSHRSw3mQNUGPAYRqo7xy9dhKmxFXIjLjp4KHpf99GEH2VH7C3AM+Qfx6du6jhfUi6Vm7XnbEVEf7Wb6N8jRw==", + "dev": true, + "requires": { + "decompress-response": "^3.3.0", + "once": "^1.3.1", + "simple-concat": "^1.0.0" + } + } + } + }, + "xhr-request-promise": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/xhr-request-promise/-/xhr-request-promise-0.1.2.tgz", + "integrity": "sha1-NDxE0e53JrhkgGloLQ+EDIO0Jh0=", + "dev": true, + "requires": { + "xhr-request": "^1.0.1" } }, "xhr2": { @@ -8768,6 +11912,13 @@ "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8=", "dev": true }, + "xml-name-validator": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz", + "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=", + "dev": true, + "optional": true + }, "xmlhttprequest": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", @@ -8799,9 +11950,9 @@ "dev": true, "optional": true, "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", "window-size": "0.1.0" }, "dependencies": { @@ -8819,8 +11970,8 @@ "dev": true, "optional": true, "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", + "center-align": "^0.1.1", + "right-align": "^0.1.1", "wordwrap": "0.0.2" } }, @@ -8846,8 +11997,8 @@ "integrity": "sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=", "dev": true, "requires": { - "camelcase": "3.0.0", - "lodash.assign": "4.2.0" + "camelcase": "^3.0.0", + "lodash.assign": "^4.0.6" } }, "yeoman-environment": { @@ -8856,19 +12007,19 @@ "integrity": "sha512-jzHBTTy8EPI4ImV8dpUMt+Q5zELkSU5xvGpndHcHudQ4tqN6YgIWaCGmRFl+HDchwRUkcgyjQ+n6/w5zlJBCPg==", "dev": true, "requires": { - "chalk": "2.3.2", - "debug": "3.1.0", - "diff": "3.5.0", - "escape-string-regexp": "1.0.5", - "globby": "6.1.0", - "grouped-queue": "0.3.3", - "inquirer": "3.3.0", - "is-scoped": "1.0.0", - "lodash": "4.17.4", - "log-symbols": "2.2.0", - "mem-fs": "1.1.3", - "text-table": "0.2.0", - "untildify": "3.0.2" + "chalk": "^2.1.0", + "debug": "^3.1.0", + "diff": "^3.3.1", + "escape-string-regexp": "^1.0.2", + "globby": "^6.1.0", + "grouped-queue": "^0.3.3", + "inquirer": "^3.3.0", + "is-scoped": "^1.0.0", + "lodash": "^4.17.4", + "log-symbols": "^2.1.0", + "mem-fs": "^1.1.0", + "text-table": "^0.2.0", + "untildify": "^3.0.2" }, "dependencies": { "ansi-styles": { @@ -8877,7 +12028,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.1" + "color-convert": "^1.9.0" } }, "chalk": { @@ -8886,9 +12037,9 @@ "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.3.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "debug": { @@ -8912,11 +12063,11 @@ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, "requires": { - "array-union": "1.0.2", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" } }, "has-flag": { @@ -8931,7 +12082,7 @@ "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } @@ -8942,31 +12093,31 @@ "integrity": "sha512-mODmrZ26a94djmGZZuIiomSGlN4wULdou29ZwcySupb2e9FdvoCl7Ps2FqHFjEHio3kOl/iBeaNqrnx3C3NwWg==", "dev": true, "requires": { - "async": "2.6.0", - "chalk": "2.3.2", - "cli-table": "0.3.1", - "cross-spawn": "5.1.0", - "dargs": "5.1.0", - "dateformat": "3.0.3", - "debug": "3.1.0", - "detect-conflict": "1.0.1", - "error": "7.0.2", - "find-up": "2.1.0", - "github-username": "4.1.0", - "istextorbinary": "2.2.1", - "lodash": "4.17.4", - "make-dir": "1.2.0", - "mem-fs-editor": "3.0.2", - "minimist": "1.2.0", - "pretty-bytes": "4.0.2", - "read-chunk": "2.1.0", - "read-pkg-up": "3.0.0", - "rimraf": "2.6.2", - "run-async": "2.3.0", - "shelljs": "0.8.1", - "text-table": "0.2.0", - "through2": "2.0.3", - "yeoman-environment": "2.0.6" + "async": "^2.6.0", + "chalk": "^2.3.0", + "cli-table": "^0.3.1", + "cross-spawn": "^5.1.0", + "dargs": "^5.1.0", + "dateformat": "^3.0.2", + "debug": "^3.1.0", + "detect-conflict": "^1.0.0", + "error": "^7.0.2", + "find-up": "^2.1.0", + "github-username": "^4.0.0", + "istextorbinary": "^2.1.0", + "lodash": "^4.17.4", + "make-dir": "^1.1.0", + "mem-fs-editor": "^3.0.2", + "minimist": "^1.2.0", + "pretty-bytes": "^4.0.2", + "read-chunk": "^2.1.0", + "read-pkg-up": "^3.0.0", + "rimraf": "^2.6.2", + "run-async": "^2.0.0", + "shelljs": "^0.8.0", + "text-table": "^0.2.0", + "through2": "^2.0.0", + "yeoman-environment": "^2.0.5" }, "dependencies": { "ansi-styles": { @@ -8975,7 +12126,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "1.9.1" + "color-convert": "^1.9.0" } }, "async": { @@ -8984,7 +12135,7 @@ "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", "dev": true, "requires": { - "lodash": "4.17.4" + "lodash": "^4.14.0" } }, "chalk": { @@ -8993,9 +12144,9 @@ "integrity": "sha512-ZM4j2/ld/YZDc3Ma8PgN7gyAk+kHMMMyzLNryCPGhWrsfAuDVeuid5bpRFTDgMH9JBK2lA4dyyAkkZYF/WcqDQ==", "dev": true, "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.3.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" } }, "debug": { @@ -9013,7 +12164,7 @@ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", "dev": true, "requires": { - "locate-path": "2.0.0" + "locate-path": "^2.0.0" } }, "has-flag": { @@ -9028,10 +12179,10 @@ "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=", "dev": true, "requires": { - "graceful-fs": "4.1.11", - "parse-json": "4.0.0", - "pify": "3.0.0", - "strip-bom": "3.0.0" + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" } }, "minimist": { @@ -9046,8 +12197,8 @@ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=", "dev": true, "requires": { - "error-ex": "1.3.1", - "json-parse-better-errors": "1.0.2" + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" } }, "path-type": { @@ -9056,7 +12207,7 @@ "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", "dev": true, "requires": { - "pify": "3.0.0" + "pify": "^3.0.0" } }, "pify": { @@ -9071,9 +12222,9 @@ "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=", "dev": true, "requires": { - "load-json-file": "4.0.0", - "normalize-package-data": "2.4.0", - "path-type": "3.0.0" + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" } }, "read-pkg-up": { @@ -9082,8 +12233,8 @@ "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=", "dev": true, "requires": { - "find-up": "2.1.0", - "read-pkg": "3.0.0" + "find-up": "^2.0.0", + "read-pkg": "^3.0.0" } }, "rimraf": { @@ -9092,7 +12243,7 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "^7.0.5" } }, "shelljs": { @@ -9101,9 +12252,9 @@ "integrity": "sha512-YA/iYtZpzFe5HyWVGrb02FjPxc4EMCfpoU/Phg9fQoyMC72u9598OUBrsU8IrtwAKG0tO8IYaqbaLIw+k3IRGA==", "dev": true, "requires": { - "glob": "7.1.2", - "interpret": "1.0.3", - "rechoir": "0.6.2" + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" } }, "strip-bom": { @@ -9118,10 +12269,481 @@ "integrity": "sha512-0aP01LLIskjKs3lq52EC0aGBAJhLq7B2Rd8HC/DR/PtNNpcLilNmHC12O+hu0usQpo7wtHNRqtrhBwtDb0+dNg==", "dev": true, "requires": { - "has-flag": "3.0.0" + "has-flag": "^3.0.0" } } } + }, + "zeppelin-solidity": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/zeppelin-solidity/-/zeppelin-solidity-1.9.0.tgz", + "integrity": "sha512-pdyPVyjDq7cNqqLps9juDNDkKCa6hSafEm8KyzPw+gNYTiDyG1H4sYVFuBGp03iqxlGhsacrstbps5/AHTxBUg==" + }, + "zos": { + "version": "0.3.18", + "resolved": "https://registry.npmjs.org/zos/-/zos-0.3.18.tgz", + "integrity": "sha512-IKO1PTW5MLBy/33jjSiMkzCpJlXSMQi00XZg/soQsJOEfINC7QS1lwRCcfCbHNuZcPLr7B/LCpXbG+7eq71o8g==", + "dev": true, + "requires": { + "colors": "^1.2.1", + "commander": "^2.15.1", + "ethereumjs-abi": "^0.6.5", + "lodash": "^4.17.5", + "npm-programmatic": "0.0.10", + "shelljs": "^0.8.1", + "truffle": "^4.1.6", + "truffle-config": "^1.0.4", + "truffle-contract": "^3.0.5", + "truffle-core": "^4.1.7", + "truffle-provisioner": "^0.1.0", + "zos-kernel": "^0.1.5", + "zos-lib": "^0.1.10" + }, + "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 + }, + "bignumber.js": { + "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git", + "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 + }, + "chai": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz", + "integrity": "sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc=", + "dev": true, + "requires": { + "assertion-error": "^1.0.1", + "deep-eql": "^0.1.3", + "type-detect": "^1.0.0" + } + }, + "colors": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz", + "integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==", + "dev": true + }, + "commander": { + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", + "dev": true + }, + "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" + } + }, + "deep-eql": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz", + "integrity": "sha1-71WKyrjeJSBs1xOQbXTlaTDrafI=", + "dev": true, + "requires": { + "type-detect": "0.1.1" + }, + "dependencies": { + "type-detect": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz", + "integrity": "sha1-C6XsKohWQORw6k6FBZcZANrFiCI=", + "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" + } + }, + "fs-extra": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz", + "integrity": "sha1-BGxwFjzvmq1GsOSn+kZ/si1x3jU=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^2.1.0" + } + }, + "ganache-cli": { + "version": "6.1.0-beta.4", + "resolved": "https://registry.npmjs.org/ganache-cli/-/ganache-cli-6.1.0-beta.4.tgz", + "integrity": "sha512-0a22Ma8NqPvo5g8o86q0TatBi+oPIBydAnwJ8FKtU97I/CYZZVSJTPlsFRwWE2EgaMSTw5LHOqeG9694+xbASw==", + "dev": true, + "requires": { + "source-map-support": "^0.5.3", + "webpack-cli": "^2.0.9" + } + }, + "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 + }, + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" + } + }, + "lodash": { + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", + "dev": true + }, + "mocha": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz", + "integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==", + "dev": true, + "requires": { + "browser-stdout": "1.3.0", + "commander": "2.9.0", + "debug": "2.6.8", + "diff": "3.2.0", + "escape-string-regexp": "1.0.5", + "glob": "7.1.1", + "growl": "1.9.2", + "he": "1.1.1", + "json3": "3.3.2", + "lodash.create": "3.1.1", + "mkdirp": "0.5.1", + "supports-color": "3.1.2" + }, + "dependencies": { + "commander": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", + "dev": true, + "requires": { + "graceful-readlink": ">= 1.0.0" + } + }, + "debug": { + "version": "2.6.8", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", + "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "diff": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz", + "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=", + "dev": true + }, + "glob": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", + "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.2", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + } + } + }, + "node-dir": { + "version": "0.1.16", + "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.16.tgz", + "integrity": "sha1-0u9YOqULkNk9uM3Sb86lg1OVf+Q=", + "dev": true, + "requires": { + "minimatch": "^3.0.2" + } + }, + "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" + } + }, + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, + "requires": { + "pify": "^2.0.0" + } + }, + "read-pkg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "dev": true, + "requires": { + "load-json-file": "^2.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^2.0.0" + } + }, + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "dev": true, + "requires": { + "find-up": "^2.0.0", + "read-pkg": "^2.0.0" + } + }, + "shelljs": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.8.2.tgz", + "integrity": "sha512-pRXeNrCA2Wd9itwhvLp5LZQvPJ0wU6bcjaTMywHHGX5XWhVN2nzSu7WV0q+oUY7mGK3mgSkDDzP3MgjqdyIgbQ==", + "dev": true, + "requires": { + "glob": "^7.0.0", + "interpret": "^1.0.0", + "rechoir": "^0.6.2" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.6.tgz", + "integrity": "sha512-N4KXEz7jcKqPf2b2vZF11lQIz9W5ZMuUcIOGj243lduidkf2fjkVKJS9vNxVWn3u/uxX38AcE8U9nnH9FPcq+g==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "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" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + }, + "supports-color": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", + "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", + "dev": true, + "requires": { + "has-flag": "^1.0.0" + } + }, + "truffle-core": { + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/truffle-core/-/truffle-core-4.1.8.tgz", + "integrity": "sha512-DhZ1vPoxOPNpX9pXh4i6GM8KHrqIYyyb47JQ7rtMoN1oCjdZqm6M846KbhCjGbb4AMC7I873M5PX0R+XYNkpjA==", + "dev": true, + "requires": { + "async": "^1.4.2", + "chai": "^3.3.0", + "chokidar": "^1.4.2", + "colors": "^1.1.2", + "cpr": "^0.4.3", + "debug": "^3.1.0", + "del": "^2.2.0", + "diff": "1.4.0", + "ethpm": "0.0.15", + "ethpm-registry": "0.0.10", + "finalhandler": "^0.4.0", + "fs-extra": "^2.0.0", + "ganache-cli": "6.1.0-beta.4", + "lodash": "^4.5.1", + "mkdirp": "^0.5.1", + "mocha": "^3.2.0", + "node-dir": "0.1.16", + "node-emoji": "^1.8.1", + "node-ipc": "^9.1.1", + "original-require": "^1.0.0", + "safe-eval": "^0.3.0", + "serve-static": "^1.10.0", + "source-map-support": "^0.5.3", + "spawn-args": "^0.1.0", + "temp": "^0.8.3", + "truffle-artifactor": "^3.0.5", + "truffle-box": "^1.0.5", + "truffle-compile": "^3.0.10", + "truffle-config": "^1.0.4", + "truffle-contract": "^3.0.5", + "truffle-contract-sources": "^0.0.1", + "truffle-debug-utils": "^1.0.4", + "truffle-debugger": "^4.0.0", + "truffle-deployer": "^2.0.5", + "truffle-error": "^0.0.2", + "truffle-expect": "^0.0.3", + "truffle-init": "^1.0.7", + "truffle-migrate": "^2.0.6", + "truffle-provider": "^0.0.4", + "truffle-provisioner": "^0.1.0", + "truffle-require": "^1.0.5", + "truffle-resolver": "^4.0.3", + "truffle-solidity-utils": "^1.1.1", + "truffle-workflow-compile": "^1.0.3", + "web3": "^0.20.1", + "yargs": "^8.0.2" + } + }, + "type-detect": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz", + "integrity": "sha1-diIXzAbbJY7EiQihKY6LlRIejqI=", + "dev": true + }, + "web3": { + "version": "0.20.6", + "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.6.tgz", + "integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=", + "dev": true, + "requires": { + "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "crypto-js": "^3.1.4", + "utf8": "^2.1.1", + "xhr2": "*", + "xmlhttprequest": "*" + } + }, + "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": "8.0.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", + "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", + "dev": true, + "requires": { + "camelcase": "^4.1.0", + "cliui": "^3.2.0", + "decamelize": "^1.1.1", + "get-caller-file": "^1.0.1", + "os-locale": "^2.0.0", + "read-pkg-up": "^2.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1", + "yargs-parser": "^7.0.0" + } + }, + "yargs-parser": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", + "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", + "dev": true, + "requires": { + "camelcase": "^4.1.0" + } + }, + "zos-lib": { + "version": "0.1.22", + "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-0.1.22.tgz", + "integrity": "sha512-39UEc/dxicrsu8q3gO/SpqIkwEXGjyYxnBKh8wBlgpCNFmk/OrxLVdmaKeYpljSSdOGscos1xIcsqOS/cTSZow==", + "dev": true, + "requires": { + "fs": "0.0.1-security", + "truffle-contract": "^3.0.5", + "truffle-provisioner": "^0.1.0", + "zeppelin-solidity": "^1.8.0" + } + } + } + }, + "zos-kernel": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/zos-kernel/-/zos-kernel-0.1.5.tgz", + "integrity": "sha512-YA2I7dWmzIDrqU5DTkKyYGF8JN13KAjwqpIzWZ2YLXzI19gWHbN76QZv1y2f7W6cIqxXYuKYLzFwMAMHhYyyPg==", + "dev": true, + "requires": { + "zeppelin-solidity": "^1.8.0", + "zos-lib": "^0.1.10" + }, + "dependencies": { + "zos-lib": { + "version": "0.1.22", + "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-0.1.22.tgz", + "integrity": "sha512-39UEc/dxicrsu8q3gO/SpqIkwEXGjyYxnBKh8wBlgpCNFmk/OrxLVdmaKeYpljSSdOGscos1xIcsqOS/cTSZow==", + "dev": true, + "requires": { + "fs": "0.0.1-security", + "truffle-contract": "^3.0.5", + "truffle-provisioner": "^0.1.0", + "zeppelin-solidity": "^1.8.0" + } + } + } + }, + "zos-lib": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-0.0.5.tgz", + "integrity": "sha512-UVINaUZ9WuGGlljKaTXaxzaLGW9F/5AViSsOYy/oagFyQIY6Ch9WQ1fnUx3L8O4p1XGne9rG2JXY4B9f6YPHsA==", + "requires": { + "zeppelin-solidity": "^1.8.0" + } } } } From e55dbc9681e2a530c575f687164c98b773795dd5 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 18 May 2018 19:07:15 -0300 Subject: [PATCH 21/54] update to latest zos and zos-lib --- package-lock.json | 74 ++++++++++++++++------------------------------- package.json | 4 +-- 2 files changed, 27 insertions(+), 51 deletions(-) diff --git a/package-lock.json b/package-lock.json index c85124a00..d4f62cc79 100644 --- a/package-lock.json +++ b/package-lock.json @@ -114,7 +114,6 @@ "version": "5.5.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "dev": true, "requires": { "co": "^4.6.0", "fast-deep-equal": "^1.0.0", @@ -1957,8 +1956,7 @@ "co": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", - "dev": true + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" }, "code-point-at": { "version": "1.1.0", @@ -2236,8 +2234,7 @@ "crypto-js": { "version": "3.1.8", "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.8.tgz", - "integrity": "sha1-cV8HC/YBTyrpkqmLOSkli3E/CNU=", - "dev": true + "integrity": "sha1-cV8HC/YBTyrpkqmLOSkli3E/CNU=" }, "css-select": { "version": "1.2.0", @@ -4045,14 +4042,12 @@ "fast-deep-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", - "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=", - "dev": true + "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=" }, "fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", - "dev": true + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" }, "fast-levenshtein": { "version": "2.0.6", @@ -4236,8 +4231,7 @@ "fs": { "version": "0.0.1-security", "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz", - "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ=", - "dev": true + "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ=" }, "fs-extra": { "version": "0.30.0", @@ -5835,8 +5829,7 @@ "is-hex-prefixed": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz", - "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=", - "dev": true + "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=" }, "is-my-json-valid": { "version": "2.16.0", @@ -6295,8 +6288,7 @@ "json-schema-traverse": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", - "dev": true + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" }, "json-stable-stringify-without-jsonify": { "version": "1.0.1", @@ -7348,8 +7340,7 @@ "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, "multimatch": { "version": "2.1.0", @@ -7596,7 +7587,6 @@ "version": "1.7.0", "resolved": "https://registry.npmjs.org/number-to-bn/-/number-to-bn-1.7.0.tgz", "integrity": "sha1-uzYjWS9+X54AMLGXe9QaDFP+HqA=", - "dev": true, "requires": { "bn.js": "4.11.6", "strip-hex-prefix": "1.0.0" @@ -7605,8 +7595,7 @@ "bn.js": { "version": "4.11.6", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", - "dev": true + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" } } }, @@ -9699,7 +9688,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz", "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=", - "dev": true, "requires": { "is-hex-prefixed": "1.0.0" } @@ -10129,8 +10117,7 @@ "truffle-blockchain-utils": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/truffle-blockchain-utils/-/truffle-blockchain-utils-0.0.4.tgz", - "integrity": "sha512-wgRrhwqh0aea08Hz28hUV4tuF2uTVQH/e9kBou+WK04cqrutB5cxQVQ6HGjeZLltxBYOFvhrGOOq4l3WJFnPEA==", - "dev": true + "integrity": "sha512-wgRrhwqh0aea08Hz28hUV4tuF2uTVQH/e9kBou+WK04cqrutB5cxQVQ6HGjeZLltxBYOFvhrGOOq4l3WJFnPEA==" }, "truffle-box": { "version": "1.0.5", @@ -10467,7 +10454,6 @@ "version": "3.0.5", "resolved": "https://registry.npmjs.org/truffle-contract/-/truffle-contract-3.0.5.tgz", "integrity": "sha512-lRayhvX73OrLJ6TDvc0iYbzcB+Y1F9FCj9N1FXQ2EKOkqyIjmgZNMZFHGjvfTws1gsmonYd6sND0ahipiUYy8g==", - "dev": true, "requires": { "ethjs-abi": "0.1.8", "truffle-blockchain-utils": "^0.0.4", @@ -10478,20 +10464,17 @@ "dependencies": { "bignumber.js": { "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", - "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git", - "dev": true + "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git" }, "bn.js": { "version": "4.11.6", "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=", - "dev": true + "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" }, "ethjs-abi": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.1.8.tgz", "integrity": "sha1-zSiFg+1ijN+tr4re+juh28vKbBg=", - "dev": true, "requires": { "bn.js": "4.11.6", "js-sha3": "0.5.5", @@ -10501,14 +10484,12 @@ "js-sha3": { "version": "0.5.5", "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz", - "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=", - "dev": true + "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=" }, "web3": { "version": "0.20.6", "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.6.tgz", "integrity": "sha1-PpcwauAk+yThCj11yIQwJWIhUSA=", - "dev": true, "requires": { "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", "crypto-js": "^3.1.4", @@ -10523,7 +10504,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/truffle-contract-schema/-/truffle-contract-schema-2.0.0.tgz", "integrity": "sha512-nLlspmu1GKDaluWksBwitHi/7Z3IpRjmBYeO9N+T1nVJD2V4IWJaptCKP1NqnPiJA+FChB7+F7pI6Br51/FtXQ==", - "dev": true, "requires": { "ajv": "^5.1.1", "crypto-js": "^3.1.9-1", @@ -10533,14 +10513,12 @@ "crypto-js": { "version": "3.1.9-1", "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.9-1.tgz", - "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=", - "dev": true + "integrity": "sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=" }, "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" } @@ -10670,8 +10648,7 @@ "truffle-error": { "version": "0.0.2", "resolved": "https://registry.npmjs.org/truffle-error/-/truffle-error-0.0.2.tgz", - "integrity": "sha1-AbGJt4UFVmrhaJwjnHyi3RIc/kw=", - "dev": true + "integrity": "sha1-AbGJt4UFVmrhaJwjnHyi3RIc/kw=" }, "truffle-expect": { "version": "0.0.3", @@ -10947,8 +10924,7 @@ "truffle-provisioner": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/truffle-provisioner/-/truffle-provisioner-0.1.0.tgz", - "integrity": "sha1-Ap5SScEBUwBzhTXgT97ZMaU8T2I=", - "dev": true + "integrity": "sha1-Ap5SScEBUwBzhTXgT97ZMaU8T2I=" }, "truffle-require": { "version": "1.0.5", @@ -11191,8 +11167,7 @@ "utf8": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", - "integrity": "sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY=", - "dev": true + "integrity": "sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY=" }, "util-deprecate": { "version": "1.0.2", @@ -11909,8 +11884,7 @@ "xhr2": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.1.4.tgz", - "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8=", - "dev": true + "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8=" }, "xml-name-validator": { "version": "2.0.1", @@ -11922,8 +11896,7 @@ "xmlhttprequest": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", - "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=", - "dev": true + "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=" }, "xtend": { "version": "4.0.1", @@ -12738,10 +12711,13 @@ } }, "zos-lib": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-0.0.5.tgz", - "integrity": "sha512-UVINaUZ9WuGGlljKaTXaxzaLGW9F/5AViSsOYy/oagFyQIY6Ch9WQ1fnUx3L8O4p1XGne9rG2JXY4B9f6YPHsA==", + "version": "0.1.22", + "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-0.1.22.tgz", + "integrity": "sha512-39UEc/dxicrsu8q3gO/SpqIkwEXGjyYxnBKh8wBlgpCNFmk/OrxLVdmaKeYpljSSdOGscos1xIcsqOS/cTSZow==", "requires": { + "fs": "0.0.1-security", + "truffle-contract": "^3.0.5", + "truffle-provisioner": "^0.1.0", "zeppelin-solidity": "^1.8.0" } } diff --git a/package.json b/package.json index a1b6a691a..4c8115c99 100644 --- a/package.json +++ b/package.json @@ -62,10 +62,10 @@ "solium": "^1.1.6", "truffle": "^4.1.5", "truffle-hdwallet-provider": "0.0.3", - "zos": "^0.3.7" + "zos": "^0.3.18" }, "dependencies": { "dotenv": "^4.0.0", - "zos-lib": "0.0.5" + "zos-lib": "^0.1.22" } } From c329fc0a5fbc41367f4b4ceb9c6ba7f64ccdc289 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 18 May 2018 20:59:31 -0300 Subject: [PATCH 22/54] update zos to latest version --- package-lock.json | 99 +++++++++++++++++++++++++---------------------- package.json | 2 +- 2 files changed, 53 insertions(+), 48 deletions(-) diff --git a/package-lock.json b/package-lock.json index d4f62cc79..076893ed7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12253,11 +12253,12 @@ "integrity": "sha512-pdyPVyjDq7cNqqLps9juDNDkKCa6hSafEm8KyzPw+gNYTiDyG1H4sYVFuBGp03iqxlGhsacrstbps5/AHTxBUg==" }, "zos": { - "version": "0.3.18", - "resolved": "https://registry.npmjs.org/zos/-/zos-0.3.18.tgz", - "integrity": "sha512-IKO1PTW5MLBy/33jjSiMkzCpJlXSMQi00XZg/soQsJOEfINC7QS1lwRCcfCbHNuZcPLr7B/LCpXbG+7eq71o8g==", + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/zos/-/zos-0.5.0.tgz", + "integrity": "sha512-oOKq4j8ccZso1N48WNqTOUAEqQBlrpgzDGVR19y1rslrTtgxNI0ehG26tuoiRReWrL5cC0obLUusKfZ9aTCkHA==", "dev": true, "requires": { + "chalk": "^2.4.1", "colors": "^1.2.1", "commander": "^2.15.1", "ethereumjs-abi": "^0.6.5", @@ -12267,10 +12268,9 @@ "truffle": "^4.1.6", "truffle-config": "^1.0.4", "truffle-contract": "^3.0.5", - "truffle-core": "^4.1.7", - "truffle-provisioner": "^0.1.0", - "zos-kernel": "^0.1.5", - "zos-lib": "^0.1.10" + "truffle-core": "^4.1.8", + "truffle-workflow-compile": "^1.0.3", + "zos-lib": "^0.1.22" }, "dependencies": { "ansi-regex": { @@ -12279,6 +12279,15 @@ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "requires": { + "color-convert": "^1.9.0" + } + }, "bignumber.js": { "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git", @@ -12301,6 +12310,17 @@ "type-detect": "^1.0.0" } }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "dev": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, "colors": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz", @@ -12368,6 +12388,12 @@ "webpack-cli": "^2.0.9" } }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "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", @@ -12449,6 +12475,21 @@ "once": "^1.3.0", "path-is-absolute": "^1.0.0" } + }, + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "supports-color": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", + "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", + "dev": true, + "requires": { + "has-flag": "^1.0.0" + } } } }, @@ -12555,12 +12596,12 @@ "dev": true }, "supports-color": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", - "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { - "has-flag": "^1.0.0" + "has-flag": "^3.0.0" } }, "truffle-core": { @@ -12671,42 +12712,6 @@ "requires": { "camelcase": "^4.1.0" } - }, - "zos-lib": { - "version": "0.1.22", - "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-0.1.22.tgz", - "integrity": "sha512-39UEc/dxicrsu8q3gO/SpqIkwEXGjyYxnBKh8wBlgpCNFmk/OrxLVdmaKeYpljSSdOGscos1xIcsqOS/cTSZow==", - "dev": true, - "requires": { - "fs": "0.0.1-security", - "truffle-contract": "^3.0.5", - "truffle-provisioner": "^0.1.0", - "zeppelin-solidity": "^1.8.0" - } - } - } - }, - "zos-kernel": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/zos-kernel/-/zos-kernel-0.1.5.tgz", - "integrity": "sha512-YA2I7dWmzIDrqU5DTkKyYGF8JN13KAjwqpIzWZ2YLXzI19gWHbN76QZv1y2f7W6cIqxXYuKYLzFwMAMHhYyyPg==", - "dev": true, - "requires": { - "zeppelin-solidity": "^1.8.0", - "zos-lib": "^0.1.10" - }, - "dependencies": { - "zos-lib": { - "version": "0.1.22", - "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-0.1.22.tgz", - "integrity": "sha512-39UEc/dxicrsu8q3gO/SpqIkwEXGjyYxnBKh8wBlgpCNFmk/OrxLVdmaKeYpljSSdOGscos1xIcsqOS/cTSZow==", - "dev": true, - "requires": { - "fs": "0.0.1-security", - "truffle-contract": "^3.0.5", - "truffle-provisioner": "^0.1.0", - "zeppelin-solidity": "^1.8.0" - } } } }, diff --git a/package.json b/package.json index 4c8115c99..8fc0d553c 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "solium": "^1.1.6", "truffle": "^4.1.5", "truffle-hdwallet-provider": "0.0.3", - "zos": "^0.3.18" + "zos": "^0.5.0" }, "dependencies": { "dotenv": "^4.0.0", From be101154fa0aa86766530258cf74dcb030294a63 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 18 May 2018 21:00:45 -0300 Subject: [PATCH 23/54] update to newer zos.json format --- package.zos.json => zos.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename package.zos.json => zos.json (78%) diff --git a/package.zos.json b/zos.json similarity index 78% rename from package.zos.json rename to zos.json index c190c4e42..c89e9ecd8 100644 --- a/package.zos.json +++ b/zos.json @@ -1,4 +1,6 @@ { + "name": "openzeppelin-zos", + "version": "1.9.0-beta", "contracts": { "DetailedMintableToken": "DetailedMintableToken", "DetailedPremintedToken": "DetailedPremintedToken", @@ -6,5 +8,5 @@ "TokenTimelock": "TokenTimelock", "TokenVesting": "TokenVesting" }, - "name": "openzeppelin-zos" + "lib": true } From 39fe05dfad99e95b22c2c355ac142614f7d1a45d Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 18 May 2018 20:54:43 -0300 Subject: [PATCH 24/54] add more openzeppelin-solidity library contracts --- contracts/ECRecovery.sol | 76 +++++++++++++++ contracts/MerkleProof.sol | 35 +++++++ contracts/math/Math.sol | 24 +++++ contracts/mocks/ECRecoveryMock.sol | 25 +++++ contracts/mocks/MathMock.sol | 26 +++++ contracts/mocks/MerkleProofWrapper.sol | 11 +++ contracts/mocks/PullPaymentMock.sol | 17 ++++ contracts/mocks/RBACMock.sol | 69 +++++++++++++ contracts/ownership/rbac/RBAC.sol | 108 +++++++++++++++++++++ contracts/ownership/rbac/RBACWithAdmin.sol | 60 ++++++++++++ contracts/ownership/rbac/Roles.sol | 55 +++++++++++ contracts/payment/PullPayment.sol | 43 ++++++++ test/library/ECRecovery.test.js | 77 +++++++++++++++ test/library/Math.test.js | 43 ++++++++ test/library/MerkleProof.test.js | 61 ++++++++++++ test/ownership/rbac/RBAC.test.js | 98 +++++++++++++++++++ test/payment/PullPayment.test.js | 71 ++++++++++++++ 17 files changed, 899 insertions(+) create mode 100644 contracts/ECRecovery.sol create mode 100644 contracts/MerkleProof.sol create mode 100644 contracts/math/Math.sol create mode 100644 contracts/mocks/ECRecoveryMock.sol create mode 100644 contracts/mocks/MathMock.sol create mode 100644 contracts/mocks/MerkleProofWrapper.sol create mode 100644 contracts/mocks/PullPaymentMock.sol create mode 100644 contracts/mocks/RBACMock.sol create mode 100644 contracts/ownership/rbac/RBAC.sol create mode 100644 contracts/ownership/rbac/RBACWithAdmin.sol create mode 100644 contracts/ownership/rbac/Roles.sol create mode 100644 contracts/payment/PullPayment.sol create mode 100644 test/library/ECRecovery.test.js create mode 100644 test/library/Math.test.js create mode 100644 test/library/MerkleProof.test.js create mode 100644 test/ownership/rbac/RBAC.test.js create mode 100644 test/payment/PullPayment.test.js diff --git a/contracts/ECRecovery.sol b/contracts/ECRecovery.sol new file mode 100644 index 000000000..b2076f0e3 --- /dev/null +++ b/contracts/ECRecovery.sol @@ -0,0 +1,76 @@ +pragma solidity ^0.4.21; + + +/** + * @title Eliptic curve signature operations + * + * @dev Based on https://gist.github.com/axic/5b33912c6f61ae6fd96d6c4a47afde6d + * + * TODO Remove this library once solidity supports passing a signature to ecrecover. + * See https://github.com/ethereum/solidity/issues/864 + * + */ + +library ECRecovery { + + /** + * @dev Recover signer address from a message by using their signature + * @param hash bytes32 message, the hash is the signed message. What is recovered is the signer address. + * @param sig bytes signature, the signature is generated using web3.eth.sign() + */ + function recover(bytes32 hash, bytes sig) + internal + pure + returns (address) + { + bytes32 r; + bytes32 s; + uint8 v; + + // Check the signature length + if (sig.length != 65) { + return (address(0)); + } + + // Divide the signature in r, s and v variables + // ecrecover takes the signature parameters, and the only way to get them + // currently is to use assembly. + // solium-disable-next-line security/no-inline-assembly + assembly { + r := mload(add(sig, 32)) + s := mload(add(sig, 64)) + v := byte(0, mload(add(sig, 96))) + } + + // Version of signature should be 27 or 28, but 0 and 1 are also possible versions + if (v < 27) { + v += 27; + } + + // If the version is correct return the signer address + if (v != 27 && v != 28) { + return (address(0)); + } else { + // solium-disable-next-line arg-overflow + return ecrecover(hash, v, r, s); + } + } + + /** + * toEthSignedMessageHash + * @dev prefix a bytes32 value with "\x19Ethereum Signed Message:" + * @dev and hash the result + */ + function toEthSignedMessageHash(bytes32 hash) + internal + pure + returns (bytes32) + { + // 32 is the length in bytes of hash, + // enforced by the type signature above + return keccak256( + "\x19Ethereum Signed Message:\n32", + hash + ); + } +} diff --git a/contracts/MerkleProof.sol b/contracts/MerkleProof.sol new file mode 100644 index 000000000..a7000c6f2 --- /dev/null +++ b/contracts/MerkleProof.sol @@ -0,0 +1,35 @@ +pragma solidity ^0.4.21; + + +/* + * @title MerkleProof + * @dev Merkle proof verification + * @note Based on https://github.com/ameensol/merkle-tree-solidity/blob/master/src/MerkleProof.sol + */ +library MerkleProof { + /* + * @dev Verifies a Merkle proof proving the existence of a leaf in a Merkle tree. Assumes that each pair of leaves + * and each pair of pre-images is sorted. + * @param _proof Merkle proof containing sibling hashes on the branch from the leaf to the root of the Merkle tree + * @param _root Merkle root + * @param _leaf Leaf of Merkle tree + */ + function verifyProof(bytes32[] _proof, bytes32 _root, bytes32 _leaf) internal pure returns (bool) { + bytes32 computedHash = _leaf; + + for (uint256 i = 0; i < _proof.length; i++) { + bytes32 proofElement = _proof[i]; + + if (computedHash < proofElement) { + // Hash(current computed hash + current element of the proof) + computedHash = keccak256(computedHash, proofElement); + } else { + // Hash(current element of the proof + current computed hash) + computedHash = keccak256(proofElement, computedHash); + } + } + + // Check if the computed hash (root) is equal to the provided root + return computedHash == _root; + } +} diff --git a/contracts/math/Math.sol b/contracts/math/Math.sol new file mode 100644 index 000000000..0532ecb30 --- /dev/null +++ b/contracts/math/Math.sol @@ -0,0 +1,24 @@ +pragma solidity ^0.4.21; + + +/** + * @title Math + * @dev Assorted math operations + */ +library Math { + function max64(uint64 a, uint64 b) internal pure returns (uint64) { + return a >= b ? a : b; + } + + function min64(uint64 a, uint64 b) internal pure returns (uint64) { + return a < b ? a : b; + } + + function max256(uint256 a, uint256 b) internal pure returns (uint256) { + return a >= b ? a : b; + } + + function min256(uint256 a, uint256 b) internal pure returns (uint256) { + return a < b ? a : b; + } +} diff --git a/contracts/mocks/ECRecoveryMock.sol b/contracts/mocks/ECRecoveryMock.sol new file mode 100644 index 000000000..091055161 --- /dev/null +++ b/contracts/mocks/ECRecoveryMock.sol @@ -0,0 +1,25 @@ +pragma solidity ^0.4.21; + + +import "../ECRecovery.sol"; + + +contract ECRecoveryMock { + using ECRecovery for bytes32; + + function recover(bytes32 hash, bytes sig) + public + pure + returns (address) + { + return hash.recover(sig); + } + + function toEthSignedMessageHash(bytes32 hash) + public + pure + returns (bytes32) + { + return hash.toEthSignedMessageHash(); + } +} diff --git a/contracts/mocks/MathMock.sol b/contracts/mocks/MathMock.sol new file mode 100644 index 000000000..c2c9f3fba --- /dev/null +++ b/contracts/mocks/MathMock.sol @@ -0,0 +1,26 @@ +pragma solidity ^0.4.21; + + +import "../../contracts/math/Math.sol"; + + +contract MathMock { + uint64 public result64; + uint256 public result256; + + function max64(uint64 a, uint64 b) public { + result64 = Math.max64(a, b); + } + + function min64(uint64 a, uint64 b) public { + result64 = Math.min64(a, b); + } + + function max256(uint256 a, uint256 b) public { + result256 = Math.max256(a, b); + } + + function min256(uint256 a, uint256 b) public { + result256 = Math.min256(a, b); + } +} diff --git a/contracts/mocks/MerkleProofWrapper.sol b/contracts/mocks/MerkleProofWrapper.sol new file mode 100644 index 000000000..aa830e63a --- /dev/null +++ b/contracts/mocks/MerkleProofWrapper.sol @@ -0,0 +1,11 @@ +pragma solidity ^0.4.21; + +import { MerkleProof } from "../MerkleProof.sol"; + + +contract MerkleProofWrapper { + + function verifyProof(bytes32[] _proof, bytes32 _root, bytes32 _leaf) public pure returns (bool) { + return MerkleProof.verifyProof(_proof, _root, _leaf); + } +} diff --git a/contracts/mocks/PullPaymentMock.sol b/contracts/mocks/PullPaymentMock.sol new file mode 100644 index 000000000..fb4a1231b --- /dev/null +++ b/contracts/mocks/PullPaymentMock.sol @@ -0,0 +1,17 @@ +pragma solidity ^0.4.21; + + +import "../payment/PullPayment.sol"; + + +// mock class using PullPayment +contract PullPaymentMock is PullPayment { + + function PullPaymentMock() public payable { } + + // test helper function to call asyncSend + function callSend(address dest, uint256 amount) public { + asyncSend(dest, amount); + } + +} diff --git a/contracts/mocks/RBACMock.sol b/contracts/mocks/RBACMock.sol new file mode 100644 index 000000000..7dfa2a985 --- /dev/null +++ b/contracts/mocks/RBACMock.sol @@ -0,0 +1,69 @@ +pragma solidity ^0.4.21; + +import "../ownership/rbac/RBACWithAdmin.sol"; + + +contract RBACMock is RBACWithAdmin { + + string constant ROLE_ADVISOR = "advisor"; + + modifier onlyAdminOrAdvisor() + { + require( + hasRole(msg.sender, ROLE_ADMIN) || + hasRole(msg.sender, ROLE_ADVISOR) + ); + _; + } + + function RBACMock(address[] _advisors) + public + { + addRole(msg.sender, ROLE_ADVISOR); + + for (uint256 i = 0; i < _advisors.length; i++) { + addRole(_advisors[i], ROLE_ADVISOR); + } + } + + function onlyAdminsCanDoThis() + onlyAdmin + view + external + { + } + + function onlyAdvisorsCanDoThis() + onlyRole(ROLE_ADVISOR) + view + external + { + } + + function eitherAdminOrAdvisorCanDoThis() + onlyAdminOrAdvisor + view + external + { + } + + function nobodyCanDoThis() + onlyRole("unknown") + view + external + { + } + + // admins can remove advisor's role + function removeAdvisor(address _addr) + onlyAdmin + public + { + // revert if the user isn't an advisor + // (perhaps you want to soft-fail here instead?) + checkRole(_addr, ROLE_ADVISOR); + + // remove the advisor's role + removeRole(_addr, ROLE_ADVISOR); + } +} diff --git a/contracts/ownership/rbac/RBAC.sol b/contracts/ownership/rbac/RBAC.sol new file mode 100644 index 000000000..998d334f8 --- /dev/null +++ b/contracts/ownership/rbac/RBAC.sol @@ -0,0 +1,108 @@ +pragma solidity ^0.4.21; + +import "./Roles.sol"; + + +/** + * @title RBAC (Role-Based Access Control) + * @author Matt Condon (@Shrugs) + * @dev Stores and provides setters and getters for roles and addresses. + * @dev Supports unlimited numbers of roles and addresses. + * @dev See //contracts/mocks/RBACMock.sol for an example of usage. + * This RBAC method uses strings to key roles. It may be beneficial + * for you to write your own implementation of this interface using Enums or similar. + * It's also recommended that you define constants in the contract, like ROLE_ADMIN below, + * to avoid typos. + */ +contract RBAC { + using Roles for Roles.Role; + + mapping (string => Roles.Role) private roles; + + event RoleAdded(address addr, string roleName); + event RoleRemoved(address addr, string roleName); + + /** + * @dev reverts if addr does not have role + * @param addr address + * @param roleName the name of the role + * // reverts + */ + function checkRole(address addr, string roleName) + view + public + { + roles[roleName].check(addr); + } + + /** + * @dev determine if addr has role + * @param addr address + * @param roleName the name of the role + * @return bool + */ + function hasRole(address addr, string roleName) + view + public + returns (bool) + { + return roles[roleName].has(addr); + } + + /** + * @dev add a role to an address + * @param addr address + * @param roleName the name of the role + */ + function addRole(address addr, string roleName) + internal + { + roles[roleName].add(addr); + emit RoleAdded(addr, roleName); + } + + /** + * @dev remove a role from an address + * @param addr address + * @param roleName the name of the role + */ + function removeRole(address addr, string roleName) + internal + { + roles[roleName].remove(addr); + emit RoleRemoved(addr, roleName); + } + + /** + * @dev modifier to scope access to a single role (uses msg.sender as addr) + * @param roleName the name of the role + * // reverts + */ + modifier onlyRole(string roleName) + { + checkRole(msg.sender, roleName); + _; + } + + /** + * @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 + * // reverts + * + * @TODO - when solidity supports dynamic arrays as arguments to modifiers, provide this + * see: https://github.com/ethereum/solidity/issues/2467 + */ + // modifier onlyRoles(string[] roleNames) { + // bool hasAnyRole = false; + // for (uint8 i = 0; i < roleNames.length; i++) { + // if (hasRole(msg.sender, roleNames[i])) { + // hasAnyRole = true; + // break; + // } + // } + + // require(hasAnyRole); + + // _; + // } +} diff --git a/contracts/ownership/rbac/RBACWithAdmin.sol b/contracts/ownership/rbac/RBACWithAdmin.sol new file mode 100644 index 000000000..90eb187a1 --- /dev/null +++ b/contracts/ownership/rbac/RBACWithAdmin.sol @@ -0,0 +1,60 @@ +pragma solidity ^0.4.21; + +import "./RBAC.sol"; + + +/** + * @title RBACWithAdmin + * @author Matt Condon (@Shrugs) + * @dev It's recommended that you define constants in the contract, + * @dev like ROLE_ADMIN below, to avoid typos. + */ +contract RBACWithAdmin is RBAC { + /** + * A constant role name for indicating admins. + */ + string public constant ROLE_ADMIN = "admin"; + + /** + * @dev modifier to scope access to admins + * // reverts + */ + modifier onlyAdmin() + { + checkRole(msg.sender, ROLE_ADMIN); + _; + } + + /** + * @dev constructor. Sets msg.sender as admin by default + */ + function RBACWithAdmin() + public + { + addRole(msg.sender, ROLE_ADMIN); + } + + /** + * @dev add a role to an address + * @param addr address + * @param roleName the name of the role + */ + function adminAddRole(address addr, string roleName) + onlyAdmin + public + { + addRole(addr, roleName); + } + + /** + * @dev remove a role from an address + * @param addr address + * @param roleName the name of the role + */ + function adminRemoveRole(address addr, string roleName) + onlyAdmin + public + { + removeRole(addr, roleName); + } +} diff --git a/contracts/ownership/rbac/Roles.sol b/contracts/ownership/rbac/Roles.sol new file mode 100644 index 000000000..c9dbd73af --- /dev/null +++ b/contracts/ownership/rbac/Roles.sol @@ -0,0 +1,55 @@ +pragma solidity ^0.4.21; + + +/** + * @title Roles + * @author Francisco Giordano (@frangio) + * @dev Library for managing addresses assigned to a Role. + * See RBAC.sol for example usage. + */ +library Roles { + struct Role { + mapping (address => bool) bearer; + } + + /** + * @dev give an address access to this role + */ + function add(Role storage role, address addr) + internal + { + role.bearer[addr] = true; + } + + /** + * @dev remove an address' access to this role + */ + function remove(Role storage role, address addr) + internal + { + role.bearer[addr] = false; + } + + /** + * @dev check if an address has this role + * // reverts + */ + function check(Role storage role, address addr) + view + internal + { + require(has(role, addr)); + } + + /** + * @dev check if an address has this role + * @return bool + */ + function has(Role storage role, address addr) + view + internal + returns (bool) + { + return role.bearer[addr]; + } +} diff --git a/contracts/payment/PullPayment.sol b/contracts/payment/PullPayment.sol new file mode 100644 index 000000000..030e971b3 --- /dev/null +++ b/contracts/payment/PullPayment.sol @@ -0,0 +1,43 @@ +pragma solidity ^0.4.21; + + +import "../math/SafeMath.sol"; + + +/** + * @title PullPayment + * @dev Base contract supporting async send for pull payments. Inherit from this + * contract and use asyncSend instead of send or transfer. + */ +contract PullPayment { + using SafeMath for uint256; + + mapping(address => uint256) public payments; + uint256 public totalPayments; + + /** + * @dev Withdraw accumulated balance, called by payee. + */ + function withdrawPayments() public { + address payee = msg.sender; + uint256 payment = payments[payee]; + + require(payment != 0); + require(address(this).balance >= payment); + + totalPayments = totalPayments.sub(payment); + payments[payee] = 0; + + payee.transfer(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); + } +} diff --git a/test/library/ECRecovery.test.js b/test/library/ECRecovery.test.js new file mode 100644 index 000000000..7ea55823f --- /dev/null +++ b/test/library/ECRecovery.test.js @@ -0,0 +1,77 @@ + +import { + hashMessage, + signMessage, +} from '../helpers/sign'; +const ECRecoveryMock = artifacts.require('ECRecoveryMock'); + +require('chai') + .use(require('chai-as-promised')) + .should(); + +contract('ECRecovery', function (accounts) { + let ecrecovery; + const TEST_MESSAGE = 'OpenZeppelin'; + + before(async function () { + ecrecovery = await ECRecoveryMock.new(); + }); + + it('recover v0', async function () { + // Signature generated outside ganache with method web3.eth.sign(signer, message) + let signer = '0x2cc1166f6212628a0deef2b33befb2187d35b86c'; + let message = web3.sha3(TEST_MESSAGE); + // eslint-disable-next-line max-len + let signature = '0x5d99b6f7f6d1f73d1a26497f2b1c89b24c0993913f86e9a2d02cd69887d9c94f3c880358579d811b21dd1b7fd9bb01c1d81d10e69f0384e675c32b39643be89200'; + const addrRecovered = await ecrecovery.recover(message, signature); + addrRecovered.should.eq(signer); + }); + + it('recover v1', async function () { + // Signature generated outside ganache with method web3.eth.sign(signer, message) + let signer = '0x1e318623ab09fe6de3c9b8672098464aeda9100e'; + let message = web3.sha3(TEST_MESSAGE); + // eslint-disable-next-line max-len + let signature = '0x331fe75a821c982f9127538858900d87d3ec1f9f737338ad67cad133fa48feff48e6fa0c18abc62e42820f05943e47af3e9fbe306ce74d64094bdf1691ee53e001'; + const addrRecovered = await ecrecovery.recover(message, signature); + addrRecovered.should.eq(signer); + }); + + it('recover using web3.eth.sign()', async function () { + // Create the signature using account[0] + const signature = signMessage(accounts[0], TEST_MESSAGE); + + // Recover the signer address from the generated message and signature. + const addrRecovered = await ecrecovery.recover( + hashMessage(TEST_MESSAGE), + signature + ); + addrRecovered.should.eq(accounts[0]); + }); + + it('recover using web3.eth.sign() should return wrong signer', async function () { + // Create the signature using account[0] + const signature = signMessage(accounts[0], TEST_MESSAGE); + + // Recover the signer address from the generated message and wrong signature. + const addrRecovered = await ecrecovery.recover(hashMessage('Test'), signature); + assert.notEqual(accounts[0], addrRecovered); + }); + + it('recover should fail when a wrong hash is sent', async function () { + // Create the signature using account[0] + let signature = signMessage(accounts[0], TEST_MESSAGE); + + // Recover the signer address from the generated message and wrong signature. + const addrRecovered = await ecrecovery.recover(hashMessage(TEST_MESSAGE).substring(2), signature); + addrRecovered.should.eq('0x0000000000000000000000000000000000000000'); + }); + + context('toEthSignedMessage', () => { + it('should prefix hashes correctly', async function () { + const hashedMessage = web3.sha3(TEST_MESSAGE); + const ethMessage = await ecrecovery.toEthSignedMessageHash(hashedMessage); + ethMessage.should.eq(hashMessage(TEST_MESSAGE)); + }); + }); +}); diff --git a/test/library/Math.test.js b/test/library/Math.test.js new file mode 100644 index 000000000..c671bc85f --- /dev/null +++ b/test/library/Math.test.js @@ -0,0 +1,43 @@ +var MathMock = artifacts.require('MathMock'); + +contract('Math', function (accounts) { + let math; + + before(async function () { + math = await MathMock.new(); + }); + + it('returns max64 correctly', async function () { + let a = 5678; + let b = 1234; + await math.max64(a, b); + let result = await math.result64(); + assert.equal(result, a); + }); + + it('returns min64 correctly', async function () { + let a = 5678; + let b = 1234; + await math.min64(a, b); + let result = await math.result64(); + + assert.equal(result, b); + }); + + it('returns max256 correctly', async function () { + let a = 5678; + let b = 1234; + await math.max256(a, b); + let result = await math.result256(); + assert.equal(result, a); + }); + + it('returns min256 correctly', async function () { + let a = 5678; + let b = 1234; + await math.min256(a, b); + let result = await math.result256(); + + assert.equal(result, b); + }); +}); diff --git a/test/library/MerkleProof.test.js b/test/library/MerkleProof.test.js new file mode 100644 index 000000000..1e8da3c8f --- /dev/null +++ b/test/library/MerkleProof.test.js @@ -0,0 +1,61 @@ + +import MerkleTree from '../helpers/merkleTree.js'; +import { sha3, bufferToHex } from 'ethereumjs-util'; + +var MerkleProofWrapper = artifacts.require('MerkleProofWrapper'); + +contract('MerkleProof', function (accounts) { + let merkleProof; + + before(async function () { + merkleProof = await MerkleProofWrapper.new(); + }); + + describe('verifyProof', function () { + it('should return true for a valid Merkle proof', async function () { + const elements = ['a', 'b', 'c', 'd']; + const merkleTree = new MerkleTree(elements); + + const root = merkleTree.getHexRoot(); + + const proof = merkleTree.getHexProof(elements[0]); + + const leaf = bufferToHex(sha3(elements[0])); + + const result = await merkleProof.verifyProof(proof, root, leaf); + assert.isOk(result, 'verifyProof did not return true for a valid proof'); + }); + + it('should return false for an invalid Merkle proof', async function () { + const correctElements = ['a', 'b', 'c']; + const correctMerkleTree = new MerkleTree(correctElements); + + const correctRoot = correctMerkleTree.getHexRoot(); + + const correctLeaf = bufferToHex(sha3(correctElements[0])); + + const badElements = ['d', 'e', 'f']; + const badMerkleTree = new MerkleTree(badElements); + + const badProof = badMerkleTree.getHexProof(badElements[0]); + + const result = await merkleProof.verifyProof(badProof, correctRoot, correctLeaf); + assert.isNotOk(result, 'verifyProof did not return false for an invalid proof'); + }); + + it('should return false for a Merkle proof of invalid length', async function () { + const elements = ['a', 'b', 'c']; + const merkleTree = new MerkleTree(elements); + + const root = merkleTree.getHexRoot(); + + const proof = merkleTree.getHexProof(elements[0]); + const badProof = proof.slice(0, proof.length - 5); + + const leaf = bufferToHex(sha3(elements[0])); + + const result = await merkleProof.verifyProof(badProof, root, leaf); + assert.isNotOk(result, 'verifyProof did not return false for proof of invalid length'); + }); + }); +}); diff --git a/test/ownership/rbac/RBAC.test.js b/test/ownership/rbac/RBAC.test.js new file mode 100644 index 000000000..e748efba5 --- /dev/null +++ b/test/ownership/rbac/RBAC.test.js @@ -0,0 +1,98 @@ +import expectThrow from '../../helpers/expectThrow'; +import expectEvent from '../../helpers/expectEvent'; + +const RBACMock = artifacts.require('RBACMock'); + +require('chai') + .use(require('chai-as-promised')) + .should(); + +const ROLE_ADVISOR = 'advisor'; + +contract('RBAC', function (accounts) { + let mock; + + const [ + admin, + anyone, + futureAdvisor, + ...advisors + ] = accounts; + + before(async () => { + mock = await RBACMock.new(advisors, { from: admin }); + }); + + context('in normal conditions', () => { + it('allows admin to call #onlyAdminsCanDoThis', async () => { + await mock.onlyAdminsCanDoThis({ from: admin }) + .should.be.fulfilled; + }); + it('allows admin to call #onlyAdvisorsCanDoThis', async () => { + await mock.onlyAdvisorsCanDoThis({ from: admin }) + .should.be.fulfilled; + }); + it('allows advisors to call #onlyAdvisorsCanDoThis', async () => { + await mock.onlyAdvisorsCanDoThis({ from: advisors[0] }) + .should.be.fulfilled; + }); + it('allows admin to call #eitherAdminOrAdvisorCanDoThis', async () => { + await mock.eitherAdminOrAdvisorCanDoThis({ from: admin }) + .should.be.fulfilled; + }); + it('allows advisors to call #eitherAdminOrAdvisorCanDoThis', async () => { + await mock.eitherAdminOrAdvisorCanDoThis({ from: advisors[0] }) + .should.be.fulfilled; + }); + it('does not allow admins to call #nobodyCanDoThis', async () => { + await expectThrow( + mock.nobodyCanDoThis({ from: admin }) + ); + }); + it('does not allow advisors to call #nobodyCanDoThis', async () => { + await expectThrow( + mock.nobodyCanDoThis({ from: advisors[0] }) + ); + }); + it('does not allow anyone to call #nobodyCanDoThis', async () => { + await expectThrow( + mock.nobodyCanDoThis({ from: anyone }) + ); + }); + it('allows an admin to remove an advisor\'s role', async () => { + await mock.removeAdvisor(advisors[0], { from: admin }) + .should.be.fulfilled; + }); + it('allows admins to #adminRemoveRole', async () => { + await mock.adminRemoveRole(advisors[3], ROLE_ADVISOR, { from: admin }) + .should.be.fulfilled; + }); + + it('announces a RoleAdded event on addRole', async () => { + await expectEvent.inTransaction( + mock.adminAddRole(futureAdvisor, ROLE_ADVISOR, { from: admin }), + 'RoleAdded' + ); + }); + + it('announces a RoleRemoved event on removeRole', async () => { + await expectEvent.inTransaction( + mock.adminRemoveRole(futureAdvisor, ROLE_ADVISOR, { from: admin }), + 'RoleRemoved' + ); + }); + }); + + context('in adversarial conditions', () => { + it('does not allow an advisor to remove another advisor', async () => { + await expectThrow( + mock.removeAdvisor(advisors[1], { from: advisors[0] }) + ); + }); + it('does not allow "anyone" to remove an advisor', async () => { + await expectThrow( + mock.removeAdvisor(advisors[0], { from: anyone }) + ); + }); + }); +}); diff --git a/test/payment/PullPayment.test.js b/test/payment/PullPayment.test.js new file mode 100644 index 000000000..8f5a4e41a --- /dev/null +++ b/test/payment/PullPayment.test.js @@ -0,0 +1,71 @@ +var PullPaymentMock = artifacts.require('PullPaymentMock'); + +contract('PullPayment', function (accounts) { + let ppce; + let amount = 17 * 1e18; + + beforeEach(async function () { + ppce = await PullPaymentMock.new({ value: amount }); + }); + + it('can\'t call asyncSend externally', async function () { + assert.isUndefined(ppce.asyncSend); + }); + + it('can record an async payment correctly', async function () { + let AMOUNT = 100; + await ppce.callSend(accounts[0], AMOUNT); + let paymentsToAccount0 = await ppce.payments(accounts[0]); + let totalPayments = await ppce.totalPayments(); + + assert.equal(totalPayments, AMOUNT); + assert.equal(paymentsToAccount0, AMOUNT); + }); + + it('can add multiple balances on one account', async function () { + await ppce.callSend(accounts[0], 200); + await ppce.callSend(accounts[0], 300); + let paymentsToAccount0 = await ppce.payments(accounts[0]); + let totalPayments = await ppce.totalPayments(); + + assert.equal(totalPayments, 500); + assert.equal(paymentsToAccount0, 500); + }); + + it('can add balances on multiple accounts', async function () { + await ppce.callSend(accounts[0], 200); + await ppce.callSend(accounts[1], 300); + + let paymentsToAccount0 = await ppce.payments(accounts[0]); + assert.equal(paymentsToAccount0, 200); + + let paymentsToAccount1 = await ppce.payments(accounts[1]); + assert.equal(paymentsToAccount1, 300); + + let totalPayments = await ppce.totalPayments(); + assert.equal(totalPayments, 500); + }); + + it('can withdraw payment', async function () { + let payee = accounts[1]; + let initialBalance = web3.eth.getBalance(payee); + + await ppce.callSend(payee, amount); + + let payment1 = await ppce.payments(payee); + assert.equal(payment1, amount); + + let totalPayments = await ppce.totalPayments(); + assert.equal(totalPayments, amount); + + await ppce.withdrawPayments({ from: payee }); + let payment2 = await ppce.payments(payee); + assert.equal(payment2, 0); + + totalPayments = await ppce.totalPayments(); + assert.equal(totalPayments, 0); + + let balance = web3.eth.getBalance(payee); + assert(Math.abs(balance - initialBalance - amount) < 1e16); + }); +}); From c8719ce418ee9b7ce1a229d8b399105a44fe7542 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 18 May 2018 21:23:14 -0300 Subject: [PATCH 25/54] fix initialize versions --- contracts/ownership/Ownable.sol | 2 +- contracts/token/ERC20/DetailedERC20.sol | 2 +- contracts/token/ERC20/DetailedMintableToken.sol | 2 +- contracts/token/ERC20/DetailedPremintedToken.sol | 2 +- contracts/token/ERC20/MintableToken.sol | 4 ++++ contracts/token/ERC20/TokenTimelock.sol | 2 +- contracts/token/ERC20/TokenVesting.sol | 2 +- contracts/token/ERC721/ERC721Token.sol | 2 +- contracts/token/ERC721/MintableERC721Token.sol | 2 +- 9 files changed, 12 insertions(+), 8 deletions(-) diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol index 1c8c47321..ca01c5b0b 100644 --- a/contracts/ownership/Ownable.sol +++ b/contracts/ownership/Ownable.sol @@ -17,7 +17,7 @@ contract Ownable is Migratable { * @dev The Ownable constructor sets the original `owner` of the contract to the sender * account. */ - function initialize(address _sender) public isInitializer("Ownable", "0") { + function initialize(address _sender) public isInitializer("Ownable", "1.9.0-beta") { owner = _sender; } diff --git a/contracts/token/ERC20/DetailedERC20.sol b/contracts/token/ERC20/DetailedERC20.sol index 00ddac633..5ae4efddc 100644 --- a/contracts/token/ERC20/DetailedERC20.sol +++ b/contracts/token/ERC20/DetailedERC20.sol @@ -8,7 +8,7 @@ contract DetailedERC20 is Migratable, ERC20 { string public symbol; uint8 public decimals; - function initialize(address _sender, string _name, string _symbol, uint8 _decimals) public isInitializer("DetailedERC20", "0") { + function initialize(address _sender, string _name, string _symbol, uint8 _decimals) public isInitializer("DetailedERC20", "1.9.0-beta") { name = _name; symbol = _symbol; decimals = _decimals; diff --git a/contracts/token/ERC20/DetailedMintableToken.sol b/contracts/token/ERC20/DetailedMintableToken.sol index c7f73cda4..621e45c2b 100644 --- a/contracts/token/ERC20/DetailedMintableToken.sol +++ b/contracts/token/ERC20/DetailedMintableToken.sol @@ -5,7 +5,7 @@ import "./DetailedERC20.sol"; import "./MintableToken.sol"; contract DetailedMintableToken is Migratable, DetailedERC20, MintableToken { - function initialize(address _sender, string _name, string _symbol, uint8 _decimals) isInitializer("DetailedMintableToken", "0") { + function initialize(address _sender, string _name, string _symbol, uint8 _decimals) isInitializer("DetailedMintableToken", "1.9.0-beta") { DetailedERC20.initialize(_sender, _name, _symbol, _decimals); Ownable.initialize(_sender); } diff --git a/contracts/token/ERC20/DetailedPremintedToken.sol b/contracts/token/ERC20/DetailedPremintedToken.sol index 900b17d60..db3a1d564 100644 --- a/contracts/token/ERC20/DetailedPremintedToken.sol +++ b/contracts/token/ERC20/DetailedPremintedToken.sol @@ -5,7 +5,7 @@ import "./DetailedERC20.sol"; import "./MintableToken.sol"; contract DetailedPremintedToken is Migratable, DetailedERC20, StandardToken { - function initialize(address _sender, string _name, string _symbol, uint8 _decimals, uint256 _initialBalance) isInitializer("DetailedPremintedToken", "0") { + function initialize(address _sender, string _name, string _symbol, uint8 _decimals, uint256 _initialBalance) isInitializer("DetailedPremintedToken", "1.9.0-beta") { DetailedERC20.initialize(_sender, _name, _symbol, _decimals); _premint(_sender, _initialBalance); diff --git a/contracts/token/ERC20/MintableToken.sol b/contracts/token/ERC20/MintableToken.sol index 97ddc6666..ebebd20bf 100644 --- a/contracts/token/ERC20/MintableToken.sol +++ b/contracts/token/ERC20/MintableToken.sol @@ -22,6 +22,10 @@ contract MintableToken is Migratable, Ownable, StandardToken { _; } + function initialize(address _sender) isInitializer("MintableToken", "1.9.0-beta") { + Ownable.initialize(_sender); + } + /** * @dev Function to mint tokens * @param _to The address that will receive the minted tokens. diff --git a/contracts/token/ERC20/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol index 05d840ffb..003e1d7b7 100644 --- a/contracts/token/ERC20/TokenTimelock.sol +++ b/contracts/token/ERC20/TokenTimelock.sol @@ -20,7 +20,7 @@ contract TokenTimelock is Migratable { // timestamp when token release is enabled uint256 public releaseTime; - function initialize(address _sender, ERC20Basic _token, address _beneficiary, uint256 _releaseTime) public isInitializer("TokenTimelock", "0") { + function initialize(address _sender, ERC20Basic _token, address _beneficiary, uint256 _releaseTime) public isInitializer("TokenTimelock", "1.9.0-beta") { // solium-disable-next-line security/no-block-members require(_releaseTime > block.timestamp); token = _token; diff --git a/contracts/token/ERC20/TokenVesting.sol b/contracts/token/ERC20/TokenVesting.sol index ceeb19d6b..83b0e478e 100644 --- a/contracts/token/ERC20/TokenVesting.sol +++ b/contracts/token/ERC20/TokenVesting.sol @@ -52,7 +52,7 @@ contract TokenVesting is Migratable, Ownable { bool _revocable ) public - isInitializer("TokenVesting", "0") + isInitializer("TokenVesting", "1.9.0-beta") { Ownable.initialize(_sender); diff --git a/contracts/token/ERC721/ERC721Token.sol b/contracts/token/ERC721/ERC721Token.sol index 24c48f953..be64b2392 100644 --- a/contracts/token/ERC721/ERC721Token.sol +++ b/contracts/token/ERC721/ERC721Token.sol @@ -36,7 +36,7 @@ contract ERC721Token is Migratable, ERC721, ERC721BasicToken { /** * @dev Constructor function */ - function initialize(address _sender, string _name, string _symbol) public isInitializer("ERC721Token", "0") { + function initialize(address _sender, string _name, string _symbol) public isInitializer("ERC721Token", "1.9.0-beta") { name_ = _name; symbol_ = _symbol; } diff --git a/contracts/token/ERC721/MintableERC721Token.sol b/contracts/token/ERC721/MintableERC721Token.sol index 1f922e73b..04cf3f64a 100644 --- a/contracts/token/ERC721/MintableERC721Token.sol +++ b/contracts/token/ERC721/MintableERC721Token.sol @@ -7,7 +7,7 @@ import "../../ownership/Ownable.sol"; * @title Mintable ERC721 Token */ contract MintableERC721Token is Migratable, Ownable, ERC721Token { - function initialize(address _sender, string _name, string _symbol) isInitializer("MintableERC721Token", "0") { + function initialize(address _sender, string _name, string _symbol) isInitializer("MintableERC721Token", "1.9.0-beta") { Ownable.initialize(_sender); ERC721Token.initialize(_sender, _name, _symbol); } From 32e93579fa9d252e1daf3f49861deae5845b6657 Mon Sep 17 00:00:00 2001 From: Alejo Salles Date: Fri, 27 Apr 2018 13:39:03 -0300 Subject: [PATCH 26/54] added package.zos files --- zos.ropsten.json | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 zos.ropsten.json diff --git a/zos.ropsten.json b/zos.ropsten.json new file mode 100644 index 000000000..6eab55c33 --- /dev/null +++ b/zos.ropsten.json @@ -0,0 +1,18 @@ +{ + "distribution": { + "address": "0x57ed03ed45a70ef67479dec896ed782a72e40e8c" + }, + "contracts": { + "DetailedMintableToken": "DetailedMintableToken", + "DetailedPremintedToken": "DetailedPremintedToken", + "MintableERC721Token": "MintableERC721Token", + "TokenTimelock": "TokenTimelock", + "TokenVesting": "TokenVesting" + }, + "kernel": { + "address": "0xdf38ad6335299dcaab4e663b40d466140702285d" + }, + "provider": { + "address": "0xA739d10Cc20211B973dEE09DB8F0D75736E2D817" + } +} \ No newline at end of file From 27a6a15d6623e5b894b61dbd5233fe9abb0fc222 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 18 May 2018 21:45:34 -0300 Subject: [PATCH 27/54] add explicit initializers --- contracts/lifecycle/Pausable.sol | 6 +++++- contracts/token/ERC20/PausableToken.sol | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/contracts/lifecycle/Pausable.sol b/contracts/lifecycle/Pausable.sol index 3ac51bbcb..430745055 100644 --- a/contracts/lifecycle/Pausable.sol +++ b/contracts/lifecycle/Pausable.sol @@ -8,13 +8,17 @@ import "../ownership/Ownable.sol"; * @title Pausable * @dev Base contract which allows children to implement an emergency stop mechanism. */ -contract Pausable is Ownable { +contract Pausable is Migratable, Ownable { event Pause(); event Unpause(); bool public paused = false; + function initialize(address _sender) isInitializer("Pausable", "1.9.0-beta") { + Ownable.initialize(_sender); + } + /** * @dev Modifier to make a function callable only when the contract is not paused. */ diff --git a/contracts/token/ERC20/PausableToken.sol b/contracts/token/ERC20/PausableToken.sol index 437bd082b..23c299746 100644 --- a/contracts/token/ERC20/PausableToken.sol +++ b/contracts/token/ERC20/PausableToken.sol @@ -8,7 +8,11 @@ import "../../lifecycle/Pausable.sol"; * @title Pausable token * @dev StandardToken modified with pausable transfers. **/ -contract PausableToken is StandardToken, Pausable { +contract PausableToken is Migratable, StandardToken, Pausable { + + function initialize(address _sender) isInitializer("PausableToken", "1.9.0-beta") { + Pausable.initialize(_sender); + } function transfer(address _to, uint256 _value) public whenNotPaused returns (bool) { return super.transfer(_to, _value); From dd6054efebeee9a49eecc150c3231df94f6c5e68 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 18 May 2018 21:45:45 -0300 Subject: [PATCH 28/54] remove unnecessary sender arguments --- contracts/mocks/DetailedERC20Mock.sol | 2 +- contracts/token/ERC20/DetailedERC20.sol | 2 +- contracts/token/ERC20/DetailedMintableToken.sol | 2 +- contracts/token/ERC20/DetailedPremintedToken.sol | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contracts/mocks/DetailedERC20Mock.sol b/contracts/mocks/DetailedERC20Mock.sol index 01f1640c8..9ead14d70 100644 --- a/contracts/mocks/DetailedERC20Mock.sol +++ b/contracts/mocks/DetailedERC20Mock.sol @@ -6,6 +6,6 @@ import "../token/ERC20/DetailedERC20.sol"; contract DetailedERC20Mock is StandardToken, DetailedERC20 { function DetailedERC20Mock(string _name, string _symbol, uint8 _decimals) public { - DetailedERC20.initialize(msg.sender, _name, _symbol, _decimals); + DetailedERC20.initialize(_name, _symbol, _decimals); } } diff --git a/contracts/token/ERC20/DetailedERC20.sol b/contracts/token/ERC20/DetailedERC20.sol index 5ae4efddc..75aaafe82 100644 --- a/contracts/token/ERC20/DetailedERC20.sol +++ b/contracts/token/ERC20/DetailedERC20.sol @@ -8,7 +8,7 @@ contract DetailedERC20 is Migratable, ERC20 { string public symbol; uint8 public decimals; - function initialize(address _sender, string _name, string _symbol, uint8 _decimals) public isInitializer("DetailedERC20", "1.9.0-beta") { + function initialize(string _name, string _symbol, uint8 _decimals) public isInitializer("DetailedERC20", "1.9.0-beta") { name = _name; symbol = _symbol; decimals = _decimals; diff --git a/contracts/token/ERC20/DetailedMintableToken.sol b/contracts/token/ERC20/DetailedMintableToken.sol index 621e45c2b..12beadd6c 100644 --- a/contracts/token/ERC20/DetailedMintableToken.sol +++ b/contracts/token/ERC20/DetailedMintableToken.sol @@ -6,7 +6,7 @@ import "./MintableToken.sol"; contract DetailedMintableToken is Migratable, DetailedERC20, MintableToken { function initialize(address _sender, string _name, string _symbol, uint8 _decimals) isInitializer("DetailedMintableToken", "1.9.0-beta") { - DetailedERC20.initialize(_sender, _name, _symbol, _decimals); + DetailedERC20.initialize(_name, _symbol, _decimals); Ownable.initialize(_sender); } } diff --git a/contracts/token/ERC20/DetailedPremintedToken.sol b/contracts/token/ERC20/DetailedPremintedToken.sol index db3a1d564..cd73a0602 100644 --- a/contracts/token/ERC20/DetailedPremintedToken.sol +++ b/contracts/token/ERC20/DetailedPremintedToken.sol @@ -6,7 +6,7 @@ import "./MintableToken.sol"; contract DetailedPremintedToken is Migratable, DetailedERC20, StandardToken { function initialize(address _sender, string _name, string _symbol, uint8 _decimals, uint256 _initialBalance) isInitializer("DetailedPremintedToken", "1.9.0-beta") { - DetailedERC20.initialize(_sender, _name, _symbol, _decimals); + DetailedERC20.initialize(_name, _symbol, _decimals); _premint(_sender, _initialBalance); } From fc07f7a0ff859f49bf7f1c37f5bd0f1c06142244 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Venturo?= Date: Sat, 19 May 2018 00:58:52 -0300 Subject: [PATCH 29/54] RBACWithAdmin now has an initialize function instead of a constructor. --- contracts/mocks/RBACMock.sol | 2 ++ contracts/ownership/rbac/RBACWithAdmin.sol | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/contracts/mocks/RBACMock.sol b/contracts/mocks/RBACMock.sol index 7dfa2a985..fc8e93c9c 100644 --- a/contracts/mocks/RBACMock.sol +++ b/contracts/mocks/RBACMock.sol @@ -19,6 +19,8 @@ contract RBACMock is RBACWithAdmin { function RBACMock(address[] _advisors) public { + RBACWithAdmin.initialize(msg.sender); + addRole(msg.sender, ROLE_ADVISOR); for (uint256 i = 0; i < _advisors.length; i++) { diff --git a/contracts/ownership/rbac/RBACWithAdmin.sol b/contracts/ownership/rbac/RBACWithAdmin.sol index 90eb187a1..1f7b26a7b 100644 --- a/contracts/ownership/rbac/RBACWithAdmin.sol +++ b/contracts/ownership/rbac/RBACWithAdmin.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.21; import "./RBAC.sol"; - +import 'zos-lib/contracts/migrations/Migratable.sol'; /** * @title RBACWithAdmin @@ -9,7 +9,7 @@ import "./RBAC.sol"; * @dev It's recommended that you define constants in the contract, * @dev like ROLE_ADMIN below, to avoid typos. */ -contract RBACWithAdmin is RBAC { +contract RBACWithAdmin is RBAC, Migratable { /** * A constant role name for indicating admins. */ @@ -26,12 +26,13 @@ contract RBACWithAdmin is RBAC { } /** - * @dev constructor. Sets msg.sender as admin by default + * @dev constructor. Sets initialAdmin as admin. */ - function RBACWithAdmin() + function initialize(address initialAdmin) + isInitializer("RBACWithAdmin", "1.9.0-beta") public { - addRole(msg.sender, ROLE_ADMIN); + addRole(initialAdmin, ROLE_ADMIN); } /** From 579446d5d99655028fb707309dbd4b6d6a47f09e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Venturo?= Date: Sat, 19 May 2018 01:02:12 -0300 Subject: [PATCH 30/54] Fixed MintableToken's initialize not being called. --- contracts/token/ERC20/DetailedMintableToken.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/token/ERC20/DetailedMintableToken.sol b/contracts/token/ERC20/DetailedMintableToken.sol index 12beadd6c..53d8cb943 100644 --- a/contracts/token/ERC20/DetailedMintableToken.sol +++ b/contracts/token/ERC20/DetailedMintableToken.sol @@ -7,6 +7,6 @@ import "./MintableToken.sol"; contract DetailedMintableToken is Migratable, DetailedERC20, MintableToken { function initialize(address _sender, string _name, string _symbol, uint8 _decimals) isInitializer("DetailedMintableToken", "1.9.0-beta") { DetailedERC20.initialize(_name, _symbol, _decimals); - Ownable.initialize(_sender); + MintableToken.initialize(_sender); } } From e3ad4a5e148fdf20584a1ec4e8897f266425092d Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 18 May 2018 21:45:45 -0300 Subject: [PATCH 31/54] remove unnecessary sender arguments --- contracts/mocks/ERC721TokenMock.sol | 2 +- contracts/token/ERC721/ERC721Token.sol | 2 +- contracts/token/ERC721/MintableERC721Token.sol | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contracts/mocks/ERC721TokenMock.sol b/contracts/mocks/ERC721TokenMock.sol index ac5bab39d..29bfe7439 100644 --- a/contracts/mocks/ERC721TokenMock.sol +++ b/contracts/mocks/ERC721TokenMock.sol @@ -10,7 +10,7 @@ import "../token/ERC721/ERC721Token.sol"; */ contract ERC721TokenMock is ERC721Token { function ERC721TokenMock(string name, string symbol) public { - ERC721Token.initialize(msg.sender, name, symbol); + ERC721Token.initialize(name, symbol); } function mint(address _to, uint256 _tokenId) public { diff --git a/contracts/token/ERC721/ERC721Token.sol b/contracts/token/ERC721/ERC721Token.sol index be64b2392..1805f24a8 100644 --- a/contracts/token/ERC721/ERC721Token.sol +++ b/contracts/token/ERC721/ERC721Token.sol @@ -36,7 +36,7 @@ contract ERC721Token is Migratable, ERC721, ERC721BasicToken { /** * @dev Constructor function */ - function initialize(address _sender, string _name, string _symbol) public isInitializer("ERC721Token", "1.9.0-beta") { + function initialize(string _name, string _symbol) public isInitializer("ERC721Token", "1.9.0-beta") { name_ = _name; symbol_ = _symbol; } diff --git a/contracts/token/ERC721/MintableERC721Token.sol b/contracts/token/ERC721/MintableERC721Token.sol index 04cf3f64a..c950cfe41 100644 --- a/contracts/token/ERC721/MintableERC721Token.sol +++ b/contracts/token/ERC721/MintableERC721Token.sol @@ -9,7 +9,7 @@ import "../../ownership/Ownable.sol"; contract MintableERC721Token is Migratable, Ownable, ERC721Token { function initialize(address _sender, string _name, string _symbol) isInitializer("MintableERC721Token", "1.9.0-beta") { Ownable.initialize(_sender); - ERC721Token.initialize(_sender, _name, _symbol); + ERC721Token.initialize(_name, _symbol); } function mint(address _to, uint256 _tokenId) onlyOwner public { From 16f04b13d75b2876ecaf1236c6fd14d01c3136bf Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 18 May 2018 21:54:58 -0300 Subject: [PATCH 32/54] revert truffle-config.js changes from 95fdc7b --- truffle-config.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/truffle-config.js b/truffle-config.js index 65e4bdd08..a5ca2558e 100644 --- a/truffle-config.js +++ b/truffle-config.js @@ -24,11 +24,8 @@ module.exports = { network_id: '*', // eslint-disable-line camelcase }, ropsten: { - host: 'localhost', - network_id: '3', - port: 8555, - gas: 4700000, - gasPrice: 10e9, + provider: ropstenProvider, + network_id: 3, // eslint-disable-line camelcase }, coverage: { host: 'localhost', From 700b8118133eb8da2430007a16d233f459b815cb Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 18 May 2018 21:58:02 -0300 Subject: [PATCH 33/54] fix linter errors and warnings --- contracts/lifecycle/Pausable.sol | 2 +- contracts/mocks/SafeERC20Helper.sol | 8 ++++---- contracts/ownership/Ownable.sol | 3 ++- contracts/token/ERC20/DetailedERC20.sol | 3 ++- contracts/token/ERC20/DetailedMintableToken.sol | 11 ++++++++++- contracts/token/ERC20/DetailedPremintedToken.sol | 12 +++++++++++- contracts/token/ERC20/MintableToken.sol | 3 ++- contracts/token/ERC20/PausableToken.sol | 2 +- contracts/token/ERC20/StandardBurnableToken.sol | 1 + contracts/token/ERC20/TokenTimelock.sol | 11 ++++++++++- contracts/token/ERC20/TokenVesting.sol | 2 +- contracts/token/ERC721/MintableERC721Token.sol | 3 ++- 12 files changed, 47 insertions(+), 14 deletions(-) diff --git a/contracts/lifecycle/Pausable.sol b/contracts/lifecycle/Pausable.sol index 430745055..921bd0d83 100644 --- a/contracts/lifecycle/Pausable.sol +++ b/contracts/lifecycle/Pausable.sol @@ -15,7 +15,7 @@ contract Pausable is Migratable, Ownable { bool public paused = false; - function initialize(address _sender) isInitializer("Pausable", "1.9.0-beta") { + function initialize(address _sender) isInitializer("Pausable", "1.9.0-beta") public { Ownable.initialize(_sender); } diff --git a/contracts/mocks/SafeERC20Helper.sol b/contracts/mocks/SafeERC20Helper.sol index 9f187284a..200a220dc 100644 --- a/contracts/mocks/SafeERC20Helper.sol +++ b/contracts/mocks/SafeERC20Helper.sol @@ -21,11 +21,11 @@ contract ERC20FailingMock is ERC20 { return false; } - function balanceOf(address) public constant returns (uint256) { + function balanceOf(address) public view returns (uint256) { return 0; } - function allowance(address, address) public constant returns (uint256) { + function allowance(address, address) public view returns (uint256) { return 0; } } @@ -48,11 +48,11 @@ contract ERC20SucceedingMock is ERC20 { return true; } - function balanceOf(address) public constant returns (uint256) { + function balanceOf(address) public view returns (uint256) { return 0; } - function allowance(address, address) public constant returns (uint256) { + function allowance(address, address) public view returns (uint256) { return 0; } } diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol index ca01c5b0b..5617639e6 100644 --- a/contracts/ownership/Ownable.sol +++ b/contracts/ownership/Ownable.sol @@ -1,6 +1,7 @@ pragma solidity ^0.4.21; -import 'zos-lib/contracts/migrations/Migratable.sol'; +import "zos-lib/contracts/migrations/Migratable.sol"; + /** * @title Ownable diff --git a/contracts/token/ERC20/DetailedERC20.sol b/contracts/token/ERC20/DetailedERC20.sol index 75aaafe82..cd9b14bc4 100644 --- a/contracts/token/ERC20/DetailedERC20.sol +++ b/contracts/token/ERC20/DetailedERC20.sol @@ -1,7 +1,8 @@ pragma solidity ^0.4.21; import "./ERC20.sol"; -import 'zos-lib/contracts/migrations/Migratable.sol'; +import "zos-lib/contracts/migrations/Migratable.sol"; + contract DetailedERC20 is Migratable, ERC20 { string public name; diff --git a/contracts/token/ERC20/DetailedMintableToken.sol b/contracts/token/ERC20/DetailedMintableToken.sol index 53d8cb943..83801c1b3 100644 --- a/contracts/token/ERC20/DetailedMintableToken.sol +++ b/contracts/token/ERC20/DetailedMintableToken.sol @@ -4,8 +4,17 @@ import "zos-lib/contracts/migrations/Migratable.sol"; import "./DetailedERC20.sol"; import "./MintableToken.sol"; + contract DetailedMintableToken is Migratable, DetailedERC20, MintableToken { - function initialize(address _sender, string _name, string _symbol, uint8 _decimals) isInitializer("DetailedMintableToken", "1.9.0-beta") { + function initialize( + address _sender, + string _name, + string _symbol, + uint8 _decimals + ) + isInitializer("DetailedMintableToken", "1.9.0-beta") + public + { DetailedERC20.initialize(_name, _symbol, _decimals); MintableToken.initialize(_sender); } diff --git a/contracts/token/ERC20/DetailedPremintedToken.sol b/contracts/token/ERC20/DetailedPremintedToken.sol index cd73a0602..3dec80e89 100644 --- a/contracts/token/ERC20/DetailedPremintedToken.sol +++ b/contracts/token/ERC20/DetailedPremintedToken.sol @@ -4,8 +4,18 @@ import "zos-lib/contracts/migrations/Migratable.sol"; import "./DetailedERC20.sol"; import "./MintableToken.sol"; + contract DetailedPremintedToken is Migratable, DetailedERC20, StandardToken { - function initialize(address _sender, string _name, string _symbol, uint8 _decimals, uint256 _initialBalance) isInitializer("DetailedPremintedToken", "1.9.0-beta") { + function initialize( + address _sender, + string _name, + string _symbol, + uint8 _decimals, + uint256 _initialBalance + ) + isInitializer("DetailedPremintedToken", "1.9.0-beta") + public + { DetailedERC20.initialize(_name, _symbol, _decimals); _premint(_sender, _initialBalance); diff --git a/contracts/token/ERC20/MintableToken.sol b/contracts/token/ERC20/MintableToken.sol index ebebd20bf..35003dd00 100644 --- a/contracts/token/ERC20/MintableToken.sol +++ b/contracts/token/ERC20/MintableToken.sol @@ -4,6 +4,7 @@ import "./StandardToken.sol"; import "../../ownership/Ownable.sol"; import "zos-lib/contracts/migrations/Migratable.sol"; + /** * @title Mintable token * @dev Simple ERC20 Token example, with mintable token creation @@ -22,7 +23,7 @@ contract MintableToken is Migratable, Ownable, StandardToken { _; } - function initialize(address _sender) isInitializer("MintableToken", "1.9.0-beta") { + function initialize(address _sender) isInitializer("MintableToken", "1.9.0-beta") public { Ownable.initialize(_sender); } diff --git a/contracts/token/ERC20/PausableToken.sol b/contracts/token/ERC20/PausableToken.sol index 23c299746..a22370885 100644 --- a/contracts/token/ERC20/PausableToken.sol +++ b/contracts/token/ERC20/PausableToken.sol @@ -10,7 +10,7 @@ import "../../lifecycle/Pausable.sol"; **/ contract PausableToken is Migratable, StandardToken, Pausable { - function initialize(address _sender) isInitializer("PausableToken", "1.9.0-beta") { + function initialize(address _sender) isInitializer("PausableToken", "1.9.0-beta") public { Pausable.initialize(_sender); } diff --git a/contracts/token/ERC20/StandardBurnableToken.sol b/contracts/token/ERC20/StandardBurnableToken.sol index 3a337331e..03767c2eb 100644 --- a/contracts/token/ERC20/StandardBurnableToken.sol +++ b/contracts/token/ERC20/StandardBurnableToken.sol @@ -3,6 +3,7 @@ pragma solidity ^0.4.18; import "./BurnableToken.sol"; import "./StandardToken.sol"; + /** * @title Standard Burnable Token * @dev Adds burnFrom method to ERC20 implementations diff --git a/contracts/token/ERC20/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol index 003e1d7b7..0ceaa1fd9 100644 --- a/contracts/token/ERC20/TokenTimelock.sol +++ b/contracts/token/ERC20/TokenTimelock.sol @@ -3,6 +3,7 @@ pragma solidity ^0.4.21; import "./SafeERC20.sol"; import "zos-lib/contracts/migrations/Migratable.sol"; + /** * @title TokenTimelock * @dev TokenTimelock is a token holder contract that will allow a @@ -20,7 +21,15 @@ contract TokenTimelock is Migratable { // timestamp when token release is enabled uint256 public releaseTime; - function initialize(address _sender, ERC20Basic _token, address _beneficiary, uint256 _releaseTime) public isInitializer("TokenTimelock", "1.9.0-beta") { + function initialize( + address _sender, + ERC20Basic _token, + address _beneficiary, + uint256 _releaseTime + ) + isInitializer("TokenTimelock", "1.9.0-beta") + public + { // solium-disable-next-line security/no-block-members require(_releaseTime > block.timestamp); token = _token; diff --git a/contracts/token/ERC20/TokenVesting.sol b/contracts/token/ERC20/TokenVesting.sol index 83b0e478e..8b9a2c091 100644 --- a/contracts/token/ERC20/TokenVesting.sol +++ b/contracts/token/ERC20/TokenVesting.sol @@ -6,7 +6,7 @@ import "./ERC20Basic.sol"; import "./SafeERC20.sol"; import "../../ownership/Ownable.sol"; import "../../math/SafeMath.sol"; -import 'zos-lib/contracts/migrations/Migratable.sol'; +import "zos-lib/contracts/migrations/Migratable.sol"; /** diff --git a/contracts/token/ERC721/MintableERC721Token.sol b/contracts/token/ERC721/MintableERC721Token.sol index c950cfe41..9d6a14ed8 100644 --- a/contracts/token/ERC721/MintableERC721Token.sol +++ b/contracts/token/ERC721/MintableERC721Token.sol @@ -3,11 +3,12 @@ pragma solidity ^0.4.21; import "./ERC721Token.sol"; import "../../ownership/Ownable.sol"; + /** * @title Mintable ERC721 Token */ contract MintableERC721Token is Migratable, Ownable, ERC721Token { - function initialize(address _sender, string _name, string _symbol) isInitializer("MintableERC721Token", "1.9.0-beta") { + function initialize(address _sender, string _name, string _symbol) isInitializer("MintableERC721Token", "1.9.0-beta") public { Ownable.initialize(_sender); ERC721Token.initialize(_name, _symbol); } From 2ce67a25ef84e8134d9f4acae5cd6e54467aa5b9 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Mon, 21 May 2018 15:19:58 -0300 Subject: [PATCH 34/54] add more contracts from openzeppelin-solidity --- contracts/access/SignatureBouncer.sol | 97 +++++++++++++++++++++ contracts/mocks/BouncerMock.sol | 29 +++++++ contracts/payment/SplitPayment.sol | 76 ++++++++++++++++ test/access/SignatureBouncer.test.js | 120 ++++++++++++++++++++++++++ test/payment/SplitPayment.test.js | 79 +++++++++++++++++ zos.json | 5 +- 6 files changed, 404 insertions(+), 2 deletions(-) create mode 100644 contracts/access/SignatureBouncer.sol create mode 100644 contracts/mocks/BouncerMock.sol create mode 100644 contracts/payment/SplitPayment.sol create mode 100644 test/access/SignatureBouncer.test.js create mode 100644 test/payment/SplitPayment.test.js diff --git a/contracts/access/SignatureBouncer.sol b/contracts/access/SignatureBouncer.sol new file mode 100644 index 000000000..43185855e --- /dev/null +++ b/contracts/access/SignatureBouncer.sol @@ -0,0 +1,97 @@ +pragma solidity ^0.4.18; + +import "../ownership/Ownable.sol"; +import "../ownership/rbac/RBAC.sol"; +import "../ECRecovery.sol"; + +/** + * @title SignatureBouncer + * @author PhABC and Shrugs + * @dev Bouncer allows users to submit a signature as a permission to do an action. + * @dev If the signature is from one of the authorized bouncer addresses, the signature + * @dev is valid. The owner of the contract adds/removes bouncers. + * @dev Bouncer addresses can be individual servers signing grants or different + * @dev users within a decentralized club that have permission to invite other members. + * @dev + * @dev This technique is useful for whitelists and airdrops; instead of putting all + * @dev valid addresses on-chain, simply sign a grant of the form + * @dev keccak256(`:contractAddress` + `:granteeAddress`) using a valid bouncer address. + * @dev Then restrict access to your crowdsale/whitelist/airdrop using the + * @dev `onlyValidSignature` modifier (or implement your own using isValidSignature). + * @dev + * @dev See the tests Bouncer.test.js for specific usage examples. + */ +contract SignatureBouncer is Migratable, Ownable, RBAC { + using ECRecovery for bytes32; + + string public constant ROLE_BOUNCER = "bouncer"; + + function initialize(address _sender) + isInitializer("SignatureBouncer", "1.9.0-beta") + public + { + Ownable.initialize(_sender); + } + + /** + * @dev requires that a valid signature of a bouncer was provided + */ + modifier onlyValidSignature(bytes _sig) + { + require(isValidSignature(msg.sender, _sig)); + _; + } + + /** + * @dev allows the owner to add additional bouncer addresses + */ + function addBouncer(address _bouncer) + onlyOwner + public + { + require(_bouncer != address(0)); + addRole(_bouncer, ROLE_BOUNCER); + } + + /** + * @dev allows the owner to remove bouncer addresses + */ + function removeBouncer(address _bouncer) + onlyOwner + public + { + require(_bouncer != address(0)); + removeRole(_bouncer, ROLE_BOUNCER); + } + + /** + * @dev is the signature of `this + sender` from a bouncer? + * @return bool + */ + function isValidSignature(address _address, bytes _sig) + internal + view + returns (bool) + { + return isValidDataHash( + keccak256(address(this), _address), + _sig + ); + } + + /** + * @dev internal function to convert a hash to an eth signed message + * @dev and then recover the signature and check it against the bouncer role + * @return bool + */ + function isValidDataHash(bytes32 hash, bytes _sig) + internal + view + returns (bool) + { + address signer = hash + .toEthSignedMessageHash() + .recover(_sig); + return hasRole(signer, ROLE_BOUNCER); + } +} diff --git a/contracts/mocks/BouncerMock.sol b/contracts/mocks/BouncerMock.sol new file mode 100644 index 000000000..3bc826583 --- /dev/null +++ b/contracts/mocks/BouncerMock.sol @@ -0,0 +1,29 @@ +pragma solidity ^0.4.18; + +import "../access/SignatureBouncer.sol"; + + +contract SignatureBouncerMock is SignatureBouncer { + function initialize(address _sender) + isInitializer("SignatureBouncerMock", "1.9.0-beta") + public + { + SignatureBouncer.initialize(_sender); + } + + function checkValidSignature(address _address, bytes _sig) + public + view + returns (bool) + { + return isValidSignature(_address, _sig); + } + + function onlyWithValidSignature(bytes _sig) + onlyValidSignature(_sig) + public + view + { + + } +} diff --git a/contracts/payment/SplitPayment.sol b/contracts/payment/SplitPayment.sol new file mode 100644 index 000000000..3cb5b9243 --- /dev/null +++ b/contracts/payment/SplitPayment.sol @@ -0,0 +1,76 @@ +pragma solidity ^0.4.21; + +import "../math/SafeMath.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; + + +/** + * @title SplitPayment + * @dev Base contract that supports multiple payees claiming funds sent to this contract + * according to the proportion they own. + */ +contract SplitPayment is Migratable { + using SafeMath for uint256; + + uint256 public totalShares = 0; + uint256 public totalReleased = 0; + + mapping(address => uint256) public shares; + mapping(address => uint256) public released; + address[] public payees; + + /** + * @dev Constructor + */ + function initialize(address[] _payees, uint256[] _shares) + isInitializer("SplitPayment", "1.9.0-beta") + public + payable + { + require(_payees.length == _shares.length); + + for (uint256 i = 0; i < _payees.length; i++) { + addPayee(_payees[i], _shares[i]); + } + } + + /** + * @dev payable fallback + */ + function () public payable {} + + /** + * @dev Claim your share of the balance. + */ + function claim() public { + address payee = msg.sender; + + require(shares[payee] > 0); + + uint256 totalReceived = address(this).balance.add(totalReleased); + uint256 payment = totalReceived.mul(shares[payee]).div(totalShares).sub(released[payee]); + + require(payment != 0); + require(address(this).balance >= payment); + + released[payee] = released[payee].add(payment); + totalReleased = totalReleased.add(payment); + + payee.transfer(payment); + } + + /** + * @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 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); + } +} diff --git a/test/access/SignatureBouncer.test.js b/test/access/SignatureBouncer.test.js new file mode 100644 index 000000000..e4f5d39ec --- /dev/null +++ b/test/access/SignatureBouncer.test.js @@ -0,0 +1,120 @@ + +import assertRevert from '../helpers/assertRevert'; +import { signHex } from '../helpers/sign'; + +const Bouncer = artifacts.require('SignatureBouncerMock'); + +require('chai') + .use(require('chai-as-promised')) + .should(); + +export const getSigner = (contract, signer, data = '') => (addr) => { + // via: https://github.com/OpenZeppelin/zeppelin-solidity/pull/812/files + const message = contract.address.substr(2) + addr.substr(2) + data; + // ^ substr to remove `0x` because in solidity the address is a set of byes, not a string `0xabcd` + return signHex(signer, message); +}; + +contract('Bouncer', ([_, owner, authorizedUser, anyone, bouncerAddress, newBouncer]) => { + before(async function () { + this.bouncer = await Bouncer.new(); + await this.bouncer.initialize(owner); + this.roleBouncer = await this.bouncer.ROLE_BOUNCER(); + this.genSig = getSigner(this.bouncer, bouncerAddress); + }); + + it('should have a default owner of self', async function () { + const theOwner = await this.bouncer.owner(); + theOwner.should.eq(owner); + }); + + it('should allow owner to add a bouncer', async function () { + await this.bouncer.addBouncer(bouncerAddress, { from: owner }); + const hasRole = await this.bouncer.hasRole(bouncerAddress, this.roleBouncer); + hasRole.should.eq(true); + }); + + it('should not allow anyone to add a bouncer', async function () { + await assertRevert( + this.bouncer.addBouncer(bouncerAddress, { from: anyone }) + ); + }); + + context('modifiers', () => { + it('should allow valid signature for sender', async function () { + await this.bouncer.onlyWithValidSignature( + this.genSig(authorizedUser), + { from: authorizedUser } + ); + }); + it('should not allow invalid signature for sender', async function () { + await assertRevert( + this.bouncer.onlyWithValidSignature( + 'abcd', + { from: authorizedUser } + ) + ); + }); + }); + + context('signatures', () => { + it('should accept valid message for valid user', async function () { + const isValid = await this.bouncer.checkValidSignature( + authorizedUser, + this.genSig(authorizedUser) + ); + isValid.should.eq(true); + }); + it('should not accept invalid message for valid user', async function () { + const isValid = await this.bouncer.checkValidSignature( + authorizedUser, + this.genSig(anyone) + ); + isValid.should.eq(false); + }); + it('should not accept invalid message for invalid user', async function () { + const isValid = await this.bouncer.checkValidSignature( + anyone, + 'abcd' + ); + isValid.should.eq(false); + }); + it('should not accept valid message for invalid user', async function () { + const isValid = await this.bouncer.checkValidSignature( + anyone, + this.genSig(authorizedUser) + ); + isValid.should.eq(false); + }); + }); + + context('management', () => { + it('should not allow anyone to add bouncers', async function () { + await assertRevert( + this.bouncer.addBouncer(newBouncer, { from: anyone }) + ); + }); + + it('should be able to add bouncers', async function () { + await this.bouncer.addBouncer(newBouncer, { from: owner }) + .should.be.fulfilled; + }); + + it('should not allow adding invalid address', async function () { + await assertRevert( + this.bouncer.addBouncer('0x0', { from: owner }) + ); + }); + + it('should not allow anyone to remove bouncer', async function () { + await assertRevert( + this.bouncer.removeBouncer(newBouncer, { from: anyone }) + ); + }); + + it('should be able to remove bouncers', async function () { + await this.bouncer.removeBouncer(newBouncer, { from: owner }) + .should.be.fulfilled; + }); + }); +}); diff --git a/test/payment/SplitPayment.test.js b/test/payment/SplitPayment.test.js new file mode 100644 index 000000000..d81d3e6a5 --- /dev/null +++ b/test/payment/SplitPayment.test.js @@ -0,0 +1,79 @@ +const BigNumber = web3.BigNumber; + +require('chai') + .use(require('chai-as-promised')) + .use(require('chai-bignumber')(BigNumber)) + .should(); + +const EVMThrow = require('../helpers/EVMThrow.js'); +const SplitPayment = artifacts.require('SplitPayment'); + +contract('SplitPayment', function ([owner, payee1, payee2, payee3, nonpayee1, payer1]) { + const amount = web3.toWei(1.0, 'ether'); + + beforeEach(async function () { + this.payees = [payee1, payee2, payee3]; + this.shares = [20, 10, 70]; + + this.contract = await SplitPayment.new(); + await this.contract.initialize(this.payees, this.shares); + }); + + it('should accept payments', async function () { + await web3.eth.sendTransaction({ from: owner, to: this.contract.address, value: amount }); + + const balance = web3.eth.getBalance(this.contract.address); + balance.should.be.bignumber.equal(amount); + }); + + it('should store shares if address is payee', async function () { + const shares = await this.contract.shares.call(payee1); + shares.should.be.bignumber.not.equal(0); + }); + + it('should not store shares if address is not payee', async function () { + const shares = await this.contract.shares.call(nonpayee1); + shares.should.be.bignumber.equal(0); + }); + + it('should throw if no funds to claim', async function () { + await this.contract.claim({ from: payee1 }).should.be.rejectedWith(EVMThrow); + }); + + it('should throw if non-payee want to claim', async function () { + await web3.eth.sendTransaction({ from: payer1, to: this.contract.address, value: amount }); + await this.contract.claim({ from: nonpayee1 }).should.be.rejectedWith(EVMThrow); + }); + + it('should distribute funds to payees', async function () { + await web3.eth.sendTransaction({ from: payer1, to: this.contract.address, value: amount }); + + // receive funds + const initBalance = web3.eth.getBalance(this.contract.address); + initBalance.should.be.bignumber.equal(amount); + + // distribute to payees + const initAmount1 = web3.eth.getBalance(payee1); + await this.contract.claim({ from: payee1 }); + const profit1 = web3.eth.getBalance(payee1) - initAmount1; + assert(Math.abs(profit1 - web3.toWei(0.20, 'ether')) < 1e16); + + const initAmount2 = web3.eth.getBalance(payee2); + await this.contract.claim({ from: payee2 }); + const profit2 = web3.eth.getBalance(payee2) - initAmount2; + assert(Math.abs(profit2 - web3.toWei(0.10, 'ether')) < 1e16); + + const initAmount3 = web3.eth.getBalance(payee3); + await this.contract.claim({ from: payee3 }); + const profit3 = web3.eth.getBalance(payee3) - initAmount3; + assert(Math.abs(profit3 - web3.toWei(0.70, 'ether')) < 1e16); + + // end balance should be zero + const endBalance = web3.eth.getBalance(this.contract.address); + endBalance.should.be.bignumber.equal(0); + + // check correct funds released accounting + const totalReleased = await this.contract.totalReleased.call(); + totalReleased.should.be.bignumber.equal(initBalance); + }); +}); diff --git a/zos.json b/zos.json index c89e9ecd8..389b8b6ff 100644 --- a/zos.json +++ b/zos.json @@ -6,7 +6,8 @@ "DetailedPremintedToken": "DetailedPremintedToken", "MintableERC721Token": "MintableERC721Token", "TokenTimelock": "TokenTimelock", - "TokenVesting": "TokenVesting" + "TokenVesting": "TokenVesting", + "SplitPayment": "SplitPayment" }, "lib": true -} +} \ No newline at end of file From acd34a93725d12342b52ae96904cc9ef39d97aa3 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Mon, 21 May 2018 15:21:19 -0300 Subject: [PATCH 35/54] fix bug in DetailedPremintedToken --- contracts/token/ERC20/DetailedPremintedToken.sol | 1 + 1 file changed, 1 insertion(+) diff --git a/contracts/token/ERC20/DetailedPremintedToken.sol b/contracts/token/ERC20/DetailedPremintedToken.sol index 3dec80e89..07e496b4f 100644 --- a/contracts/token/ERC20/DetailedPremintedToken.sol +++ b/contracts/token/ERC20/DetailedPremintedToken.sol @@ -22,6 +22,7 @@ contract DetailedPremintedToken is Migratable, DetailedERC20, StandardToken { } function _premint(address _to, uint256 _value) internal { + totalSupply_ += _value; balances[_to] += _value; emit Transfer(0, _to, _value); } From 48a7cd4e60d8e17f907bf305922df7c400927dbd Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Mon, 21 May 2018 15:52:00 -0300 Subject: [PATCH 36/54] add workaround because truffle doesn't support transitive dependencies --- contracts/access/SignatureBouncer.sol | 2 ++ contracts/ownership/Ownable.sol | 2 +- contracts/ownership/rbac/RBACWithAdmin.sol | 3 ++- contracts/payment/SplitPayment.sol | 2 +- contracts/token/ERC20/DetailedERC20.sol | 2 +- contracts/token/ERC20/DetailedMintableToken.sol | 2 +- contracts/token/ERC20/DetailedPremintedToken.sol | 2 +- contracts/token/ERC20/MintableToken.sol | 2 +- contracts/token/ERC20/TokenTimelock.sol | 2 +- contracts/token/ERC20/TokenVesting.sol | 2 +- contracts/token/ERC721/ERC721Token.sol | 2 +- contracts/zos-lib/migrations/Migratable.sol | 1 + 12 files changed, 14 insertions(+), 10 deletions(-) create mode 120000 contracts/zos-lib/migrations/Migratable.sol diff --git a/contracts/access/SignatureBouncer.sol b/contracts/access/SignatureBouncer.sol index 43185855e..7d8f98d22 100644 --- a/contracts/access/SignatureBouncer.sol +++ b/contracts/access/SignatureBouncer.sol @@ -1,9 +1,11 @@ pragma solidity ^0.4.18; +import "../zos-lib/migrations/Migratable.sol"; import "../ownership/Ownable.sol"; import "../ownership/rbac/RBAC.sol"; import "../ECRecovery.sol"; + /** * @title SignatureBouncer * @author PhABC and Shrugs diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol index 5617639e6..64d6ea5e7 100644 --- a/contracts/ownership/Ownable.sol +++ b/contracts/ownership/Ownable.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.21; -import "zos-lib/contracts/migrations/Migratable.sol"; +import "../zos-lib/migrations/Migratable.sol"; /** diff --git a/contracts/ownership/rbac/RBACWithAdmin.sol b/contracts/ownership/rbac/RBACWithAdmin.sol index 1f7b26a7b..1512b79b2 100644 --- a/contracts/ownership/rbac/RBACWithAdmin.sol +++ b/contracts/ownership/rbac/RBACWithAdmin.sol @@ -1,7 +1,8 @@ pragma solidity ^0.4.21; import "./RBAC.sol"; -import 'zos-lib/contracts/migrations/Migratable.sol'; +import "../../zos-lib/migrations/Migratable.sol"; + /** * @title RBACWithAdmin diff --git a/contracts/payment/SplitPayment.sol b/contracts/payment/SplitPayment.sol index 3cb5b9243..bf8eb7280 100644 --- a/contracts/payment/SplitPayment.sol +++ b/contracts/payment/SplitPayment.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.21; import "../math/SafeMath.sol"; -import "zos-lib/contracts/migrations/Migratable.sol"; +import "../zos-lib/migrations/Migratable.sol"; /** diff --git a/contracts/token/ERC20/DetailedERC20.sol b/contracts/token/ERC20/DetailedERC20.sol index cd9b14bc4..a4077f635 100644 --- a/contracts/token/ERC20/DetailedERC20.sol +++ b/contracts/token/ERC20/DetailedERC20.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.21; import "./ERC20.sol"; -import "zos-lib/contracts/migrations/Migratable.sol"; +import "../../zos-lib/migrations/Migratable.sol"; contract DetailedERC20 is Migratable, ERC20 { diff --git a/contracts/token/ERC20/DetailedMintableToken.sol b/contracts/token/ERC20/DetailedMintableToken.sol index 83801c1b3..e9fbbfd43 100644 --- a/contracts/token/ERC20/DetailedMintableToken.sol +++ b/contracts/token/ERC20/DetailedMintableToken.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.21; -import "zos-lib/contracts/migrations/Migratable.sol"; +import "../../zos-lib/migrations/Migratable.sol"; import "./DetailedERC20.sol"; import "./MintableToken.sol"; diff --git a/contracts/token/ERC20/DetailedPremintedToken.sol b/contracts/token/ERC20/DetailedPremintedToken.sol index 07e496b4f..10dbc6148 100644 --- a/contracts/token/ERC20/DetailedPremintedToken.sol +++ b/contracts/token/ERC20/DetailedPremintedToken.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.21; -import "zos-lib/contracts/migrations/Migratable.sol"; +import "../../zos-lib/migrations/Migratable.sol"; import "./DetailedERC20.sol"; import "./MintableToken.sol"; diff --git a/contracts/token/ERC20/MintableToken.sol b/contracts/token/ERC20/MintableToken.sol index 35003dd00..01fa1409e 100644 --- a/contracts/token/ERC20/MintableToken.sol +++ b/contracts/token/ERC20/MintableToken.sol @@ -2,7 +2,7 @@ pragma solidity ^0.4.21; import "./StandardToken.sol"; import "../../ownership/Ownable.sol"; -import "zos-lib/contracts/migrations/Migratable.sol"; +import "../../zos-lib/migrations/Migratable.sol"; /** diff --git a/contracts/token/ERC20/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol index 0ceaa1fd9..a9ba1e1c8 100644 --- a/contracts/token/ERC20/TokenTimelock.sol +++ b/contracts/token/ERC20/TokenTimelock.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.21; import "./SafeERC20.sol"; -import "zos-lib/contracts/migrations/Migratable.sol"; +import "../../zos-lib/migrations/Migratable.sol"; /** diff --git a/contracts/token/ERC20/TokenVesting.sol b/contracts/token/ERC20/TokenVesting.sol index 8b9a2c091..aaded21ee 100644 --- a/contracts/token/ERC20/TokenVesting.sol +++ b/contracts/token/ERC20/TokenVesting.sol @@ -6,7 +6,7 @@ import "./ERC20Basic.sol"; import "./SafeERC20.sol"; import "../../ownership/Ownable.sol"; import "../../math/SafeMath.sol"; -import "zos-lib/contracts/migrations/Migratable.sol"; +import "../../zos-lib/migrations/Migratable.sol"; /** diff --git a/contracts/token/ERC721/ERC721Token.sol b/contracts/token/ERC721/ERC721Token.sol index 1805f24a8..0c2802552 100644 --- a/contracts/token/ERC721/ERC721Token.sol +++ b/contracts/token/ERC721/ERC721Token.sol @@ -2,7 +2,7 @@ pragma solidity ^0.4.21; import "./ERC721.sol"; import "./ERC721BasicToken.sol"; -import "zos-lib/contracts/migrations/Migratable.sol"; +import "../../zos-lib/migrations/Migratable.sol"; /** diff --git a/contracts/zos-lib/migrations/Migratable.sol b/contracts/zos-lib/migrations/Migratable.sol new file mode 120000 index 000000000..7d53eda1a --- /dev/null +++ b/contracts/zos-lib/migrations/Migratable.sol @@ -0,0 +1 @@ +../../../node_modules/zos-lib/contracts/migrations/Migratable.sol \ No newline at end of file From ff31995104550d61b7b7cf410f795c8a5b9f1c6a Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Mon, 21 May 2018 15:58:05 -0300 Subject: [PATCH 37/54] update zos-lib to latest version --- package-lock.json | 26 ++++++++++---------------- package.json | 2 +- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index 076893ed7..1453a112b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4228,11 +4228,6 @@ "readable-stream": "^2.0.0" } }, - "fs": { - "version": "0.0.1-security", - "resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz", - "integrity": "sha1-invTcYa23d84E/I4WLV+yq9eQdQ=" - }, "fs-extra": { "version": "0.30.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz", @@ -7667,6 +7662,11 @@ "mimic-fn": "^1.0.0" } }, + "openzeppelin-solidity": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/openzeppelin-solidity/-/openzeppelin-solidity-1.9.0.tgz", + "integrity": "sha512-MGI8clDbjrfWUg90AM82O+CHOaabtE2u9HyaUhBMKfWdIaO1urRUIgXIrEuloLvFEBHb5rtcgTARb5DkhUB4KQ==" + }, "optimist": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", @@ -12247,11 +12247,6 @@ } } }, - "zeppelin-solidity": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/zeppelin-solidity/-/zeppelin-solidity-1.9.0.tgz", - "integrity": "sha512-pdyPVyjDq7cNqqLps9juDNDkKCa6hSafEm8KyzPw+gNYTiDyG1H4sYVFuBGp03iqxlGhsacrstbps5/AHTxBUg==" - }, "zos": { "version": "0.5.0", "resolved": "https://registry.npmjs.org/zos/-/zos-0.5.0.tgz", @@ -12716,14 +12711,13 @@ } }, "zos-lib": { - "version": "0.1.22", - "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-0.1.22.tgz", - "integrity": "sha512-39UEc/dxicrsu8q3gO/SpqIkwEXGjyYxnBKh8wBlgpCNFmk/OrxLVdmaKeYpljSSdOGscos1xIcsqOS/cTSZow==", + "version": "0.1.26", + "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-0.1.26.tgz", + "integrity": "sha512-7ZKAAhg10ydOvrZShTG+XRaLMy3N2KfsbmDr7ZfmySYmbRQvjid9DAmCUL89p5oyQ6L5+yqIQ0Tab6JbaSAEBA==", "requires": { - "fs": "0.0.1-security", + "openzeppelin-solidity": "~1.9.0", "truffle-contract": "^3.0.5", - "truffle-provisioner": "^0.1.0", - "zeppelin-solidity": "^1.8.0" + "truffle-provisioner": "^0.1.0" } } } diff --git a/package.json b/package.json index 8fc0d553c..5d080cfd8 100644 --- a/package.json +++ b/package.json @@ -66,6 +66,6 @@ }, "dependencies": { "dotenv": "^4.0.0", - "zos-lib": "^0.1.22" + "zos-lib": "^0.1.26" } } From 998b5f43fbb86ced10e88c865bfd05f347ef51ab Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Mon, 21 May 2018 18:46:32 -0300 Subject: [PATCH 38/54] update zos to 0.7.0 --- package-lock.json | 167 +++++++++++++++++++--------------------------- package.json | 2 +- 2 files changed, 69 insertions(+), 100 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1453a112b..868cdac34 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3549,12 +3549,20 @@ }, "dependencies": { "async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", + "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "dev": true, "requires": { - "lodash": "^4.14.0" + "lodash": "^4.17.10" + }, + "dependencies": { + "lodash": { + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", + "dev": true + } } }, "fs-extra": { @@ -10144,41 +10152,12 @@ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", "dev": true }, - "boom": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", - "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", - "dev": true, - "requires": { - "hoek": "4.x.x" - } - }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", "dev": true }, - "cryptiles": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", - "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", - "dev": true, - "requires": { - "boom": "5.x.x" - }, - "dependencies": { - "boom": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", - "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", - "dev": true, - "requires": { - "hoek": "4.x.x" - } - } - } - }, "form-data": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", @@ -10222,24 +10201,6 @@ "har-schema": "^2.0.0" } }, - "hawk": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", - "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", - "dev": true, - "requires": { - "boom": "4.x.x", - "cryptiles": "3.x.x", - "hoek": "4.x.x", - "sntp": "2.x.x" - } - }, - "hoek": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", - "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==", - "dev": true - }, "http-signature": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", @@ -10282,9 +10243,9 @@ "dev": true }, "request": { - "version": "2.86.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.86.0.tgz", - "integrity": "sha512-BQZih67o9r+Ys94tcIW4S7Uu8pthjrQVxhsZ/weOwHbDfACxvIyvnAbzFQxjy1jMtvFSzv5zf4my6cZsJBbVzw==", + "version": "2.87.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", + "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", "dev": true, "requires": { "aws-sign2": "~0.7.0", @@ -10295,7 +10256,6 @@ "forever-agent": "~0.6.1", "form-data": "~2.3.1", "har-validator": "~5.0.3", - "hawk": "~6.0.2", "http-signature": "~1.2.0", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", @@ -10310,15 +10270,6 @@ "uuid": "^3.1.0" } }, - "sntp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", - "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", - "dev": true, - "requires": { - "hoek": "4.x.x" - } - }, "tmp": { "version": "0.0.31", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", @@ -10355,16 +10306,16 @@ "dev": true }, "truffle-compile": { - "version": "3.0.10", - "resolved": "https://registry.npmjs.org/truffle-compile/-/truffle-compile-3.0.10.tgz", - "integrity": "sha512-CC/4WbNd08R8AyRQ9R4Ub1ewso7YqRENlkdKoIfidU2xFMMJ4FlacN3m0oJinBrG5nZmkJOICu68sgfq4ohkew==", + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/truffle-compile/-/truffle-compile-3.0.11.tgz", + "integrity": "sha512-hZgFJgT1HIYb0v1Ri3UDoigLHGhm+QMyAjWmZT9pLuXJEFh33P6NyusBwKJqLs913SyeEoHtahEM5I3m9Ko0yg==", "dev": true, "requires": { "async": "^2.1.4", "colors": "^1.1.2", "debug": "^3.1.0", "graphlib": "^2.1.1", - "solc": "0.4.23", + "solc": "0.4.24", "truffle-config": "^1.0.4", "truffle-contract-sources": "^0.0.1", "truffle-error": "^0.0.2", @@ -10372,12 +10323,12 @@ }, "dependencies": { "async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", + "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "dev": true, "requires": { - "lodash": "^4.14.0" + "lodash": "^4.17.10" } }, "debug": { @@ -10389,10 +10340,16 @@ "ms": "2.0.0" } }, + "lodash": { + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", + "dev": true + }, "solc": { - "version": "0.4.23", - "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.23.tgz", - "integrity": "sha512-AT7anLHY6uIRg2It6N0UlCHeZ7YeecIkUhnlirrCgCPCUevtnoN48BxvgigN/4jJTRljv5oFhAJtI6gvHzT5DQ==", + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.24.tgz", + "integrity": "sha512-2xd7Cf1HeVwrIb6Bu1cwY2/TaLRodrppCq3l7rhLimFQgmxptXhTC3+/wesVLpB09F1A2kZgvbMOgH7wvhFnBQ==", "dev": true, "requires": { "fs-extra": "^0.30.0", @@ -10854,12 +10811,12 @@ }, "dependencies": { "async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", + "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "dev": true, "requires": { - "lodash": "^4.14.0" + "lodash": "^4.17.10" } }, "bignumber.js": { @@ -10867,6 +10824,12 @@ "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git", "dev": true }, + "lodash": { + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", + "dev": true + }, "node-dir": { "version": "0.1.17", "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", @@ -10971,13 +10934,19 @@ }, "dependencies": { "async": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz", - "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==", + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", + "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", "dev": true, "requires": { - "lodash": "^4.14.0" + "lodash": "^4.17.10" } + }, + "lodash": { + "version": "4.17.10", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", + "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", + "dev": true } } }, @@ -10988,16 +10957,16 @@ "dev": true }, "truffle-workflow-compile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/truffle-workflow-compile/-/truffle-workflow-compile-1.0.3.tgz", - "integrity": "sha512-Vqjm66yBDX5BaVV5SvUs1L1tpXHaOIvt9OSvflrT5RekONAx6YE1HmAvEYIFR68PR4b2tXvc4P41HNGh/Y4/qQ==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/truffle-workflow-compile/-/truffle-workflow-compile-1.0.4.tgz", + "integrity": "sha512-dPIoeAvKBMMHdf6IVJPslFj1eJeciGwujLd0XKtxpFHJRSMdIFrplkDiR23Cey/QQcSDiPO8VuYdpE/xP4FVWg==", "dev": true, "requires": { "async": "^1.4.2", "lodash": "^4.5.1", "mkdirp": "^0.5.1", "truffle-artifactor": "^3.0.5", - "truffle-compile": "^3.0.10", + "truffle-compile": "^3.0.11", "truffle-config": "^1.0.4", "truffle-expect": "^0.0.3", "truffle-resolver": "^4.0.3" @@ -12248,9 +12217,9 @@ } }, "zos": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/zos/-/zos-0.5.0.tgz", - "integrity": "sha512-oOKq4j8ccZso1N48WNqTOUAEqQBlrpgzDGVR19y1rslrTtgxNI0ehG26tuoiRReWrL5cC0obLUusKfZ9aTCkHA==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/zos/-/zos-0.7.0.tgz", + "integrity": "sha512-mrKZeFI6fvPW05Ar6jlMmiWdvTJH7c4Gj8EaCC1/9Tc0AaWxB2degGGMljwGfIfYDZVtDX1eQYqtiXU7WoLu3g==", "dev": true, "requires": { "chalk": "^2.4.1", @@ -12265,7 +12234,7 @@ "truffle-contract": "^3.0.5", "truffle-core": "^4.1.8", "truffle-workflow-compile": "^1.0.3", - "zos-lib": "^0.1.22" + "zos-lib": "^0.1.25" }, "dependencies": { "ansi-regex": { @@ -12317,9 +12286,9 @@ } }, "colors": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.2.5.tgz", - "integrity": "sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz", + "integrity": "sha512-EDpX3a7wHMWFA7PUHWPHNWqOxIIRSJetuwl0AS5Oi/5FMV8kWm69RTlgm00GKjBO1xFHMtBbL49yRtMMdticBw==", "dev": true }, "commander": { @@ -12600,9 +12569,9 @@ } }, "truffle-core": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/truffle-core/-/truffle-core-4.1.8.tgz", - "integrity": "sha512-DhZ1vPoxOPNpX9pXh4i6GM8KHrqIYyyb47JQ7rtMoN1oCjdZqm6M846KbhCjGbb4AMC7I873M5PX0R+XYNkpjA==", + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/truffle-core/-/truffle-core-4.1.9.tgz", + "integrity": "sha512-wFF6EDVF5QUMC8Y06YXAPjKjWHtgp1TcNawUY0T+Dtmw8FJLsPKdmUj4v9UevrRCpBCYbbI/Kq0461U2OcH/zQ==", "dev": true, "requires": { "async": "^1.4.2", @@ -12632,7 +12601,7 @@ "temp": "^0.8.3", "truffle-artifactor": "^3.0.5", "truffle-box": "^1.0.5", - "truffle-compile": "^3.0.10", + "truffle-compile": "^3.0.11", "truffle-config": "^1.0.4", "truffle-contract": "^3.0.5", "truffle-contract-sources": "^0.0.1", @@ -12648,7 +12617,7 @@ "truffle-require": "^1.0.5", "truffle-resolver": "^4.0.3", "truffle-solidity-utils": "^1.1.1", - "truffle-workflow-compile": "^1.0.3", + "truffle-workflow-compile": "^1.0.4", "web3": "^0.20.1", "yargs": "^8.0.2" } diff --git a/package.json b/package.json index 5d080cfd8..04730185a 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "solium": "^1.1.6", "truffle": "^4.1.5", "truffle-hdwallet-provider": "0.0.3", - "zos": "^0.5.0" + "zos": "^0.7.0" }, "dependencies": { "dotenv": "^4.0.0", From b732b6417e39e5aa0781e1baaa9e7aa97424c886 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 22 May 2018 14:57:33 -0300 Subject: [PATCH 39/54] bump to 1.9.0 --- contracts/access/SignatureBouncer.sol | 2 +- contracts/lifecycle/Pausable.sol | 2 +- contracts/mocks/BouncerMock.sol | 2 +- contracts/ownership/Ownable.sol | 2 +- contracts/ownership/rbac/RBACWithAdmin.sol | 2 +- contracts/payment/SplitPayment.sol | 2 +- contracts/token/ERC20/DetailedERC20.sol | 2 +- contracts/token/ERC20/DetailedMintableToken.sol | 2 +- contracts/token/ERC20/DetailedPremintedToken.sol | 2 +- contracts/token/ERC20/MintableToken.sol | 2 +- contracts/token/ERC20/PausableToken.sol | 2 +- contracts/token/ERC20/TokenTimelock.sol | 2 +- contracts/token/ERC20/TokenVesting.sol | 2 +- contracts/token/ERC721/ERC721Token.sol | 2 +- contracts/token/ERC721/MintableERC721Token.sol | 2 +- zos.json | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/contracts/access/SignatureBouncer.sol b/contracts/access/SignatureBouncer.sol index 7d8f98d22..44e18e356 100644 --- a/contracts/access/SignatureBouncer.sol +++ b/contracts/access/SignatureBouncer.sol @@ -29,7 +29,7 @@ contract SignatureBouncer is Migratable, Ownable, RBAC { string public constant ROLE_BOUNCER = "bouncer"; function initialize(address _sender) - isInitializer("SignatureBouncer", "1.9.0-beta") + isInitializer("SignatureBouncer", "1.9.0") public { Ownable.initialize(_sender); diff --git a/contracts/lifecycle/Pausable.sol b/contracts/lifecycle/Pausable.sol index 921bd0d83..f24dfcb6b 100644 --- a/contracts/lifecycle/Pausable.sol +++ b/contracts/lifecycle/Pausable.sol @@ -15,7 +15,7 @@ contract Pausable is Migratable, Ownable { bool public paused = false; - function initialize(address _sender) isInitializer("Pausable", "1.9.0-beta") public { + function initialize(address _sender) isInitializer("Pausable", "1.9.0") public { Ownable.initialize(_sender); } diff --git a/contracts/mocks/BouncerMock.sol b/contracts/mocks/BouncerMock.sol index 3bc826583..4fddd99ae 100644 --- a/contracts/mocks/BouncerMock.sol +++ b/contracts/mocks/BouncerMock.sol @@ -5,7 +5,7 @@ import "../access/SignatureBouncer.sol"; contract SignatureBouncerMock is SignatureBouncer { function initialize(address _sender) - isInitializer("SignatureBouncerMock", "1.9.0-beta") + isInitializer("SignatureBouncerMock", "1.9.0") public { SignatureBouncer.initialize(_sender); diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol index 64d6ea5e7..4dd804ed7 100644 --- a/contracts/ownership/Ownable.sol +++ b/contracts/ownership/Ownable.sol @@ -18,7 +18,7 @@ contract Ownable is Migratable { * @dev The Ownable constructor sets the original `owner` of the contract to the sender * account. */ - function initialize(address _sender) public isInitializer("Ownable", "1.9.0-beta") { + function initialize(address _sender) public isInitializer("Ownable", "1.9.0") { owner = _sender; } diff --git a/contracts/ownership/rbac/RBACWithAdmin.sol b/contracts/ownership/rbac/RBACWithAdmin.sol index 1512b79b2..2ef1d2c7a 100644 --- a/contracts/ownership/rbac/RBACWithAdmin.sol +++ b/contracts/ownership/rbac/RBACWithAdmin.sol @@ -30,7 +30,7 @@ contract RBACWithAdmin is RBAC, Migratable { * @dev constructor. Sets initialAdmin as admin. */ function initialize(address initialAdmin) - isInitializer("RBACWithAdmin", "1.9.0-beta") + isInitializer("RBACWithAdmin", "1.9.0") public { addRole(initialAdmin, ROLE_ADMIN); diff --git a/contracts/payment/SplitPayment.sol b/contracts/payment/SplitPayment.sol index bf8eb7280..b15be74d6 100644 --- a/contracts/payment/SplitPayment.sol +++ b/contracts/payment/SplitPayment.sol @@ -23,7 +23,7 @@ contract SplitPayment is Migratable { * @dev Constructor */ function initialize(address[] _payees, uint256[] _shares) - isInitializer("SplitPayment", "1.9.0-beta") + isInitializer("SplitPayment", "1.9.0") public payable { diff --git a/contracts/token/ERC20/DetailedERC20.sol b/contracts/token/ERC20/DetailedERC20.sol index a4077f635..921f23c8c 100644 --- a/contracts/token/ERC20/DetailedERC20.sol +++ b/contracts/token/ERC20/DetailedERC20.sol @@ -9,7 +9,7 @@ contract DetailedERC20 is Migratable, ERC20 { string public symbol; uint8 public decimals; - function initialize(string _name, string _symbol, uint8 _decimals) public isInitializer("DetailedERC20", "1.9.0-beta") { + function initialize(string _name, string _symbol, uint8 _decimals) public isInitializer("DetailedERC20", "1.9.0") { name = _name; symbol = _symbol; decimals = _decimals; diff --git a/contracts/token/ERC20/DetailedMintableToken.sol b/contracts/token/ERC20/DetailedMintableToken.sol index e9fbbfd43..7ad41582c 100644 --- a/contracts/token/ERC20/DetailedMintableToken.sol +++ b/contracts/token/ERC20/DetailedMintableToken.sol @@ -12,7 +12,7 @@ contract DetailedMintableToken is Migratable, DetailedERC20, MintableToken { string _symbol, uint8 _decimals ) - isInitializer("DetailedMintableToken", "1.9.0-beta") + isInitializer("DetailedMintableToken", "1.9.0") public { DetailedERC20.initialize(_name, _symbol, _decimals); diff --git a/contracts/token/ERC20/DetailedPremintedToken.sol b/contracts/token/ERC20/DetailedPremintedToken.sol index 10dbc6148..a27804fac 100644 --- a/contracts/token/ERC20/DetailedPremintedToken.sol +++ b/contracts/token/ERC20/DetailedPremintedToken.sol @@ -13,7 +13,7 @@ contract DetailedPremintedToken is Migratable, DetailedERC20, StandardToken { uint8 _decimals, uint256 _initialBalance ) - isInitializer("DetailedPremintedToken", "1.9.0-beta") + isInitializer("DetailedPremintedToken", "1.9.0") public { DetailedERC20.initialize(_name, _symbol, _decimals); diff --git a/contracts/token/ERC20/MintableToken.sol b/contracts/token/ERC20/MintableToken.sol index 01fa1409e..84cb75817 100644 --- a/contracts/token/ERC20/MintableToken.sol +++ b/contracts/token/ERC20/MintableToken.sol @@ -23,7 +23,7 @@ contract MintableToken is Migratable, Ownable, StandardToken { _; } - function initialize(address _sender) isInitializer("MintableToken", "1.9.0-beta") public { + function initialize(address _sender) isInitializer("MintableToken", "1.9.0") public { Ownable.initialize(_sender); } diff --git a/contracts/token/ERC20/PausableToken.sol b/contracts/token/ERC20/PausableToken.sol index a22370885..5822d2776 100644 --- a/contracts/token/ERC20/PausableToken.sol +++ b/contracts/token/ERC20/PausableToken.sol @@ -10,7 +10,7 @@ import "../../lifecycle/Pausable.sol"; **/ contract PausableToken is Migratable, StandardToken, Pausable { - function initialize(address _sender) isInitializer("PausableToken", "1.9.0-beta") public { + function initialize(address _sender) isInitializer("PausableToken", "1.9.0") public { Pausable.initialize(_sender); } diff --git a/contracts/token/ERC20/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol index a9ba1e1c8..8c3f65d08 100644 --- a/contracts/token/ERC20/TokenTimelock.sol +++ b/contracts/token/ERC20/TokenTimelock.sol @@ -27,7 +27,7 @@ contract TokenTimelock is Migratable { address _beneficiary, uint256 _releaseTime ) - isInitializer("TokenTimelock", "1.9.0-beta") + isInitializer("TokenTimelock", "1.9.0") public { // solium-disable-next-line security/no-block-members diff --git a/contracts/token/ERC20/TokenVesting.sol b/contracts/token/ERC20/TokenVesting.sol index aaded21ee..f2105ec1a 100644 --- a/contracts/token/ERC20/TokenVesting.sol +++ b/contracts/token/ERC20/TokenVesting.sol @@ -52,7 +52,7 @@ contract TokenVesting is Migratable, Ownable { bool _revocable ) public - isInitializer("TokenVesting", "1.9.0-beta") + isInitializer("TokenVesting", "1.9.0") { Ownable.initialize(_sender); diff --git a/contracts/token/ERC721/ERC721Token.sol b/contracts/token/ERC721/ERC721Token.sol index 0c2802552..324a82d3a 100644 --- a/contracts/token/ERC721/ERC721Token.sol +++ b/contracts/token/ERC721/ERC721Token.sol @@ -36,7 +36,7 @@ contract ERC721Token is Migratable, ERC721, ERC721BasicToken { /** * @dev Constructor function */ - function initialize(string _name, string _symbol) public isInitializer("ERC721Token", "1.9.0-beta") { + function initialize(string _name, string _symbol) public isInitializer("ERC721Token", "1.9.0") { name_ = _name; symbol_ = _symbol; } diff --git a/contracts/token/ERC721/MintableERC721Token.sol b/contracts/token/ERC721/MintableERC721Token.sol index 9d6a14ed8..00f055f26 100644 --- a/contracts/token/ERC721/MintableERC721Token.sol +++ b/contracts/token/ERC721/MintableERC721Token.sol @@ -8,7 +8,7 @@ import "../../ownership/Ownable.sol"; * @title Mintable ERC721 Token */ contract MintableERC721Token is Migratable, Ownable, ERC721Token { - function initialize(address _sender, string _name, string _symbol) isInitializer("MintableERC721Token", "1.9.0-beta") public { + function initialize(address _sender, string _name, string _symbol) isInitializer("MintableERC721Token", "1.9.0") public { Ownable.initialize(_sender); ERC721Token.initialize(_name, _symbol); } diff --git a/zos.json b/zos.json index 389b8b6ff..7fc81ada1 100644 --- a/zos.json +++ b/zos.json @@ -1,6 +1,6 @@ { "name": "openzeppelin-zos", - "version": "1.9.0-beta", + "version": "1.9.0", "contracts": { "DetailedMintableToken": "DetailedMintableToken", "DetailedPremintedToken": "DetailedPremintedToken", From 31ec824aefbe51dbc121ecb81371ca95d849ec37 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 22 May 2018 16:07:27 -0300 Subject: [PATCH 40/54] Revert "add workaround because truffle doesn't support transitive dependencies" This reverts commit 48a7cd4e60d8e17f907bf305922df7c400927dbd. --- contracts/access/SignatureBouncer.sol | 2 -- contracts/ownership/Ownable.sol | 2 +- contracts/ownership/rbac/RBACWithAdmin.sol | 3 +-- contracts/payment/SplitPayment.sol | 2 +- contracts/token/ERC20/DetailedERC20.sol | 2 +- contracts/token/ERC20/DetailedMintableToken.sol | 2 +- contracts/token/ERC20/DetailedPremintedToken.sol | 2 +- contracts/token/ERC20/MintableToken.sol | 2 +- contracts/token/ERC20/TokenTimelock.sol | 2 +- contracts/token/ERC20/TokenVesting.sol | 2 +- contracts/token/ERC721/ERC721Token.sol | 2 +- contracts/zos-lib/migrations/Migratable.sol | 1 - 12 files changed, 10 insertions(+), 14 deletions(-) delete mode 120000 contracts/zos-lib/migrations/Migratable.sol diff --git a/contracts/access/SignatureBouncer.sol b/contracts/access/SignatureBouncer.sol index 44e18e356..bfaa06f83 100644 --- a/contracts/access/SignatureBouncer.sol +++ b/contracts/access/SignatureBouncer.sol @@ -1,11 +1,9 @@ pragma solidity ^0.4.18; -import "../zos-lib/migrations/Migratable.sol"; import "../ownership/Ownable.sol"; import "../ownership/rbac/RBAC.sol"; import "../ECRecovery.sol"; - /** * @title SignatureBouncer * @author PhABC and Shrugs diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol index 4dd804ed7..c2de6ff95 100644 --- a/contracts/ownership/Ownable.sol +++ b/contracts/ownership/Ownable.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.21; -import "../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; /** diff --git a/contracts/ownership/rbac/RBACWithAdmin.sol b/contracts/ownership/rbac/RBACWithAdmin.sol index 2ef1d2c7a..eeac34ed6 100644 --- a/contracts/ownership/rbac/RBACWithAdmin.sol +++ b/contracts/ownership/rbac/RBACWithAdmin.sol @@ -1,8 +1,7 @@ pragma solidity ^0.4.21; import "./RBAC.sol"; -import "../../zos-lib/migrations/Migratable.sol"; - +import 'zos-lib/contracts/migrations/Migratable.sol'; /** * @title RBACWithAdmin diff --git a/contracts/payment/SplitPayment.sol b/contracts/payment/SplitPayment.sol index b15be74d6..9415d42d9 100644 --- a/contracts/payment/SplitPayment.sol +++ b/contracts/payment/SplitPayment.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.21; import "../math/SafeMath.sol"; -import "../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; /** diff --git a/contracts/token/ERC20/DetailedERC20.sol b/contracts/token/ERC20/DetailedERC20.sol index 921f23c8c..f648bdb83 100644 --- a/contracts/token/ERC20/DetailedERC20.sol +++ b/contracts/token/ERC20/DetailedERC20.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.21; import "./ERC20.sol"; -import "../../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; contract DetailedERC20 is Migratable, ERC20 { diff --git a/contracts/token/ERC20/DetailedMintableToken.sol b/contracts/token/ERC20/DetailedMintableToken.sol index 7ad41582c..3f1ba77ca 100644 --- a/contracts/token/ERC20/DetailedMintableToken.sol +++ b/contracts/token/ERC20/DetailedMintableToken.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.21; -import "../../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; import "./DetailedERC20.sol"; import "./MintableToken.sol"; diff --git a/contracts/token/ERC20/DetailedPremintedToken.sol b/contracts/token/ERC20/DetailedPremintedToken.sol index a27804fac..2acc32917 100644 --- a/contracts/token/ERC20/DetailedPremintedToken.sol +++ b/contracts/token/ERC20/DetailedPremintedToken.sol @@ -1,6 +1,6 @@ pragma solidity ^0.4.21; -import "../../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; import "./DetailedERC20.sol"; import "./MintableToken.sol"; diff --git a/contracts/token/ERC20/MintableToken.sol b/contracts/token/ERC20/MintableToken.sol index 84cb75817..58d846d73 100644 --- a/contracts/token/ERC20/MintableToken.sol +++ b/contracts/token/ERC20/MintableToken.sol @@ -2,7 +2,7 @@ pragma solidity ^0.4.21; import "./StandardToken.sol"; import "../../ownership/Ownable.sol"; -import "../../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; /** diff --git a/contracts/token/ERC20/TokenTimelock.sol b/contracts/token/ERC20/TokenTimelock.sol index 8c3f65d08..a790e2d10 100644 --- a/contracts/token/ERC20/TokenTimelock.sol +++ b/contracts/token/ERC20/TokenTimelock.sol @@ -1,7 +1,7 @@ pragma solidity ^0.4.21; import "./SafeERC20.sol"; -import "../../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; /** diff --git a/contracts/token/ERC20/TokenVesting.sol b/contracts/token/ERC20/TokenVesting.sol index f2105ec1a..c1c08bfd8 100644 --- a/contracts/token/ERC20/TokenVesting.sol +++ b/contracts/token/ERC20/TokenVesting.sol @@ -6,7 +6,7 @@ import "./ERC20Basic.sol"; import "./SafeERC20.sol"; import "../../ownership/Ownable.sol"; import "../../math/SafeMath.sol"; -import "../../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; /** diff --git a/contracts/token/ERC721/ERC721Token.sol b/contracts/token/ERC721/ERC721Token.sol index 324a82d3a..fa704bca2 100644 --- a/contracts/token/ERC721/ERC721Token.sol +++ b/contracts/token/ERC721/ERC721Token.sol @@ -2,7 +2,7 @@ pragma solidity ^0.4.21; import "./ERC721.sol"; import "./ERC721BasicToken.sol"; -import "../../zos-lib/migrations/Migratable.sol"; +import "zos-lib/contracts/migrations/Migratable.sol"; /** diff --git a/contracts/zos-lib/migrations/Migratable.sol b/contracts/zos-lib/migrations/Migratable.sol deleted file mode 120000 index 7d53eda1a..000000000 --- a/contracts/zos-lib/migrations/Migratable.sol +++ /dev/null @@ -1 +0,0 @@ -../../../node_modules/zos-lib/contracts/migrations/Migratable.sol \ No newline at end of file From 534ff92ba5aef76e7af4a098a8d7ce2ce4779e67 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 22 May 2018 16:09:41 -0300 Subject: [PATCH 41/54] add zos-lib as peerdependency --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 04730185a..deb82cfe9 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,9 @@ "zos": "^0.7.0" }, "dependencies": { - "dotenv": "^4.0.0", + "zos-lib": "^0.1.26" + }, + "peerDependencies": { "zos-lib": "^0.1.26" } } From 8868c0b6d3ee0d11bd301558d6b2c3ef9ce8f4c6 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 22 May 2018 16:27:45 -0300 Subject: [PATCH 42/54] update to zos-cli 0.8.0 --- package-lock.json | 22 +++++++++++++++++----- package.json | 2 +- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 868cdac34..f47dc1846 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2530,7 +2530,8 @@ "dotenv": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz", - "integrity": "sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=" + "integrity": "sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=", + "dev": true }, "drbg.js": { "version": "1.0.1", @@ -12217,9 +12218,9 @@ } }, "zos": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/zos/-/zos-0.7.0.tgz", - "integrity": "sha512-mrKZeFI6fvPW05Ar6jlMmiWdvTJH7c4Gj8EaCC1/9Tc0AaWxB2degGGMljwGfIfYDZVtDX1eQYqtiXU7WoLu3g==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/zos/-/zos-0.8.0.tgz", + "integrity": "sha512-dBBZX2i+Vrm+3n60UTPO6FAYLL39mfeg1YuMcK2BwcqQ36ItG6AERZd3mmNUwLwg/gV/3o2gJhPhTS4LNvw+9w==", "dev": true, "requires": { "chalk": "^2.4.1", @@ -12234,7 +12235,7 @@ "truffle-contract": "^3.0.5", "truffle-core": "^4.1.8", "truffle-workflow-compile": "^1.0.3", - "zos-lib": "^0.1.25" + "zos-lib": "^0.1.27" }, "dependencies": { "ansi-regex": { @@ -12676,6 +12677,17 @@ "requires": { "camelcase": "^4.1.0" } + }, + "zos-lib": { + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/zos-lib/-/zos-lib-0.1.27.tgz", + "integrity": "sha512-q4ZMrJ2KPaOqqD7hBmQIsWv6isYYjeuS6KGHJxRwbQNRNOoMgsmgx0OkfbEMORYzSWO5enetfXaISYqYfVQXwQ==", + "dev": true, + "requires": { + "openzeppelin-solidity": "~1.9.0", + "truffle-contract": "^3.0.5", + "truffle-provisioner": "^0.1.0" + } } } }, diff --git a/package.json b/package.json index deb82cfe9..38c562deb 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "solium": "^1.1.6", "truffle": "^4.1.5", "truffle-hdwallet-provider": "0.0.3", - "zos": "^0.7.0" + "zos": "^0.8.0" }, "dependencies": { "zos-lib": "^0.1.26" From 9b55e96fa0969fcf5476646260264d717b10c10c Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 22 May 2018 16:46:08 -0300 Subject: [PATCH 43/54] add partial zos.livenet.json --- zos.livenet.json | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 zos.livenet.json diff --git a/zos.livenet.json b/zos.livenet.json new file mode 100644 index 000000000..4f3f15c66 --- /dev/null +++ b/zos.livenet.json @@ -0,0 +1,29 @@ +{ + "contracts": { + "DetailedPremintedToken": { + "address": "0x62a17f4f2140537fc6bc5fe74724569fff257e05", + "bytecodeHash": "e1f23b3c8e9b6d44a4decf1af92fc64ef78ca7a63b88a9ff005ea9e03bb29c1b" + }, + "TokenTimelock": { + "address": "0x659515c7d0bc5b2868c6a0482443bc32472005c9", + "bytecodeHash": "45c35a494bc634318b455de0124b610352324daa7aaccc9ed8ecffb8ca57f3e6" + }, + "TokenVesting": { + "address": "0x66a1a32c100768461f7725ab0e6b716a76bd805a", + "bytecodeHash": "4e68575e28a0747ef08e17ea18f1ae0fb25f85ca4f49c4bc524e348e49cc5236" + }, + "DetailedMintableToken": { + "address": "0xe631f5353e12e0aeb1c1f60541a346e95d52f731", + "bytecodeHash": "5baf52008954818f59f903fbdcae7c437a4d473e98a10053847598fe29fb37cc" + } + }, + "lib": true, + "frozen": false, + "package": { + "address": "0x3bd95b5a003481b801010bcde4f7e0a32a925deb" + }, + "provider": { + "address": "0x8500768509c476fc32477e5510aea608c42dd3a6" + }, + "version": "1.9.0" +} \ No newline at end of file From d1912475052e16acc9cbeea472dc2bfffa520672 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 22 May 2018 17:29:47 -0300 Subject: [PATCH 44/54] add full zos.livenet.json --- zos.livenet.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/zos.livenet.json b/zos.livenet.json index 4f3f15c66..a6fcd01dc 100644 --- a/zos.livenet.json +++ b/zos.livenet.json @@ -15,10 +15,18 @@ "DetailedMintableToken": { "address": "0xe631f5353e12e0aeb1c1f60541a346e95d52f731", "bytecodeHash": "5baf52008954818f59f903fbdcae7c437a4d473e98a10053847598fe29fb37cc" + }, + "SplitPayment": { + "address": "0x957064bf47d54f0a90d400113bd4c76284be0d5e", + "bytecodeHash": "f6a770b74aa8113ec77c6a64997afd3e3b87e91ca4a4070b42c0e7a5d3a17eb3" + }, + "MintableERC721Token": { + "address": "0x591009a93bfc0014d1c9dc51b490ad06b9fa1c2f", + "bytecodeHash": "07df50333453baa4da4999b352a107d33ad5f9adf4f7041bf600083eadeea1df" } }, "lib": true, - "frozen": false, + "frozen": true, "package": { "address": "0x3bd95b5a003481b801010bcde4f7e0a32a925deb" }, From 5ac618681ad545530cc315411f8eb910ace0e8ab Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 22 May 2018 18:30:55 -0300 Subject: [PATCH 45/54] add zos.rinkeby.json --- zos.rinkeby.json | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 zos.rinkeby.json diff --git a/zos.rinkeby.json b/zos.rinkeby.json new file mode 100644 index 000000000..dc027c0ba --- /dev/null +++ b/zos.rinkeby.json @@ -0,0 +1,37 @@ +{ + "contracts": { + "TokenTimelock": { + "address": "0x6898b00b6ccce11c3b5b821611d5aa365fd41303", + "bytecodeHash": "45c35a494bc634318b455de0124b610352324daa7aaccc9ed8ecffb8ca57f3e6" + }, + "DetailedPremintedToken": { + "address": "0x94aa60ee4b5b52b057f9204977e75d7fb87097d6", + "bytecodeHash": "e1f23b3c8e9b6d44a4decf1af92fc64ef78ca7a63b88a9ff005ea9e03bb29c1b" + }, + "DetailedMintableToken": { + "address": "0xdb591a8468eceffb27b074367ff8d0a485b43269", + "bytecodeHash": "5baf52008954818f59f903fbdcae7c437a4d473e98a10053847598fe29fb37cc" + }, + "SplitPayment": { + "address": "0xb7cc3420719f2bbfe44e1b3499668cd1ece65abb", + "bytecodeHash": "f6a770b74aa8113ec77c6a64997afd3e3b87e91ca4a4070b42c0e7a5d3a17eb3" + }, + "TokenVesting": { + "address": "0x44240268e4cb65d88ae3c2b68ab6451f367d0645", + "bytecodeHash": "4e68575e28a0747ef08e17ea18f1ae0fb25f85ca4f49c4bc524e348e49cc5236" + }, + "MintableERC721Token": { + "address": "0xb6f3c2cba255ee9bebaad6e04ea11dafbf7db397", + "bytecodeHash": "07df50333453baa4da4999b352a107d33ad5f9adf4f7041bf600083eadeea1df" + } + }, + "lib": true, + "frozen": false, + "package": { + "address": "0x92a9369a08b30a67f4faf76cad03cf1e6beef5bf" + }, + "provider": { + "address": "0x35de7ba3457f9ec93b5b9f05b47c2515ea6255f3" + }, + "version": "1.9.0" +} \ No newline at end of file From d4c455c180878d3524116ecb764a5ed533ddc6fb Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 22 May 2018 18:43:16 -0300 Subject: [PATCH 46/54] rename livenet to mainnet --- zos.livenet.json => zos.mainnet.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename zos.livenet.json => zos.mainnet.json (100%) diff --git a/zos.livenet.json b/zos.mainnet.json similarity index 100% rename from zos.livenet.json rename to zos.mainnet.json From 923bbb44a8882dbf8ffb78b8c9217e73f90fef1d Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 22 May 2018 18:43:38 -0300 Subject: [PATCH 47/54] add zos files to npm package --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 38c562deb..e9685936d 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,9 @@ "files": [ "contracts", "build", - "test" + "test", + "zos.json", + "zos.*.json" ], "scripts": { "prepack": "truffle compile", From dca62efba93aa9fc9e7278f2bb37e0941f05cef0 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 22 May 2018 19:11:41 -0300 Subject: [PATCH 48/54] add correct zos.ropsten.json --- zos.ropsten.json | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/zos.ropsten.json b/zos.ropsten.json index 6eab55c33..98b12d56d 100644 --- a/zos.ropsten.json +++ b/zos.ropsten.json @@ -3,16 +3,40 @@ "address": "0x57ed03ed45a70ef67479dec896ed782a72e40e8c" }, "contracts": { - "DetailedMintableToken": "DetailedMintableToken", - "DetailedPremintedToken": "DetailedPremintedToken", - "MintableERC721Token": "MintableERC721Token", - "TokenTimelock": "TokenTimelock", - "TokenVesting": "TokenVesting" + "DetailedPremintedToken": { + "address": "0x7c7876e4d7d77fdedf79c7f4d4fc523192d2c0ec", + "bytecodeHash": "e1f23b3c8e9b6d44a4decf1af92fc64ef78ca7a63b88a9ff005ea9e03bb29c1b" + }, + "TokenVesting": { + "address": "0xaaf5aff7cfdc8877caa6a9d4b6bc2491f3ed330a", + "bytecodeHash": "4e68575e28a0747ef08e17ea18f1ae0fb25f85ca4f49c4bc524e348e49cc5236" + }, + "SplitPayment": { + "address": "0x8dcacd22087a6f081af47e7a8bb8a66f2711d276", + "bytecodeHash": "f6a770b74aa8113ec77c6a64997afd3e3b87e91ca4a4070b42c0e7a5d3a17eb3" + }, + "TokenTimelock": { + "address": "0x9b58751141a3a419f40fa29d460c3cbc92258403", + "bytecodeHash": "45c35a494bc634318b455de0124b610352324daa7aaccc9ed8ecffb8ca57f3e6" + }, + "MintableERC721Token": { + "address": "0x9f3fbf875c425dafba9af3ab742c4f8d7838a971", + "bytecodeHash": "07df50333453baa4da4999b352a107d33ad5f9adf4f7041bf600083eadeea1df" + }, + "DetailedMintableToken": { + "address": "0x3a8c444373684526a5d2510a95cbb4e4fc91b680", + "bytecodeHash": "5baf52008954818f59f903fbdcae7c437a4d473e98a10053847598fe29fb37cc" + } }, "kernel": { "address": "0xdf38ad6335299dcaab4e663b40d466140702285d" }, "provider": { - "address": "0xA739d10Cc20211B973dEE09DB8F0D75736E2D817" - } + "address": "0x4e7134170fa8548134f942ea74679dce05c1d13e" + }, + "package": { + "address": "0x22137ecc8483e4c2a86969d867c54babf5a6a184" + }, + "frozen": true, + "version": "1.9.0" } \ No newline at end of file From 8b19e3c215cd340035d3b9c1814fb12662f48e00 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 22 May 2018 19:21:52 -0300 Subject: [PATCH 49/54] fix linter errors --- contracts/access/SignatureBouncer.sol | 1 + contracts/ownership/rbac/RBACWithAdmin.sol | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contracts/access/SignatureBouncer.sol b/contracts/access/SignatureBouncer.sol index bfaa06f83..49badf963 100644 --- a/contracts/access/SignatureBouncer.sol +++ b/contracts/access/SignatureBouncer.sol @@ -4,6 +4,7 @@ import "../ownership/Ownable.sol"; import "../ownership/rbac/RBAC.sol"; import "../ECRecovery.sol"; + /** * @title SignatureBouncer * @author PhABC and Shrugs diff --git a/contracts/ownership/rbac/RBACWithAdmin.sol b/contracts/ownership/rbac/RBACWithAdmin.sol index eeac34ed6..2e1940674 100644 --- a/contracts/ownership/rbac/RBACWithAdmin.sol +++ b/contracts/ownership/rbac/RBACWithAdmin.sol @@ -1,7 +1,8 @@ pragma solidity ^0.4.21; import "./RBAC.sol"; -import 'zos-lib/contracts/migrations/Migratable.sol'; +import "zos-lib/contracts/migrations/Migratable.sol"; + /** * @title RBACWithAdmin From f35eeed0eb4f8081c20978d848e1f1fc47cc9cfd Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 22 May 2018 19:28:38 -0300 Subject: [PATCH 50/54] freeze rinkeby version --- zos.rinkeby.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zos.rinkeby.json b/zos.rinkeby.json index dc027c0ba..a0e7c7eca 100644 --- a/zos.rinkeby.json +++ b/zos.rinkeby.json @@ -26,7 +26,7 @@ } }, "lib": true, - "frozen": false, + "frozen": true, "package": { "address": "0x92a9369a08b30a67f4faf76cad03cf1e6beef5bf" }, From 59afaca753cc3a7a664da426fad641fcb6618d80 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 22 May 2018 19:46:42 -0300 Subject: [PATCH 51/54] remove distribution and kernel from zos.ropsten.json --- zos.ropsten.json | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/zos.ropsten.json b/zos.ropsten.json index 98b12d56d..8f1cc41b3 100644 --- a/zos.ropsten.json +++ b/zos.ropsten.json @@ -1,7 +1,4 @@ { - "distribution": { - "address": "0x57ed03ed45a70ef67479dec896ed782a72e40e8c" - }, "contracts": { "DetailedPremintedToken": { "address": "0x7c7876e4d7d77fdedf79c7f4d4fc523192d2c0ec", @@ -28,15 +25,12 @@ "bytecodeHash": "5baf52008954818f59f903fbdcae7c437a4d473e98a10053847598fe29fb37cc" } }, - "kernel": { - "address": "0xdf38ad6335299dcaab4e663b40d466140702285d" + "package": { + "address": "0x22137ecc8483e4c2a86969d867c54babf5a6a184" }, "provider": { "address": "0x4e7134170fa8548134f942ea74679dce05c1d13e" }, - "package": { - "address": "0x22137ecc8483e4c2a86969d867c54babf5a6a184" - }, "frozen": true, "version": "1.9.0" -} \ No newline at end of file +} From 3af2f8ad7c8ee74fbd72532f24af33efce0e22ac Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 22 May 2018 21:01:40 -0300 Subject: [PATCH 52/54] 1.9.1 --- ethpm.json | 2 +- package-lock.json | 2 +- package.json | 2 +- zos.json | 4 ++-- zos.mainnet.json | 4 ++-- zos.rinkeby.json | 4 ++-- zos.ropsten.json | 5 +++-- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ethpm.json b/ethpm.json index 807438c3a..b44da6ca8 100644 --- a/ethpm.json +++ b/ethpm.json @@ -1,6 +1,6 @@ { "package_name": "zeppelin", - "version": "1.9.0", + "version": "1.9.1", "description": "Secure Smart Contract library for Solidity", "authors": [ "Manuel Araoz " diff --git a/package-lock.json b/package-lock.json index f47dc1846..1a81b0f6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "openzeppelin-zos", - "version": "1.9.0", + "version": "1.9.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e9685936d..4d595465a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openzeppelin-zos", - "version": "1.9.0", + "version": "1.9.1", "description": "Secure Smart Contract library for Solidity", "files": [ "contracts", diff --git a/zos.json b/zos.json index 7fc81ada1..b357baaf2 100644 --- a/zos.json +++ b/zos.json @@ -1,6 +1,6 @@ { "name": "openzeppelin-zos", - "version": "1.9.0", + "version": "1.9.1", "contracts": { "DetailedMintableToken": "DetailedMintableToken", "DetailedPremintedToken": "DetailedPremintedToken", @@ -10,4 +10,4 @@ "SplitPayment": "SplitPayment" }, "lib": true -} \ No newline at end of file +} diff --git a/zos.mainnet.json b/zos.mainnet.json index a6fcd01dc..9f73e2432 100644 --- a/zos.mainnet.json +++ b/zos.mainnet.json @@ -33,5 +33,5 @@ "provider": { "address": "0x8500768509c476fc32477e5510aea608c42dd3a6" }, - "version": "1.9.0" -} \ No newline at end of file + "version": "1.9.1" +} diff --git a/zos.rinkeby.json b/zos.rinkeby.json index a0e7c7eca..fd7b32277 100644 --- a/zos.rinkeby.json +++ b/zos.rinkeby.json @@ -33,5 +33,5 @@ "provider": { "address": "0x35de7ba3457f9ec93b5b9f05b47c2515ea6255f3" }, - "version": "1.9.0" -} \ No newline at end of file + "version": "1.9.1" +} diff --git a/zos.ropsten.json b/zos.ropsten.json index 8f1cc41b3..c0b5a8333 100644 --- a/zos.ropsten.json +++ b/zos.ropsten.json @@ -25,12 +25,13 @@ "bytecodeHash": "5baf52008954818f59f903fbdcae7c437a4d473e98a10053847598fe29fb37cc" } }, + "lib": true, + "frozen": true, "package": { "address": "0x22137ecc8483e4c2a86969d867c54babf5a6a184" }, "provider": { "address": "0x4e7134170fa8548134f942ea74679dce05c1d13e" }, - "frozen": true, - "version": "1.9.0" + "version": "1.9.1" } From f00d13125b6cc8f3142144580c5ca5e826e57955 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 20 Jul 2018 17:19:25 -0300 Subject: [PATCH 53/54] modify readme for zos --- README.md | 67 +++++++------------------------------------------------ 1 file changed, 8 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index f4c99ff8a..6386d0fcd 100644 --- a/README.md +++ b/README.md @@ -1,64 +1,13 @@ -# OpenZeppelin Solidity -[![NPM Package](https://img.shields.io/npm/v/openzeppelin-solidity.svg?style=flat-square)](https://www.npmjs.org/package/openzeppelin-solidity) -[![Build Status](https://img.shields.io/travis/OpenZeppelin/openzeppelin-solidity.svg?branch=master&style=flat-square)](https://travis-ci.org/OpenZeppelin/openzeppelin-solidity) -[![Coverage Status](https://img.shields.io/coveralls/github/OpenZeppelin/openzeppelin-solidity/master.svg?style=flat-square)](https://coveralls.io/github/OpenZeppelin/openzeppelin-solidity?branch=master) +# OpenZeppelin for ZeppelinOS +[![NPM Package](https://img.shields.io/npm/v/openzeppelin-zos.svg?style=flat-square)](https://www.npmjs.org/package/openzeppelin-zos) +[![Build Status](https://img.shields.io/travis/OpenZeppelin/openzeppelin-zos.svg?branch=master&style=flat-square)](https://travis-ci.org/OpenZeppelin/openzeppelin-zos) +[![Coverage Status](https://img.shields.io/coveralls/github/OpenZeppelin/openzeppelin-zos/master.svg?style=flat-square)](https://coveralls.io/github/OpenZeppelin/openzeppelin-zos?branch=master) -OpenZeppelin is a library for writing secure [Smart Contracts](https://en.wikipedia.org/wiki/Smart_contract) on Ethereum. +OpenZeppelin is a Solidity library of secure smart contract components for Ethereum. -With OpenZeppelin, you can build distributed applications, protocols and organizations: -- using common contract security patterns (See [Onward with Ethereum Smart Contract Security](https://medium.com/bitcorps-blog/onward-with-ethereum-smart-contract-security-97a827e47702#.y3kvdetbz)) -- in the [Solidity language](https://solidity.readthedocs.io/en/develop/). +This repository is a fork with the modifications necessary to be used as the ZeppelinOS stdlib. -> NOTE: New to smart contract development? Check our [introductory guide](https://medium.com/zeppelin-blog/the-hitchhikers-guide-to-smart-contracts-in-ethereum-848f08001f05#.cox40d2ut). - -## Getting Started - -OpenZeppelin integrates with [Truffle](https://github.com/ConsenSys/truffle), an Ethereum development environment. Please install Truffle and initialize your project with `truffle init`. - -```sh -npm install -g truffle -mkdir myproject && cd myproject -truffle init -``` - -To install the OpenZeppelin library, run the following in your Solidity project root directory: -```sh -npm init -y -npm install -E openzeppelin-solidity -``` - -**Note that OpenZeppelin does not currently follow semantic versioning.** You may encounter breaking changes upon a minor version bump. We recommend pinning the version of OpenZeppelin you use, as done by the `-E` (`--save-exact`) option. - -After that, you'll get all the library's contracts in the `node_modules/openzeppelin-solidity/contracts` folder. You can use the contracts in the library like so: - -```solidity -import 'openzeppelin-solidity/contracts/ownership/Ownable.sol'; - -contract MyContract is Ownable { - ... -} -``` - - -## Security -OpenZeppelin is meant to provide secure, tested and community-audited code, but please use common sense when doing anything that deals with real money! We take no responsibility for your implementation decisions and any security problem you might experience. - -If you find a security issue, please email [security@openzeppelin.org](mailto:security@openzeppelin.org). - -## Developer Resources - -Building a distributed application, protocol or organization with OpenZeppelin? - -- Read documentation: https://openzeppelin.org/api/docs/open-zeppelin.html - -- Ask for help and follow progress at: https://slack.openzeppelin.org/ - -Interested in contributing to OpenZeppelin? - -- Framework proposal and roadmap: https://medium.com/zeppelin-blog/zeppelin-framework-proposal-and-development-roadmap-fdfa9a3a32ab#.iain47pak -- Issue tracker: https://github.com/OpenZeppelin/openzeppelin-solidity/issues -- Contribution guidelines: https://github.com/OpenZeppelin/openzeppelin-solidity/blob/master/CONTRIBUTING.md -- Wiki: https://github.com/OpenZeppelin/openzeppelin-solidity/wiki +To learn more about using OpenZeppelin in ZeppelinOS, make sure to read [*Using the stdlib in your app*](https://docs.zeppelinos.org/docs/using.html) and the rest of the docs! ## License -Code released under the [MIT License](https://github.com/OpenZeppelin/openzeppelin-solidity/blob/master/LICENSE). +Code released under the [MIT License](/LICENSE). From 6e5596e80c6bc6746ed02be89c7e50ba771edec6 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 20 Jul 2018 17:45:11 -0300 Subject: [PATCH 54/54] fix package.json repository links --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 4d595465a..8eac4a363 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/OpenZeppelin/zeppelin-solidity.git" + "url": "https://github.com/OpenZeppelin/openzeppelin-zos.git" }, "keywords": [ "solidity", @@ -37,9 +37,9 @@ "author": "Manuel Araoz ", "license": "MIT", "bugs": { - "url": "https://github.com/OpenZeppelin/zeppelin-solidity/issues" + "url": "https://github.com/OpenZeppelin/openzeppelin-zos/issues" }, - "homepage": "https://github.com/OpenZeppelin/zeppelin-solidity", + "homepage": "https://github.com/OpenZeppelin/openzeppelin-zos", "devDependencies": { "babel-polyfill": "^6.23.0", "babel-preset-es2015": "^6.18.0",