From afcf546f9cdda5016a08f3fec2da7fcce76eb795 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Thu, 17 Aug 2017 12:31:02 -0500 Subject: [PATCH 1/2] Update to 0.4.15 and latest npm stuff --- contracts/Events/CategoricalEvent.sol | 2 +- contracts/Events/Event.sol | 2 +- contracts/Events/EventFactory.sol | 2 +- contracts/Events/ScalarEvent.sol | 2 +- contracts/MarketMakers/LMSRMarketMaker.sol | 2 +- contracts/MarketMakers/MarketMaker.sol | 2 +- contracts/Markets/Campaign.sol | 2 +- contracts/Markets/CampaignFactory.sol | 2 +- contracts/Markets/Market.sol | 2 +- contracts/Markets/MarketFactory.sol | 2 +- contracts/Markets/StandardMarket.sol | 2 +- contracts/Markets/StandardMarketFactory.sol | 2 +- contracts/Oracles/CentralizedOracle.sol | 2 +- .../Oracles/CentralizedOracleFactory.sol | 2 +- contracts/Oracles/DifficultyOracle.sol | 2 +- contracts/Oracles/DifficultyOracleFactory.sol | 2 +- contracts/Oracles/FutarchyOracle.sol | 2 +- contracts/Oracles/FutarchyOracleFactory.sol | 2 +- contracts/Oracles/MajorityOracle.sol | 2 +- contracts/Oracles/MajorityOracleFactory.sol | 2 +- contracts/Oracles/Oracle.sol | 2 +- contracts/Oracles/SignedMessageOracle.sol | 2 +- .../Oracles/SignedMessageOracleFactory.sol | 2 +- contracts/Oracles/UltimateOracle.sol | 2 +- contracts/Oracles/UltimateOracleFactory.sol | 2 +- contracts/Tokens/EtherToken.sol | 2 +- contracts/Tokens/OutcomeToken.sol | 2 +- contracts/Tokens/StandardToken.sol | 2 +- contracts/Tokens/Token.sol | 2 +- contracts/Utils/Math.sol | 2 +- package-lock.json | 667 +++++++++--------- package.json | 2 +- test/solidity/TestMath.sol | 2 +- 33 files changed, 357 insertions(+), 374 deletions(-) diff --git a/contracts/Events/CategoricalEvent.sol b/contracts/Events/CategoricalEvent.sol index f74f0ae..414358b 100644 --- a/contracts/Events/CategoricalEvent.sol +++ b/contracts/Events/CategoricalEvent.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Events/Event.sol"; diff --git a/contracts/Events/Event.sol b/contracts/Events/Event.sol index 7660ad7..d583a6c 100644 --- a/contracts/Events/Event.sol +++ b/contracts/Events/Event.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Tokens/Token.sol"; import "../Tokens/OutcomeToken.sol"; import "../Oracles/Oracle.sol"; diff --git a/contracts/Events/EventFactory.sol b/contracts/Events/EventFactory.sol index 9cde879..d4afcdb 100644 --- a/contracts/Events/EventFactory.sol +++ b/contracts/Events/EventFactory.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Events/CategoricalEvent.sol"; import "../Events/ScalarEvent.sol"; diff --git a/contracts/Events/ScalarEvent.sol b/contracts/Events/ScalarEvent.sol index a65dcde..af1ecc9 100644 --- a/contracts/Events/ScalarEvent.sol +++ b/contracts/Events/ScalarEvent.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Events/Event.sol"; diff --git a/contracts/MarketMakers/LMSRMarketMaker.sol b/contracts/MarketMakers/LMSRMarketMaker.sol index ce20155..c715f21 100644 --- a/contracts/MarketMakers/LMSRMarketMaker.sol +++ b/contracts/MarketMakers/LMSRMarketMaker.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Utils/Math.sol"; import "../MarketMakers/MarketMaker.sol"; diff --git a/contracts/MarketMakers/MarketMaker.sol b/contracts/MarketMakers/MarketMaker.sol index d4c04fe..34d783a 100644 --- a/contracts/MarketMakers/MarketMaker.sol +++ b/contracts/MarketMakers/MarketMaker.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Markets/Market.sol"; diff --git a/contracts/Markets/Campaign.sol b/contracts/Markets/Campaign.sol index c90fbc3..5183d9c 100644 --- a/contracts/Markets/Campaign.sol +++ b/contracts/Markets/Campaign.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Events/Event.sol"; import "../Markets/StandardMarketFactory.sol"; import "../Utils/Math.sol"; diff --git a/contracts/Markets/CampaignFactory.sol b/contracts/Markets/CampaignFactory.sol index e9f1417..c822a40 100644 --- a/contracts/Markets/CampaignFactory.sol +++ b/contracts/Markets/CampaignFactory.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Markets/Campaign.sol"; diff --git a/contracts/Markets/Market.sol b/contracts/Markets/Market.sol index 96f8328..b791a32 100644 --- a/contracts/Markets/Market.sol +++ b/contracts/Markets/Market.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Events/Event.sol"; import "../MarketMakers/MarketMaker.sol"; diff --git a/contracts/Markets/MarketFactory.sol b/contracts/Markets/MarketFactory.sol index 8f654c6..41e0981 100644 --- a/contracts/Markets/MarketFactory.sol +++ b/contracts/Markets/MarketFactory.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Events/Event.sol"; import "../MarketMakers/MarketMaker.sol"; import "../Markets/Market.sol"; diff --git a/contracts/Markets/StandardMarket.sol b/contracts/Markets/StandardMarket.sol index ad24920..8637324 100644 --- a/contracts/Markets/StandardMarket.sol +++ b/contracts/Markets/StandardMarket.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Markets/Market.sol"; import "../Tokens/Token.sol"; import "../Events/Event.sol"; diff --git a/contracts/Markets/StandardMarketFactory.sol b/contracts/Markets/StandardMarketFactory.sol index ad32c58..c7f77fd 100644 --- a/contracts/Markets/StandardMarketFactory.sol +++ b/contracts/Markets/StandardMarketFactory.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Markets/MarketFactory.sol"; import "../Markets/StandardMarket.sol"; diff --git a/contracts/Oracles/CentralizedOracle.sol b/contracts/Oracles/CentralizedOracle.sol index 77941a4..827b9b7 100644 --- a/contracts/Oracles/CentralizedOracle.sol +++ b/contracts/Oracles/CentralizedOracle.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Oracles/Oracle.sol"; diff --git a/contracts/Oracles/CentralizedOracleFactory.sol b/contracts/Oracles/CentralizedOracleFactory.sol index b3608de..890b4e9 100644 --- a/contracts/Oracles/CentralizedOracleFactory.sol +++ b/contracts/Oracles/CentralizedOracleFactory.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Oracles/CentralizedOracle.sol"; diff --git a/contracts/Oracles/DifficultyOracle.sol b/contracts/Oracles/DifficultyOracle.sol index 8f726cb..d8fcf37 100644 --- a/contracts/Oracles/DifficultyOracle.sol +++ b/contracts/Oracles/DifficultyOracle.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Oracles/Oracle.sol"; diff --git a/contracts/Oracles/DifficultyOracleFactory.sol b/contracts/Oracles/DifficultyOracleFactory.sol index 52497bd..d8e0711 100644 --- a/contracts/Oracles/DifficultyOracleFactory.sol +++ b/contracts/Oracles/DifficultyOracleFactory.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Oracles/DifficultyOracle.sol"; diff --git a/contracts/Oracles/FutarchyOracle.sol b/contracts/Oracles/FutarchyOracle.sol index 40036fd..60f5829 100644 --- a/contracts/Oracles/FutarchyOracle.sol +++ b/contracts/Oracles/FutarchyOracle.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Oracles/Oracle.sol"; import "../Events/EventFactory.sol"; import "../Markets/MarketFactory.sol"; diff --git a/contracts/Oracles/FutarchyOracleFactory.sol b/contracts/Oracles/FutarchyOracleFactory.sol index 58690cf..03e7dab 100644 --- a/contracts/Oracles/FutarchyOracleFactory.sol +++ b/contracts/Oracles/FutarchyOracleFactory.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Oracles/FutarchyOracle.sol"; diff --git a/contracts/Oracles/MajorityOracle.sol b/contracts/Oracles/MajorityOracle.sol index d2aa285..0db8c48 100644 --- a/contracts/Oracles/MajorityOracle.sol +++ b/contracts/Oracles/MajorityOracle.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Oracles/Oracle.sol"; diff --git a/contracts/Oracles/MajorityOracleFactory.sol b/contracts/Oracles/MajorityOracleFactory.sol index 0ffc53f..2498544 100644 --- a/contracts/Oracles/MajorityOracleFactory.sol +++ b/contracts/Oracles/MajorityOracleFactory.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Oracles/MajorityOracle.sol"; diff --git a/contracts/Oracles/Oracle.sol b/contracts/Oracles/Oracle.sol index ffcd79b..8c15b98 100644 --- a/contracts/Oracles/Oracle.sol +++ b/contracts/Oracles/Oracle.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; /// @title Abstract oracle contract - Functions to be implemented by oracles diff --git a/contracts/Oracles/SignedMessageOracle.sol b/contracts/Oracles/SignedMessageOracle.sol index eaca13e..40c8c9f 100644 --- a/contracts/Oracles/SignedMessageOracle.sol +++ b/contracts/Oracles/SignedMessageOracle.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Oracles/Oracle.sol"; diff --git a/contracts/Oracles/SignedMessageOracleFactory.sol b/contracts/Oracles/SignedMessageOracleFactory.sol index 9c068ae..e05f0e7 100644 --- a/contracts/Oracles/SignedMessageOracleFactory.sol +++ b/contracts/Oracles/SignedMessageOracleFactory.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Oracles/SignedMessageOracle.sol"; diff --git a/contracts/Oracles/UltimateOracle.sol b/contracts/Oracles/UltimateOracle.sol index 8b41a4a..a6fbd04 100644 --- a/contracts/Oracles/UltimateOracle.sol +++ b/contracts/Oracles/UltimateOracle.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Oracles/Oracle.sol"; import "../Tokens/Token.sol"; import "../Utils/Math.sol"; diff --git a/contracts/Oracles/UltimateOracleFactory.sol b/contracts/Oracles/UltimateOracleFactory.sol index cf2fb51..35d7c08 100644 --- a/contracts/Oracles/UltimateOracleFactory.sol +++ b/contracts/Oracles/UltimateOracleFactory.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Oracles/UltimateOracle.sol"; diff --git a/contracts/Tokens/EtherToken.sol b/contracts/Tokens/EtherToken.sol index e82d4c3..8013e43 100644 --- a/contracts/Tokens/EtherToken.sol +++ b/contracts/Tokens/EtherToken.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Tokens/StandardToken.sol"; diff --git a/contracts/Tokens/OutcomeToken.sol b/contracts/Tokens/OutcomeToken.sol index 11a090b..b85a74b 100644 --- a/contracts/Tokens/OutcomeToken.sol +++ b/contracts/Tokens/OutcomeToken.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Tokens/StandardToken.sol"; diff --git a/contracts/Tokens/StandardToken.sol b/contracts/Tokens/StandardToken.sol index 47f8d55..cbe45c1 100644 --- a/contracts/Tokens/StandardToken.sol +++ b/contracts/Tokens/StandardToken.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "../Tokens/Token.sol"; import "../Utils/Math.sol"; diff --git a/contracts/Tokens/Token.sol b/contracts/Tokens/Token.sol index 214f466..f673ae3 100644 --- a/contracts/Tokens/Token.sol +++ b/contracts/Tokens/Token.sol @@ -1,5 +1,5 @@ /// Implements ERC 20 Token standard: https://github.com/ethereum/EIPs/issues/20 -pragma solidity 0.4.13; +pragma solidity 0.4.15; /// @title Abstract token contract - Functions to be implemented by token contracts diff --git a/contracts/Utils/Math.sol b/contracts/Utils/Math.sol index 7caaca4..0dedc77 100644 --- a/contracts/Utils/Math.sol +++ b/contracts/Utils/Math.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; /// @title Math library - Allows calculation of logarithmic and exponential functions diff --git a/package-lock.json b/package-lock.json index fbd7e6e..1ab37b0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -206,9 +206,9 @@ "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=", + "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", @@ -222,10 +222,10 @@ "integrity": "sha1-sv4tgBJkcPXBlELcdXJTqJdxCCc=", "dev": true, "requires": { - "babel-code-frame": "6.22.0", - "babel-traverse": "6.25.0", - "babel-types": "6.25.0", - "babylon": "6.17.4" + "babel-code-frame": "6.26.0", + "babel-traverse": "6.26.0", + "babel-types": "6.26.0", + "babylon": "6.18.0" } }, "babel-messages": { @@ -234,30 +234,30 @@ "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "babel-runtime": "6.25.0" + "babel-runtime": "6.26.0" } }, "babel-runtime": { - "version": "6.25.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.25.0.tgz", - "integrity": "sha1-M7mOql1IK7AajRqmtDetKwGuxBw=", + "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.5.0", - "regenerator-runtime": "0.10.5" + "regenerator-runtime": "0.11.0" } }, "babel-traverse": { - "version": "6.25.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz", - "integrity": "sha1-IldJfi/NGbie3BPEyROB+VEklvE=", + "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.22.0", + "babel-code-frame": "6.26.0", "babel-messages": "6.23.0", - "babel-runtime": "6.25.0", - "babel-types": "6.25.0", - "babylon": "6.17.4", + "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", @@ -265,21 +265,21 @@ } }, "babel-types": { - "version": "6.25.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz", - "integrity": "sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4=", + "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.25.0", + "babel-runtime": "6.26.0", "esutils": "2.0.2", "lodash": "4.17.4", "to-fast-properties": "1.0.3" } }, "babylon": { - "version": "6.17.4", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz", - "integrity": "sha512-kChlV+0SXkjE0vUn9OZ7pBMWRFd8uq3mZe8x1K6jhuNcAFAtEnjchFAqB+dYEXKyd+JpT6eppRR78QAr5gTsUw==", + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", "dev": true }, "balanced-match": { @@ -307,9 +307,9 @@ "dev": true }, "binary-extensions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.9.0.tgz", - "integrity": "sha1-ZlBsFs5vTWkopbPNajPKQelB43s=", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.10.0.tgz", + "integrity": "sha1-muuabF6IY4qtFx4Wf1kAq+JINdA=", "dev": true }, "bn.js": { @@ -734,7 +734,7 @@ "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", "dev": true, "requires": { - "es5-ext": "0.10.26" + "es5-ext": "0.10.27" } }, "date-now": { @@ -834,12 +834,6 @@ "isarray": "1.0.0" } }, - "dom-walk": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz", - "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=", - "dev": true - }, "domain-browser": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz", @@ -898,9 +892,9 @@ } }, "es5-ext": { - "version": "0.10.26", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.26.tgz", - "integrity": "sha1-UbISilMbcMT2dkCTpzy+u4IYY3I=", + "version": "0.10.27", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.27.tgz", + "integrity": "sha512-3KXJRYzKXTd7xfFy5uZsJCXue55fAYQ035PRjyYk2PicllxIwcW9l3AbM/eGaw3vgVAUW4tl4xg9AXDEI6yw0w==", "dev": true, "requires": { "es6-iterator": "2.0.1", @@ -914,7 +908,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.26", + "es5-ext": "0.10.27", "es6-symbol": "3.1.1" } }, @@ -925,7 +919,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.26", + "es5-ext": "0.10.27", "es6-iterator": "2.0.1", "es6-set": "0.1.5", "es6-symbol": "3.1.1", @@ -945,7 +939,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.26", + "es5-ext": "0.10.27", "es6-iterator": "2.0.1", "es6-symbol": "3.1.1", "event-emitter": "0.3.5" @@ -958,7 +952,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.26" + "es5-ext": "0.10.27" } }, "es6-weak-map": { @@ -968,7 +962,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.26", + "es5-ext": "0.10.27", "es6-iterator": "2.0.1", "es6-symbol": "3.1.1" } @@ -1035,7 +1029,7 @@ "dev": true, "requires": { "ajv": "5.2.2", - "babel-code-frame": "6.22.0", + "babel-code-frame": "6.26.0", "chalk": "1.1.3", "concat-stream": "1.6.0", "cross-spawn": "5.1.0", @@ -1052,7 +1046,7 @@ "globals": "9.18.0", "ignore": "3.3.3", "imurmurhash": "0.1.4", - "inquirer": "3.2.1", + "inquirer": "3.2.2", "is-resolvable": "1.0.0", "js-yaml": "3.9.1", "json-stable-stringify": "1.0.1", @@ -1141,7 +1135,7 @@ "integrity": "sha1-ryO6v/TDYAhBi8beTID4FgaJbK0=", "dev": true, "requires": { - "webpack": "3.5.2" + "webpack": "3.5.5" } }, "ethereumjs-testrpc-sc": { @@ -1150,7 +1144,7 @@ "integrity": "sha512-hDyY7q6sqqYP9PMIa/5R5jnj9Ybc3LlACWM3qgX873CcjxBRit/cdsUApVVLDRNTA6XE1os04NqaJ5NbQJu+AQ==", "dev": true, "requires": { - "webpack": "3.5.2" + "webpack": "3.5.5" } }, "event-emitter": { @@ -1160,7 +1154,7 @@ "dev": true, "requires": { "d": "1.0.0", - "es5-ext": "0.10.26" + "es5-ext": "0.10.27" } }, "events": { @@ -1393,24 +1387,6 @@ "is-glob": "2.0.1" } }, - "global": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz", - "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=", - "dev": true, - "requires": { - "min-document": "2.19.0", - "process": "0.5.2" - }, - "dependencies": { - "process": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz", - "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=", - "dev": true - } - } - }, "globals": { "version": "9.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", @@ -1582,9 +1558,9 @@ "dev": true }, "inquirer": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.2.1.tgz", - "integrity": "sha512-QgW3eiPN8gpj/K5vVpHADJJgrrF0ho/dZGylikGX7iqAdRgC9FVKYKWFLx6hZDBFcOLEoSqINYrVPeFAeG/PdA==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.2.2.tgz", + "integrity": "sha512-bTKLzEHJVATimZO/YFdLrom0lRx1BHfRYskFHfIMVkGdp8+dIZaxuU+4yrsS1lcu6YWywVQVVsfvdwESzbeqHw==", "dev": true, "requires": { "ansi-escapes": "2.0.0", @@ -1682,7 +1658,7 @@ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "binary-extensions": "1.9.0" + "binary-extensions": "1.10.0" } }, "is-buffer": { @@ -1894,6 +1870,12 @@ "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", "dev": true }, + "resolve": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", + "dev": true + }, "supports-color": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", @@ -2059,15 +2041,16 @@ } }, "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=", + "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", "pify": "2.3.0", - "strip-bom": "3.0.0" + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" } }, "loader-runner": { @@ -2264,15 +2247,6 @@ "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=", "dev": true }, - "min-document": { - "version": "2.19.0", - "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", - "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", - "dev": true, - "requires": { - "dom-walk": "0.1.1" - } - }, "minimalistic-assert": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz", @@ -2295,9 +2269,9 @@ } }, "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", "dev": true }, "mkdirp": { @@ -2307,6 +2281,14 @@ "dev": true, "requires": { "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + } } }, "mocha": { @@ -2436,7 +2418,7 @@ "stream-browserify": "2.0.1", "stream-http": "2.7.2", "string_decoder": "0.10.31", - "timers-browserify": "2.0.3", + "timers-browserify": "2.0.4", "tty-browserify": "0.0.0", "url": "0.11.0", "util": "0.10.3", @@ -2478,7 +2460,7 @@ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", "dev": true, "requires": { - "remove-trailing-separator": "1.0.2" + "remove-trailing-separator": "1.1.0" } }, "npm-prepublish": { @@ -2558,7 +2540,7 @@ "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "minimist": "0.0.8", + "minimist": "0.0.10", "wordwrap": "0.0.3" }, "dependencies": { @@ -2597,14 +2579,12 @@ "dev": true }, "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", "dev": true, "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" + "lcid": "1.0.0" } }, "os-tmpdir": { @@ -2704,13 +2684,21 @@ "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", "dev": true }, + "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 + }, "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, "requires": { - "pify": "2.3.0" + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" } }, "pbkdf2": { @@ -2889,24 +2877,45 @@ } }, "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "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": "2.0.0", + "load-json-file": "1.1.0", "normalize-package-data": "2.4.0", - "path-type": "2.0.0" + "path-type": "1.1.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=", + "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": "2.1.0", - "read-pkg": "2.0.0" + "find-up": "1.1.2", + "read-pkg": "1.1.0" + }, + "dependencies": { + "find-up": { + "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" + } + }, + "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" + } + } } }, "readable-stream": { @@ -2942,13 +2951,13 @@ "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "dev": true, "requires": { - "resolve": "1.1.7" + "resolve": "1.4.0" } }, "regenerator-runtime": { - "version": "0.10.5", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz", - "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz", + "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==", "dev": true }, "regex-cache": { @@ -2962,9 +2971,9 @@ } }, "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=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", "dev": true }, "repeat-element": { @@ -3034,10 +3043,13 @@ } }, "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true + "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" + } }, "resolve-from": { "version": "1.0.1", @@ -3206,9 +3218,9 @@ "dev": true }, "solc": { - "version": "0.4.13", - "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.13.tgz", - "integrity": "sha1-qly9zOPmrjwZDSD1/fi8iAcC7HU=", + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/solc/-/solc-0.4.15.tgz", + "integrity": "sha1-iujxYGoSSj+BwoudzssJZOvfnyU=", "dev": true, "requires": { "fs-extra": "0.30.0", @@ -3216,171 +3228,6 @@ "require-from-string": "1.2.1", "semver": "5.4.1", "yargs": "4.8.1" - }, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true - }, - "cliui": { - "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", - "wrap-ansi": "2.1.0" - } - }, - "find-up": { - "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" - } - }, - "is-fullwidth-code-point": { - "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" - } - }, - "load-json-file": { - "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", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" - } - }, - "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" - } - }, - "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" - } - }, - "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" - } - }, - "read-pkg": { - "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", - "path-type": "1.1.0" - } - }, - "read-pkg-up": { - "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" - } - }, - "string-width": { - "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", - "strip-ansi": "3.0.1" - } - }, - "strip-bom": { - "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" - } - }, - "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 - }, - "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 - }, - "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" - } - }, - "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" - } - } } }, "solidity-coverage": { @@ -3690,10 +3537,13 @@ } }, "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true + "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" + } }, "strip-eof": { "version": "1.0.0", @@ -3758,12 +3608,11 @@ "dev": true }, "timers-browserify": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.3.tgz", - "integrity": "sha512-+JAqyNgg+M8+gXIrq2EeUr4kZqRz47Ysco7X5QKRGScRE9HIHckyHD1asozSFGeqx2nmPCgA8T5tIGVO0ML7/w==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz", + "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==", "dev": true, "requires": { - "global": "4.3.2", "setimmediate": "1.0.5" } }, @@ -3795,14 +3644,14 @@ "dev": true }, "truffle": { - "version": "3.4.7", - "resolved": "https://registry.npmjs.org/truffle/-/truffle-3.4.7.tgz", - "integrity": "sha512-sAc1dixGDpt38Qq9gqEEIFpXXIIaNKViWlojD9Xv4NBqK/03lxb43M7gcILM4gMpgMdwtTAunG4ZQe7z+HYvJQ==", + "version": "3.4.9", + "resolved": "https://registry.npmjs.org/truffle/-/truffle-3.4.9.tgz", + "integrity": "sha512-1i8uJMP1xddK7QW1rWtHIzpDlTI6kZexTurWSU5lgNO/c7THimcCdykXitB38JzueWyUUo2mdYcvVe3TG0QaeQ==", "dev": true, "requires": { "mocha": "3.5.0", "original-require": "1.0.1", - "solc": "0.4.13" + "solc": "0.4.15" }, "dependencies": { "commander": { @@ -4087,9 +3936,9 @@ } }, "webpack": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.5.2.tgz", - "integrity": "sha1-qWAQZuI688gPO/l1j9eUypd48lE=", + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.5.5.tgz", + "integrity": "sha512-qeUx4nIbeLL53qqNTs3kObPBMkUVDrOjEfp/hTvMlx21qL2MsGNr8/tXCoX/lS12dLl9qtZaXv2qfBEctPScDg==", "dev": true, "requires": { "acorn": "5.1.1", @@ -4122,6 +3971,104 @@ "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=", "dev": true }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "cliui": { + "version": "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", + "wrap-ansi": "2.1.0" + }, + "dependencies": { + "string-width": { + "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", + "strip-ansi": "3.0.1" + } + } + } + }, + "is-fullwidth-code-point": { + "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" + } + }, + "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.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "strip-bom": "3.0.0" + } + }, + "os-locale": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", + "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", + "dev": true, + "requires": { + "execa": "0.7.0", + "lcid": "1.0.0", + "mem": "1.1.0" + } + }, + "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.3.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.4.0", + "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.1.0", + "read-pkg": "2.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": "4.2.1", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", @@ -4130,6 +4077,42 @@ "requires": { "has-flag": "2.0.0" } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "dev": true + }, + "yargs": { + "version": "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.2.0", + "get-caller-file": "1.0.2", + "os-locale": "2.1.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.1.1", + "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" + } } } }, @@ -4153,9 +4136,9 @@ } }, "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", "dev": true }, "window-size": { @@ -4271,32 +4254,27 @@ "dev": true }, "yargs": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", - "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", + "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", "dev": true, "requires": { - "camelcase": "4.1.0", "cliui": "3.2.0", "decamelize": "1.2.0", "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "read-pkg-up": "2.0.0", + "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": "2.1.1", - "which-module": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "window-size": "0.2.0", "y18n": "3.2.1", - "yargs-parser": "7.0.0" + "yargs-parser": "2.4.1" }, "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, "cliui": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", @@ -4306,19 +4284,6 @@ "string-width": "1.0.2", "strip-ansi": "3.0.1", "wrap-ansi": "2.1.0" - }, - "dependencies": { - "string-width": { - "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", - "strip-ansi": "3.0.1" - } - } } }, "is-fullwidth-code-point": { @@ -4329,22 +4294,40 @@ "requires": { "number-is-nan": "1.0.1" } + }, + "string-width": { + "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", + "strip-ansi": "3.0.1" + } + }, + "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 } } }, "yargs-parser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", - "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", + "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": "4.1.0" + "camelcase": "3.0.0", + "lodash.assign": "4.2.0" }, "dependencies": { "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", "dev": true } } diff --git a/package.json b/package.json index ad6fd87..937f9a6 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "lodash": "^4.17.4", "npm-prepublish": "^1.2.2", "solidity-coverage": "^0.2.0", - "truffle": "^3.3.0", + "truffle": "^3.4.9", "truffle-config": "^1.0.0", "truffle-expect": "0.0.3", "xhr2": "^0.1.4" diff --git a/test/solidity/TestMath.sol b/test/solidity/TestMath.sol index a4f0b3f..58cc2ec 100644 --- a/test/solidity/TestMath.sol +++ b/test/solidity/TestMath.sol @@ -1,4 +1,4 @@ -pragma solidity 0.4.13; +pragma solidity 0.4.15; import "truffle/Assert.sol"; import "truffle/DeployedAddresses.sol"; From 49f671c3c770d5464629a12a185f0b22076a7fd1 Mon Sep 17 00:00:00 2001 From: Alan Lu Date: Thu, 17 Aug 2017 12:33:15 -0500 Subject: [PATCH 2/2] Travis waits on coverage runner --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d11e209..dc30d90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ before_install: - npm install -g npm codecov greenkeeper-lockfile@1 before_script: greenkeeper-lockfile-update script: -- npm run coverage +- travis_wait npm run coverage - codecov after_script: greenkeeper-lockfile-upload before_deploy: