From a3cd053cb14cdea407328a001ce03afeb139d917 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Fri, 14 Sep 2018 14:20:41 -0400 Subject: [PATCH] fix warnings in sol contracts --- .../contracts/SimpleStorageWithHttpImport.sol | 4 +- .../app/contracts/another_storage.sol | 2 +- .../test_app/app/contracts/contract_args.sol | 4 +- test_apps/test_app/app/contracts/ownable.sol | 4 +- .../test_app/app/contracts/simple_storage.sol | 6 +- .../test_app/app/contracts/some_contract.sol | 4 +- test_apps/test_app/config/contracts.js | 5 +- test_apps/test_app/contracts/token.sol | 10 +- .../contracts/pluginSimpleStorage.sol | 2 +- test_apps/test_app/package-lock.json | 197 +++++++----------- test_apps/test_app/package.json | 2 +- 11 files changed, 97 insertions(+), 143 deletions(-) diff --git a/test_apps/test_app/app/contracts/SimpleStorageWithHttpImport.sol b/test_apps/test_app/app/contracts/SimpleStorageWithHttpImport.sol index 8af1557c4..b67e12c03 100644 --- a/test_apps/test_app/app/contracts/SimpleStorageWithHttpImport.sol +++ b/test_apps/test_app/app/contracts/SimpleStorageWithHttpImport.sol @@ -9,7 +9,7 @@ contract SimpleStorageWithHttpImport is Ownable { function() public payable { } - function SimpleStorageWithHttpImport(uint initialValue) public { + constructor(uint initialValue) public { storedData = initialValue; } @@ -20,7 +20,7 @@ contract SimpleStorageWithHttpImport is Ownable { } } - function set2(uint x, uint unusedGiveWarning) public onlyOwner { + function set2(uint x) public onlyOwner { storedData = x; } diff --git a/test_apps/test_app/app/contracts/another_storage.sol b/test_apps/test_app/app/contracts/another_storage.sol index d8e0a1a81..ba845f931 100644 --- a/test_apps/test_app/app/contracts/another_storage.sol +++ b/test_apps/test_app/app/contracts/another_storage.sol @@ -3,7 +3,7 @@ contract AnotherStorage { address public simpleStorageAddress; address simpleStorageAddress2; - function AnotherStorage(address addr) public { + constructor(address addr) public { simpleStorageAddress = addr; } diff --git a/test_apps/test_app/app/contracts/contract_args.sol b/test_apps/test_app/app/contracts/contract_args.sol index 1bf7a2d37..a1019181e 100644 --- a/test_apps/test_app/app/contracts/contract_args.sol +++ b/test_apps/test_app/app/contracts/contract_args.sol @@ -1,3 +1,5 @@ +pragma solidity ^0.4.24; + contract ContractArgs { address public addr_1; address public addr_2; @@ -5,7 +7,7 @@ contract ContractArgs { function() public payable { } - function ContractArgs(address[] _addresses, uint initialValue) public { + constructor(address[] _addresses, uint initialValue) public { addr_1 = _addresses[0]; addr_2 = _addresses[1]; value = initialValue; diff --git a/test_apps/test_app/app/contracts/ownable.sol b/test_apps/test_app/app/contracts/ownable.sol index af8aa0cfc..1ecf427b9 100644 --- a/test_apps/test_app/app/contracts/ownable.sol +++ b/test_apps/test_app/app/contracts/ownable.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.4.17; +pragma solidity ^0.4.24; /** * @title Ownable @@ -13,7 +13,7 @@ contract Ownable { * @dev The Ownable constructor sets the original `owner` of the contract to the sender * account. */ - function Ownable() public { + constructor() public { owner = msg.sender; } diff --git a/test_apps/test_app/app/contracts/simple_storage.sol b/test_apps/test_app/app/contracts/simple_storage.sol index 608b3af9a..43bd0d4e8 100644 --- a/test_apps/test_app/app/contracts/simple_storage.sol +++ b/test_apps/test_app/app/contracts/simple_storage.sol @@ -6,7 +6,7 @@ library Assert { event TestEvent(bool passed, string message); function triggerEvent(bool passed, string message) internal { - TestEvent(passed, message); + emit TestEvent(passed, message); } } @@ -17,7 +17,7 @@ contract SimpleStorage is Ownable { function() public payable { } - function SimpleStorage(uint initialValue) public { + constructor(uint initialValue) public { storedData = initialValue; } @@ -26,7 +26,7 @@ contract SimpleStorage is Ownable { Assert.triggerEvent(true, "hi"); } - function set2(uint x, uint unusedGiveWarning) public onlyOwner { + function set2(uint x) public onlyOwner { storedData = x; emit EventOnSet2(true, "hi"); } diff --git a/test_apps/test_app/app/contracts/some_contract.sol b/test_apps/test_app/app/contracts/some_contract.sol index fa69a88b3..9297cfae8 100644 --- a/test_apps/test_app/app/contracts/some_contract.sol +++ b/test_apps/test_app/app/contracts/some_contract.sol @@ -1,3 +1,5 @@ +pragma solidity ^0.4.24; + contract SomeContract { address public addr_1; address public addr_2; @@ -5,7 +7,7 @@ contract SomeContract { function() public payable { } - function SomeContract(address[] _addresses, uint initialValue) public { + constructor(address[] _addresses, uint initialValue) public { addr_1 = _addresses[0]; addr_2 = _addresses[1]; value = initialValue; diff --git a/test_apps/test_app/config/contracts.js b/test_apps/test_app/config/contracts.js index 831466acf..5af96162a 100644 --- a/test_apps/test_app/config/contracts.js +++ b/test_apps/test_app/config/contracts.js @@ -66,8 +66,9 @@ module.exports = { file: "./some_folder/test_contract.sol", args: [1000] }, - Identity: { - file: "https://github.com/status-im/contracts/blob/master/contracts/identity/Identity.sol" + Owned: { + file: "https://github.com/status-im/contracts/blob/151-embark31/contracts/common/Owned.sol", + deploy: false }, SimpleStorageWithHttpImport: { fromIndex: 0, diff --git a/test_apps/test_app/contracts/token.sol b/test_apps/test_app/contracts/token.sol index cf1a54d6d..cc595a37c 100644 --- a/test_apps/test_app/contracts/token.sol +++ b/test_apps/test_app/contracts/token.sol @@ -10,7 +10,7 @@ contract Token { mapping( address => mapping( address => uint ) ) _approvals; uint public _supply; //uint public _supply2; - function Token( uint initial_balance ) public { + constructor( uint initial_balance ) public { _balances[msg.sender] = initial_balance; _supply = initial_balance; } @@ -29,7 +29,7 @@ contract Token { } _balances[msg.sender] -= value; _balances[to] += value; - Transfer( msg.sender, to, value ); + emit Transfer( msg.sender, to, value ); return true; } function transferFrom( address from, address to, uint value) public returns (bool ok) { @@ -48,13 +48,13 @@ contract Token { _approvals[from][msg.sender] -= value; _balances[from] -= value; _balances[to] += value; - Transfer( from, to, value ); + emit Transfer( from, to, value ); return true; } function approve(address spender, uint value) public returns (bool ok) { // TODO: should increase instead _approvals[msg.sender][spender] = value; - Approval( msg.sender, spender, value ); + emit Approval( msg.sender, spender, value ); return true; } function allowance(address owner, address spender) public constant returns (uint _allowance) { @@ -63,7 +63,7 @@ contract Token { function safeToAdd(uint a, uint b) internal pure returns (bool) { return (a + b >= a); } - function isAvailable() public constant returns (bool) { + function isAvailable() internal pure returns (bool) { return false; } } diff --git a/test_apps/test_app/extensions/embark-service/contracts/pluginSimpleStorage.sol b/test_apps/test_app/extensions/embark-service/contracts/pluginSimpleStorage.sol index 4d01d6b32..cad3e2619 100644 --- a/test_apps/test_app/extensions/embark-service/contracts/pluginSimpleStorage.sol +++ b/test_apps/test_app/extensions/embark-service/contracts/pluginSimpleStorage.sol @@ -3,7 +3,7 @@ contract PluginStorage { address public simpleStorageAddress; address simpleStorageAddress2; - function PluginStorage(address addr) public { + constructor(address addr) public { simpleStorageAddress = addr; } diff --git a/test_apps/test_app/package-lock.json b/test_apps/test_app/package-lock.json index 8ecedc65d..dd65a50ed 100644 --- a/test_apps/test_app/package-lock.json +++ b/test_apps/test_app/package-lock.json @@ -19,9 +19,9 @@ "integrity": "sha512-5PgPDV6F5s69XNznTcP0za3qH7qgBkr9DVQTXfZtpF+3iEyuIZB1Mjxu52F5CFxgzQUQJoBYHVxtH4Itdb5MgA==", "dev": true, "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^3.0.0" + "chalk": "2.4.1", + "esutils": "2.0.2", + "js-tokens": "3.0.2" }, "dependencies": { "js-tokens": { @@ -38,7 +38,7 @@ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, "requires": { - "color-convert": "^1.9.0" + "color-convert": "1.9.2" } }, "asap": { @@ -51,8 +51,8 @@ "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" + "core-js": "2.5.7", + "regenerator-runtime": "0.11.1" }, "dependencies": { "core-js": { @@ -62,11 +62,6 @@ } } }, - "bn.js": { - "version": "4.11.6", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz", - "integrity": "sha1-UzRK2xRhehP26N0s4okF0cC6MhU=" - }, "bootstrap": { "version": "3.3.7", "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz", @@ -78,9 +73,9 @@ "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "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.4.0" } }, "classnames": { @@ -111,17 +106,12 @@ "dom-helpers": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.3.1.tgz", - "integrity": "sha1-/BpOFf/fYN3eA6SAqcD+zoId1KY=" - }, - "dotenv": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-4.0.0.tgz", - "integrity": "sha1-hk7xN5rO1Vzm+V3r7NzhefegzR0=" + "integrity": "sha512-2Sm+JaYn74OiTM2wHvxJOo3roiq/h25Yi69Fqk269cNUwIXsCvATB6CRSFC9Am/20G2b28hGv/+7NiWydIrPvg==" }, "embark-service": { "version": "file:extensions/embark-service", "requires": { - "haml": "^0.4.3" + "haml": "0.4.3" } }, "encoding": { @@ -129,7 +119,7 @@ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", "requires": { - "iconv-lite": "~0.4.13" + "iconv-lite": "0.4.23" } }, "escape-string-regexp": { @@ -144,28 +134,18 @@ "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", "dev": true }, - "ethjs-abi": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ethjs-abi/-/ethjs-abi-0.2.1.tgz", - "integrity": "sha1-4KepOn6BFjqUR3utVu3lJKtt5TM=", - "requires": { - "bn.js": "4.11.6", - "js-sha3": "0.5.5", - "number-to-bn": "1.7.0" - } - }, "fbjs": { "version": "0.8.17", "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz", "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=", "requires": { - "core-js": "^1.0.0", - "isomorphic-fetch": "^2.1.1", - "loose-envify": "^1.0.0", - "object-assign": "^4.1.0", - "promise": "^7.1.1", - "setimmediate": "^1.0.5", - "ua-parser-js": "^0.7.18" + "core-js": "1.2.7", + "isomorphic-fetch": "2.2.1", + "loose-envify": "1.4.0", + "object-assign": "4.1.1", + "promise": "7.3.1", + "setimmediate": "1.0.5", + "ua-parser-js": "0.7.18" } }, "haml": { @@ -184,7 +164,7 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz", "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==", "requires": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": "2.1.2" } }, "invariant": { @@ -192,14 +172,9 @@ "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "requires": { - "loose-envify": "^1.0.0" + "loose-envify": "1.4.0" } }, - "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=" - }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", @@ -210,8 +185,8 @@ "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", "requires": { - "node-fetch": "^1.0.1", - "whatwg-fetch": ">=0.10.0" + "node-fetch": "1.7.3", + "whatwg-fetch": "2.0.4" } }, "jquery": { @@ -219,11 +194,6 @@ "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" }, - "js-sha3": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz", - "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=" - }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -239,25 +209,16 @@ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" + "js-tokens": "4.0.0" } }, "node-fetch": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", - "integrity": "sha1-mA9vcthSEaU0fGsrwYxbhMPrR+8=", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", "requires": { - "encoding": "^0.1.11", - "is-stream": "^1.0.1" - } - }, - "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=", - "requires": { - "bn.js": "4.11.6", - "strip-hex-prefix": "1.0.0" + "encoding": "0.1.12", + "is-stream": "1.1.0" } }, "object-assign": { @@ -268,9 +229,9 @@ "promise": { "version": "7.3.1", "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", "requires": { - "asap": "~2.0.3" + "asap": "2.0.6" } }, "prop-types": { @@ -278,8 +239,8 @@ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.6.2.tgz", "integrity": "sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==", "requires": { - "loose-envify": "^1.3.1", - "object-assign": "^4.1.1" + "loose-envify": "1.4.0", + "object-assign": "4.1.1" } }, "prop-types-extra": { @@ -287,8 +248,8 @@ "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.0.tgz", "integrity": "sha512-QFyuDxvMipmIVKD2TwxLVPzMnO4e5oOf1vr3tJIomL8E7d0lr6phTHd5nkPhFIzTD1idBLLEPeylL9g+rrTzRg==", "requires": { - "react-is": "^16.3.2", - "warning": "^3.0.0" + "react-is": "16.4.2", + "warning": "3.0.0" } }, "react": { @@ -296,29 +257,29 @@ "resolved": "https://registry.npmjs.org/react/-/react-16.4.2.tgz", "integrity": "sha512-dMv7YrbxO4y2aqnvA7f/ik9ibeLSHQJTI6TrYAenPSaQ6OXfb+Oti+oJiy8WBxgRzlKatYqtCjphTgDSCEiWFg==", "requires": { - "fbjs": "^0.8.16", - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.0" + "fbjs": "0.8.17", + "loose-envify": "1.4.0", + "object-assign": "4.1.1", + "prop-types": "15.6.2" } }, "react-bootstrap": { "version": "0.32.1", "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-0.32.1.tgz", - "integrity": "sha1-YGJMG0ijnXc+9szmQhpPM+zBZrs=", + "integrity": "sha512-RbfzKUbsukWsToWqGHfCCyMFq9QQI0TznutdyxyJw6dih2NvIne25Mrssg8LZsprqtPpyQi8bN0L0Fx3fUsL8Q==", "requires": { - "babel-runtime": "^6.11.6", - "classnames": "^2.2.5", - "dom-helpers": "^3.2.0", - "invariant": "^2.2.1", - "keycode": "^2.1.2", - "prop-types": "^15.5.10", - "prop-types-extra": "^1.0.1", - "react-overlays": "^0.8.0", - "react-prop-types": "^0.4.0", - "react-transition-group": "^2.0.0", - "uncontrollable": "^4.1.0", - "warning": "^3.0.0" + "babel-runtime": "6.26.0", + "classnames": "2.2.6", + "dom-helpers": "3.3.1", + "invariant": "2.2.4", + "keycode": "2.2.0", + "prop-types": "15.6.2", + "prop-types-extra": "1.1.0", + "react-overlays": "0.8.3", + "react-prop-types": "0.4.0", + "react-transition-group": "2.4.0", + "uncontrollable": "4.1.0", + "warning": "3.0.0" } }, "react-dom": { @@ -326,10 +287,10 @@ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.4.2.tgz", "integrity": "sha512-Usl73nQqzvmJN+89r97zmeUpQDKDlh58eX6Hbs/ERdDHzeBzWy+ENk7fsGQ+5KxArV1iOFPT46/VneklK9zoWw==", "requires": { - "fbjs": "^0.8.16", - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.0" + "fbjs": "0.8.17", + "loose-envify": "1.4.0", + "object-assign": "4.1.1", + "prop-types": "15.6.2" } }, "react-is": { @@ -345,14 +306,14 @@ "react-overlays": { "version": "0.8.3", "resolved": "https://registry.npmjs.org/react-overlays/-/react-overlays-0.8.3.tgz", - "integrity": "sha1-+tZe6lskMBzKGSoWn13dsLINOsU=", + "integrity": "sha512-h6GT3jgy90PgctleP39Yu3eK1v9vaJAW73GOA/UbN9dJ7aAN4BTZD6793eI1D5U+ukMk17qiqN/wl3diK1Z5LA==", "requires": { - "classnames": "^2.2.5", - "dom-helpers": "^3.2.1", - "prop-types": "^15.5.10", - "prop-types-extra": "^1.0.1", - "react-transition-group": "^2.2.0", - "warning": "^3.0.0" + "classnames": "2.2.6", + "dom-helpers": "3.3.1", + "prop-types": "15.6.2", + "prop-types-extra": "1.1.0", + "react-transition-group": "2.4.0", + "warning": "3.0.0" } }, "react-prop-types": { @@ -360,7 +321,7 @@ "resolved": "https://registry.npmjs.org/react-prop-types/-/react-prop-types-0.4.0.tgz", "integrity": "sha1-+ZsL+0AGkpya8gUefBQUpcdbk9A=", "requires": { - "warning": "^3.0.0" + "warning": "3.0.0" } }, "react-transition-group": { @@ -368,16 +329,16 @@ "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.4.0.tgz", "integrity": "sha512-Xv5d55NkJUxUzLCImGSanK8Cl/30sgpOEMGc5m86t8+kZwrPxPCPcFqyx83kkr+5Lz5gs6djuvE5By+gce+VjA==", "requires": { - "dom-helpers": "^3.3.1", - "loose-envify": "^1.3.1", - "prop-types": "^15.6.2", - "react-lifecycles-compat": "^3.0.4" + "dom-helpers": "3.3.1", + "loose-envify": "1.4.0", + "prop-types": "15.6.2", + "react-lifecycles-compat": "3.0.4" } }, "regenerator-runtime": { "version": "0.11.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk=" + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==" }, "safer-buffer": { "version": "2.1.2", @@ -389,21 +350,13 @@ "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, - "strip-hex-prefix": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz", - "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=", - "requires": { - "is-hex-prefixed": "1.0.0" - } - }, "supports-color": { "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": "^3.0.0" + "has-flag": "3.0.0" } }, "ua-parser-js": { @@ -416,7 +369,7 @@ "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-4.1.0.tgz", "integrity": "sha1-4DWCkSUuGGUiLZCTmxny9J+Bwak=", "requires": { - "invariant": "^2.1.0" + "invariant": "2.2.4" } }, "warning": { @@ -424,7 +377,7 @@ "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=", "requires": { - "loose-envify": "^1.0.0" + "loose-envify": "1.4.0" } }, "whatwg-fetch": { @@ -433,13 +386,9 @@ "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==" }, "zeppelin-solidity": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/zeppelin-solidity/-/zeppelin-solidity-1.8.0.tgz", - "integrity": "sha1-BJ/N59rqn8hSEPjG25+M0auKhTo=", - "requires": { - "dotenv": "^4.0.0", - "ethjs-abi": "^0.2.1" - } + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/zeppelin-solidity/-/zeppelin-solidity-1.12.0.tgz", + "integrity": "sha512-dgjPPnTmx14hAbTeOpTKemDeDCDdwglS0nquOAJG8h5o9zlb43FZafQSrMlIUUSp1EisDZfehrp5loGEYXHZBA==" } } } diff --git a/test_apps/test_app/package.json b/test_apps/test_app/package.json index 67be0ebc5..586d6be88 100644 --- a/test_apps/test_app/package.json +++ b/test_apps/test_app/package.json @@ -20,6 +20,6 @@ "react": "^16.0.0", "react-bootstrap": "^0.32.0", "react-dom": "^16.2.0", - "zeppelin-solidity": "1.8.0" + "zeppelin-solidity": "1.12.0" } }