From 8dbdaeeccbdb9852e69e1d22b9e9c366a3456f2f Mon Sep 17 00:00:00 2001 From: krzysztofwedrowicz Date: Fri, 25 Jan 2019 15:49:27 +0100 Subject: [PATCH] fixed solidity-coverage, downgraded solidity to 0.5.0 from 0.5.3 --- contracts/Migrations.sol | 2 +- contracts/Oracle.sol | 2 +- contracts/OracleI.sol | 2 +- contracts/UsingOracle.sol | 2 +- contracts/UsingOracleI.sol | 2 +- contracts/auth/Authorizable.sol | 2 +- contracts/oraclize/OraclizeAddrResolver.sol | 2 +- contracts/oraclize/OraclizeI.sol | 2 +- contracts/oraclize/OraclizeWrapper.sol | 2 +- .../oraclize/UsingOraclizeExampleContract.sol | 2 +- contracts/oraclize/UsingOraclizeI.sol | 2 +- contracts/utils/StringParser.sol | 2 +- .../utils/coverage/StringParserCoverage.sol | 2 +- package-lock.json | 112 ++++++++++-------- package.json | 2 +- 15 files changed, 78 insertions(+), 62 deletions(-) diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol index 83a49d2..4ca7a41 100644 --- a/contracts/Migrations.sol +++ b/contracts/Migrations.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.3; +pragma solidity ^0.5.0; contract Migrations { address public owner; diff --git a/contracts/Oracle.sol b/contracts/Oracle.sol index 738f9d7..8f6fc8e 100644 --- a/contracts/Oracle.sol +++ b/contracts/Oracle.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.3; +pragma solidity ^0.5.0; import "./UsingOracleI.sol"; import "./auth/Authorizable.sol"; diff --git a/contracts/OracleI.sol b/contracts/OracleI.sol index ee465b9..92bb25e 100644 --- a/contracts/OracleI.sol +++ b/contracts/OracleI.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.3; +pragma solidity ^0.5.0; interface OracleI { function request(string calldata _url) external returns(bytes32 id); diff --git a/contracts/UsingOracle.sol b/contracts/UsingOracle.sol index b9a2cc9..3abd80f 100644 --- a/contracts/UsingOracle.sol +++ b/contracts/UsingOracle.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.3; +pragma solidity ^0.5.0; import "./OracleI.sol"; diff --git a/contracts/UsingOracleI.sol b/contracts/UsingOracleI.sol index 00386a8..cbc2c5b 100644 --- a/contracts/UsingOracleI.sol +++ b/contracts/UsingOracleI.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.3; +pragma solidity ^0.5.0; interface UsingOracleI { function __callback(bytes32 _id, string calldata _value, uint _errorCode) external; diff --git a/contracts/auth/Authorizable.sol b/contracts/auth/Authorizable.sol index b5eeea0..280e812 100644 --- a/contracts/auth/Authorizable.sol +++ b/contracts/auth/Authorizable.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.3; +pragma solidity ^0.5.0; import "openzeppelin-solidity/contracts/ownership/Ownable.sol"; import "openzeppelin-solidity/contracts/access/Roles.sol"; diff --git a/contracts/oraclize/OraclizeAddrResolver.sol b/contracts/oraclize/OraclizeAddrResolver.sol index 94b593d..021ef7e 100644 --- a/contracts/oraclize/OraclizeAddrResolver.sol +++ b/contracts/oraclize/OraclizeAddrResolver.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.3; +pragma solidity ^0.5.0; /* Copyright (c) 2015-2016 Oraclize SRL diff --git a/contracts/oraclize/OraclizeI.sol b/contracts/oraclize/OraclizeI.sol index 091f80f..8c38d21 100644 --- a/contracts/oraclize/OraclizeI.sol +++ b/contracts/oraclize/OraclizeI.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.3; +pragma solidity ^0.5.0; contract OraclizeI { diff --git a/contracts/oraclize/OraclizeWrapper.sol b/contracts/oraclize/OraclizeWrapper.sol index 925fe34..a61d473 100644 --- a/contracts/oraclize/OraclizeWrapper.sol +++ b/contracts/oraclize/OraclizeWrapper.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.3; +pragma solidity ^0.5.0; import "./OraclizeI.sol"; import "./UsingOraclizeI.sol"; diff --git a/contracts/oraclize/UsingOraclizeExampleContract.sol b/contracts/oraclize/UsingOraclizeExampleContract.sol index 02d8997..4f74488 100644 --- a/contracts/oraclize/UsingOraclizeExampleContract.sol +++ b/contracts/oraclize/UsingOraclizeExampleContract.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.3; +pragma solidity ^0.5.0; import "./oraclizeAPI.sol"; diff --git a/contracts/oraclize/UsingOraclizeI.sol b/contracts/oraclize/UsingOraclizeI.sol index a433567..e4bf59e 100644 --- a/contracts/oraclize/UsingOraclizeI.sol +++ b/contracts/oraclize/UsingOraclizeI.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.3; +pragma solidity ^0.5.0; interface UsingOraclizeI { function __callback(bytes32 _id, string calldata _value) external; diff --git a/contracts/utils/StringParser.sol b/contracts/utils/StringParser.sol index fc77de7..c94164f 100644 --- a/contracts/utils/StringParser.sol +++ b/contracts/utils/StringParser.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.3; +pragma solidity ^0.5.0; library StringParser { function toInt(string memory _x) public pure returns(int) { diff --git a/contracts/utils/coverage/StringParserCoverage.sol b/contracts/utils/coverage/StringParserCoverage.sol index c26cd7e..e5ed0bc 100644 --- a/contracts/utils/coverage/StringParserCoverage.sol +++ b/contracts/utils/coverage/StringParserCoverage.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.3; +pragma solidity ^0.5.0; import "../StringParser.sol"; diff --git a/package-lock.json b/package-lock.json index 8714eba..7abda5a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -292,8 +292,8 @@ } }, "bignumber.js": { - "version": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", - "from": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", + "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git", "dev": true }, "binary-extensions": { @@ -342,12 +342,13 @@ "dev": true }, "browserify-sha3": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/browserify-sha3/-/browserify-sha3-0.0.1.tgz", - "integrity": "sha1-P/NKMAbvFcD7NWflQbkaI0ASPRE=", + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/browserify-sha3/-/browserify-sha3-0.0.4.tgz", + "integrity": "sha1-CGxHuMgjFsnUcCLCYYWVRXbdjiY=", "dev": true, "requires": { - "js-sha3": "^0.3.1" + "js-sha3": "^0.6.1", + "safe-buffer": "^5.1.1" } }, "buffer-from": { @@ -625,6 +626,12 @@ "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", "dev": true }, + "cookiejar": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz", + "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==", + "dev": true + }, "copy-descriptor": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", @@ -2281,9 +2288,9 @@ } }, "interpret": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", - "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz", + "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==", "dev": true }, "invert-kv": { @@ -2570,33 +2577,18 @@ "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 - }, "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", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "^1.0.0" - } } } }, "js-sha3": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.3.1.tgz", - "integrity": "sha1-hhIoAhQvCChQKg0d7h2V4lO7AkM=", + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.6.1.tgz", + "integrity": "sha1-W4n3enR3Z5h39YxKB1JAk0sflcA=", "dev": true }, "js-string-escape": { @@ -2685,13 +2677,13 @@ } }, "keccakjs": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/keccakjs/-/keccakjs-0.2.1.tgz", - "integrity": "sha1-HWM6+QfvMFu/ny+mFtVsRFYd+k0=", + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/keccakjs/-/keccakjs-0.2.3.tgz", + "integrity": "sha512-BjLkNDcfaZ6l8HBG9tH0tpmDv3sS2mA7FNQxFHpCdzP3Gb2MVruXBSuoM66SnVxKJpAr5dKGdkHD+bDokt8fTg==", "dev": true, "requires": { - "browserify-sha3": "^0.0.1", - "sha3": "^1.1.0" + "browserify-sha3": "^0.0.4", + "sha3": "^1.2.2" } }, "kind-of": { @@ -4373,9 +4365,8 @@ } }, "solidity-coverage": { - "version": "0.5.11", - "resolved": "https://registry.npmjs.org/solidity-coverage/-/solidity-coverage-0.5.11.tgz", - "integrity": "sha512-qikdsSi6+9XbfvwA0aI7HUVpF9fIFNqRWTw23M89GMDY+b6Gj0wWU9IngJS0fimoZIAdEp3bfChxvpfVcrUesg==", + "version": "git+https://github.com/rotcivegaf/solidity-coverage.git#5875f5b7bc74d447f3312c9c0e9fc7814b482477", + "from": "git+https://github.com/rotcivegaf/solidity-coverage.git#5875f5b7bc74d447f3312c9c0e9fc7814b482477", "dev": true, "requires": { "death": "^1.1.0", @@ -4385,9 +4376,9 @@ "req-cwd": "^1.0.1", "shelljs": "^0.7.4", "sol-explore": "^1.6.2", - "solidity-parser-sc": "0.4.11", + "solidity-parser-sc": "github:maxsam4/solidity-parser#8c93bc23aeb55e6c858ab4f79ef8cf8966034444", "tree-kill": "^1.2.0", - "web3": "^0.18.4" + "web3": "^0.20.6" }, "dependencies": { "camelcase": { @@ -4477,9 +4468,8 @@ "dev": true }, "solidity-parser-sc": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/solidity-parser-sc/-/solidity-parser-sc-0.4.11.tgz", - "integrity": "sha512-1kV5iC7m3CtMDfmHaVNwz2saSGQVIuF16rIxU417Al38MVCWHMQQ5vT6cmLsNwDe60S74auobWij9vNawSeOyw==", + "version": "github:maxsam4/solidity-parser#8c93bc23aeb55e6c858ab4f79ef8cf8966034444", + "from": "github:maxsam4/solidity-parser#solidity-0.5", "dev": true, "requires": { "mocha": "^4.1.0", @@ -4652,9 +4642,9 @@ } }, "source-map-support": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz", - "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==", + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz", + "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==", "dev": true, "requires": { "buffer-from": "^1.0.0", @@ -4815,6 +4805,23 @@ "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "^1.0.0" + }, + "dependencies": { + "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 + } + } + }, "table": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/table/-/table-5.2.1.tgz", @@ -5363,15 +5370,15 @@ } }, "web3": { - "version": "0.18.4", - "resolved": "https://registry.npmjs.org/web3/-/web3-0.18.4.tgz", - "integrity": "sha1-gewXhBRUkfLqqJVbMcBgSeB8Xn0=", + "version": "0.20.7", + "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.7.tgz", + "integrity": "sha512-VU6/DSUX93d1fCzBz7WP/SGCQizO1rKZi4Px9j/3yRyfssHyFcZamMw2/sj4E8TlfMXONvZLoforR8B4bRoyTQ==", "dev": true, "requires": { - "bignumber.js": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", + "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", "crypto-js": "^3.1.4", "utf8": "^2.1.1", - "xhr2": "*", + "xhr2-cookies": "^1.1.0", "xmlhttprequest": "*" } }, @@ -5487,6 +5494,15 @@ "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8=", "dev": true }, + "xhr2-cookies": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/xhr2-cookies/-/xhr2-cookies-1.1.0.tgz", + "integrity": "sha1-fXdEnQmZGX8VXLc7I99yUF7YnUg=", + "dev": true, + "requires": { + "cookiejar": "^2.1.1" + } + }, "xmlhttprequest": { "version": "1.8.0", "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", diff --git a/package.json b/package.json index 7d20708..99e95f9 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "eslint-plugin-import": "^2.15.0", "lodash": "^4.17.11", "openzeppelin-solidity": "^2.1.2", - "solidity-coverage": "^0.5.11", + "solidity-coverage": "https://github.com:rotcivegaf/solidity-coverage.git#5875f5b7bc74d447f3312c9c0e9fc7814b482477", "solium": "^1.2.2", "truffle": "^5.0.2", "truffle-flattener": "^1.2.10",