diff --git a/package.json b/package.json index 5898dfab..c8f7a9c3 100644 --- a/package.json +++ b/package.json @@ -57,8 +57,8 @@ "hardhat-gas-reporter": "^1.0.1", "mocha": "5.2.0", "nyc": "^14.1.1", - "solc": "^0.5.10", - "truffle": "5.0.31", + "solc": "^0.7.5", + "truffle": "5.1.43", "truffle-config": "^1.1.18" } } diff --git a/test/integration/generic/assets/SimpleError.sol b/test/integration/generic/assets/SimpleError.sol index 56d257e8..f4829a67 100644 --- a/test/integration/generic/assets/SimpleError.sol +++ b/test/integration/generic/assets/SimpleError.sol @@ -1,5 +1,5 @@ // This contract should throw a parse error in instrumentSolidity.js -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract SimpleError { uint x = 0; diff --git a/test/integration/generic/contracts/Migrations.sol b/test/integration/generic/contracts/Migrations.sol index ea6b6138..955d1248 100644 --- a/test/integration/generic/contracts/Migrations.sol +++ b/test/integration/generic/contracts/Migrations.sol @@ -1,4 +1,4 @@ -pragma solidity >=0.4.22 <0.6.0; +pragma solidity >=0.4.22 <0.8.0; contract Migrations { diff --git a/test/integration/projects/contract-subfolders/contracts/A/ContractA2.sol b/test/integration/projects/contract-subfolders/contracts/A/ContractA2.sol index 5b917f87..a4aa8923 100644 --- a/test/integration/projects/contract-subfolders/contracts/A/ContractA2.sol +++ b/test/integration/projects/contract-subfolders/contracts/A/ContractA2.sol @@ -1,9 +1,8 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; import "./../B/ContractB2.sol"; contract ContractA is ContractB { - uint x; constructor() public { } diff --git a/test/integration/projects/contract-subfolders/contracts/B/ContractB2.sol b/test/integration/projects/contract-subfolders/contracts/B/ContractB2.sol index 3f26c994..b0cb9e8d 100644 --- a/test/integration/projects/contract-subfolders/contracts/B/ContractB2.sol +++ b/test/integration/projects/contract-subfolders/contracts/B/ContractB2.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractB { diff --git a/test/integration/projects/contract-subfolders/hardhat.config.js b/test/integration/projects/contract-subfolders/hardhat.config.js index 890cb306..d4c16ab7 100644 --- a/test/integration/projects/contract-subfolders/hardhat.config.js +++ b/test/integration/projects/contract-subfolders/hardhat.config.js @@ -8,7 +8,7 @@ module.exports={ } }, solidity: { - version: "0.5.15" + version: "0.7.3" }, paths: { sources: './contracts/A' diff --git a/test/integration/projects/ganache-solcoverjs/contracts/ContractA.sol b/test/integration/projects/ganache-solcoverjs/contracts/ContractA.sol index 9d8d1344..54fb1b7c 100644 --- a/test/integration/projects/ganache-solcoverjs/contracts/ContractA.sol +++ b/test/integration/projects/ganache-solcoverjs/contracts/ContractA.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractA { diff --git a/test/integration/projects/ganache-solcoverjs/contracts/ContractB.sol b/test/integration/projects/ganache-solcoverjs/contracts/ContractB.sol index daa42f7d..a82640b3 100644 --- a/test/integration/projects/ganache-solcoverjs/contracts/ContractB.sol +++ b/test/integration/projects/ganache-solcoverjs/contracts/ContractB.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractB { diff --git a/test/integration/projects/ganache-solcoverjs/contracts/ContractC.sol b/test/integration/projects/ganache-solcoverjs/contracts/ContractC.sol index 454c86cd..99be3ee9 100644 --- a/test/integration/projects/ganache-solcoverjs/contracts/ContractC.sol +++ b/test/integration/projects/ganache-solcoverjs/contracts/ContractC.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractC { diff --git a/test/integration/projects/ganache-solcoverjs/hardhat.config.js b/test/integration/projects/ganache-solcoverjs/hardhat.config.js index 532e3866..39233528 100644 --- a/test/integration/projects/ganache-solcoverjs/hardhat.config.js +++ b/test/integration/projects/ganache-solcoverjs/hardhat.config.js @@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin"); module.exports = { solidity: { - version: "0.5.15" + version: "0.7.3" }, networks: { coverage: { diff --git a/test/integration/projects/hardhat-compile-config/contracts/ContractA1.sol b/test/integration/projects/hardhat-compile-config/contracts/ContractA1.sol index 9d8d1344..b6a0b09d 100644 --- a/test/integration/projects/hardhat-compile-config/contracts/ContractA1.sol +++ b/test/integration/projects/hardhat-compile-config/contracts/ContractA1.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.5.5; contract ContractA { diff --git a/test/integration/projects/hardhat-gas-reporter/contracts/ContractA.sol b/test/integration/projects/hardhat-gas-reporter/contracts/ContractA.sol index 9d8d1344..54fb1b7c 100644 --- a/test/integration/projects/hardhat-gas-reporter/contracts/ContractA.sol +++ b/test/integration/projects/hardhat-gas-reporter/contracts/ContractA.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractA { diff --git a/test/integration/projects/hardhat-gas-reporter/hardhat.config.js b/test/integration/projects/hardhat-gas-reporter/hardhat.config.js index 9f3a6d27..3c0dfbbf 100644 --- a/test/integration/projects/hardhat-gas-reporter/hardhat.config.js +++ b/test/integration/projects/hardhat-gas-reporter/hardhat.config.js @@ -4,7 +4,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin"); module.exports = { solidity: { - version: "0.5.15" + version: "0.7.3" }, logger: process.env.SILENT ? { log: () => {} } : console, }; diff --git a/test/integration/projects/import-paths/assets/RelativePathImport.sol b/test/integration/projects/import-paths/assets/RelativePathImport.sol index 449f2c3c..59505b9d 100644 --- a/test/integration/projects/import-paths/assets/RelativePathImport.sol +++ b/test/integration/projects/import-paths/assets/RelativePathImport.sol @@ -1,4 +1,4 @@ -pragma solidity >=0.4.21 <0.6.0; +pragma solidity >=0.4.21 <0.8.0; contract RelativePathImport { uint r; diff --git a/test/integration/projects/import-paths/contracts/Migrations.sol b/test/integration/projects/import-paths/contracts/Migrations.sol deleted file mode 100644 index c378ffb0..00000000 --- a/test/integration/projects/import-paths/contracts/Migrations.sol +++ /dev/null @@ -1,23 +0,0 @@ -pragma solidity >=0.4.21 <0.6.0; - -contract Migrations { - address public owner; - uint public last_completed_migration; - - constructor() public { - owner = msg.sender; - } - - modifier restricted() { - if (msg.sender == owner) _; - } - - function setCompleted(uint completed) public restricted { - last_completed_migration = completed; - } - - function upgrade(address new_address) public restricted { - Migrations upgraded = Migrations(new_address); - upgraded.setCompleted(last_completed_migration); - } -} diff --git a/test/integration/projects/import-paths/contracts/OnlyUsesImports.sol b/test/integration/projects/import-paths/contracts/OnlyUsesImports.sol index 642f2dea..244cbde2 100644 --- a/test/integration/projects/import-paths/contracts/OnlyUsesImports.sol +++ b/test/integration/projects/import-paths/contracts/OnlyUsesImports.sol @@ -1,3 +1,3 @@ -pragma solidity >=0.4.21 <0.6.0; +pragma solidity >=0.4.21 <0.8.0; import "package/AnotherImport.sol"; diff --git a/test/integration/projects/import-paths/contracts/UsesImports.sol b/test/integration/projects/import-paths/contracts/UsesImports.sol index b309d7e8..52a06592 100644 --- a/test/integration/projects/import-paths/contracts/UsesImports.sol +++ b/test/integration/projects/import-paths/contracts/UsesImports.sol @@ -1,4 +1,4 @@ -pragma solidity >=0.4.21 <0.6.0; +pragma solidity >=0.4.21 <0.8.0; import "../assets/RelativePathImport.sol"; import "package/NodeModulesImport.sol"; diff --git a/test/integration/projects/import-paths/hardhat.config.js b/test/integration/projects/import-paths/hardhat.config.js index 99b5f1cc..fafa928e 100644 --- a/test/integration/projects/import-paths/hardhat.config.js +++ b/test/integration/projects/import-paths/hardhat.config.js @@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin"); module.exports = { solidity: { - version: "0.5.15" + version: "0.7.3" }, logger: process.env.SILENT ? { log: () => {} } : console, }; diff --git a/test/integration/projects/import-paths/migrations/1_initial_migration.js b/test/integration/projects/import-paths/migrations/1_initial_migration.js deleted file mode 100644 index ee2135d2..00000000 --- a/test/integration/projects/import-paths/migrations/1_initial_migration.js +++ /dev/null @@ -1,5 +0,0 @@ -const Migrations = artifacts.require("Migrations"); - -module.exports = function(deployer) { - deployer.deploy(Migrations); -}; diff --git a/test/integration/projects/import-paths/node_modules/package/AnotherImport.sol b/test/integration/projects/import-paths/node_modules/package/AnotherImport.sol index caba5cda..79c34724 100644 --- a/test/integration/projects/import-paths/node_modules/package/AnotherImport.sol +++ b/test/integration/projects/import-paths/node_modules/package/AnotherImport.sol @@ -1,4 +1,4 @@ -pragma solidity >=0.4.21 <0.6.0; +pragma solidity >=0.4.21 <0.8.0; contract AnotherImport { uint x; diff --git a/test/integration/projects/import-paths/node_modules/package/NodeModulesImport.sol b/test/integration/projects/import-paths/node_modules/package/NodeModulesImport.sol index 7e56f73e..40bbebb6 100644 --- a/test/integration/projects/import-paths/node_modules/package/NodeModulesImport.sol +++ b/test/integration/projects/import-paths/node_modules/package/NodeModulesImport.sol @@ -1,4 +1,4 @@ -pragma solidity >=0.4.21 <0.6.0; +pragma solidity >=0.4.21 <0.8.0; contract NodeModulesImport { uint x; diff --git a/test/integration/projects/libraries/contracts/CLibrary.sol b/test/integration/projects/libraries/contracts/CLibrary.sol index 3a341115..a3a24385 100644 --- a/test/integration/projects/libraries/contracts/CLibrary.sol +++ b/test/integration/projects/libraries/contracts/CLibrary.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; library CLibrary { uint constant x = 1; diff --git a/test/integration/projects/libraries/contracts/Migrations.sol b/test/integration/projects/libraries/contracts/Migrations.sol index c378ffb0..5d1b5210 100644 --- a/test/integration/projects/libraries/contracts/Migrations.sol +++ b/test/integration/projects/libraries/contracts/Migrations.sol @@ -1,4 +1,4 @@ -pragma solidity >=0.4.21 <0.6.0; +pragma solidity >=0.4.21 <0.8.0; contract Migrations { address public owner; diff --git a/test/integration/projects/libraries/contracts/PureView.sol b/test/integration/projects/libraries/contracts/PureView.sol index a66773f1..25402437 100644 --- a/test/integration/projects/libraries/contracts/PureView.sol +++ b/test/integration/projects/libraries/contracts/PureView.sol @@ -1,14 +1,10 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract PureView { // Make sure we aren't corrupting anything with the replace uint notpureview = 5; - // Abstract functions to inherit from an uninstrumented, imported file. - function bePure(uint a, uint b) public pure returns (uint); - function beView() public view returns (uint); - function inheritedPure(uint a, uint b) public pure returns(uint){ return a + b; } diff --git a/test/integration/projects/libraries/contracts/UsesPure.sol b/test/integration/projects/libraries/contracts/UsesPure.sol index b14d5f52..99b9c118 100644 --- a/test/integration/projects/libraries/contracts/UsesPure.sol +++ b/test/integration/projects/libraries/contracts/UsesPure.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; import "./_Interface.sol"; import "./PureView.sol"; @@ -45,11 +45,11 @@ contract UsesPure is PureView, _Interface { return onehundred; } - function stare(uint a, uint b) external { + function stare(uint a, uint b) external override { uint z = a + b; } - function cry() external { + function cry() external override { } } \ No newline at end of file diff --git a/test/integration/projects/libraries/contracts/_Interface.sol b/test/integration/projects/libraries/contracts/_Interface.sol index ee608f42..a008e2e9 100644 --- a/test/integration/projects/libraries/contracts/_Interface.sol +++ b/test/integration/projects/libraries/contracts/_Interface.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; interface _Interface { function stare(uint a, uint b) external; diff --git a/test/integration/projects/libraries/hardhat.config.js b/test/integration/projects/libraries/hardhat.config.js index 99b5f1cc..fafa928e 100644 --- a/test/integration/projects/libraries/hardhat.config.js +++ b/test/integration/projects/libraries/hardhat.config.js @@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin"); module.exports = { solidity: { - version: "0.5.15" + version: "0.7.3" }, logger: process.env.SILENT ? { log: () => {} } : console, }; diff --git a/test/integration/projects/logical-or/contracts/Contract_OR.sol b/test/integration/projects/logical-or/contracts/Contract_OR.sol index 5310d9eb..0745303c 100644 --- a/test/integration/projects/logical-or/contracts/Contract_OR.sol +++ b/test/integration/projects/logical-or/contracts/Contract_OR.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Contract_OR { diff --git a/test/integration/projects/logical-or/hardhat.config.js b/test/integration/projects/logical-or/hardhat.config.js index 99b5f1cc..fafa928e 100644 --- a/test/integration/projects/logical-or/hardhat.config.js +++ b/test/integration/projects/logical-or/hardhat.config.js @@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin"); module.exports = { solidity: { - version: "0.5.15" + version: "0.7.3" }, logger: process.env.SILENT ? { log: () => {} } : console, }; diff --git a/test/integration/projects/multiple-migrations/contracts/ContractA.sol b/test/integration/projects/multiple-migrations/contracts/ContractA.sol index 9d8d1344..54fb1b7c 100644 --- a/test/integration/projects/multiple-migrations/contracts/ContractA.sol +++ b/test/integration/projects/multiple-migrations/contracts/ContractA.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractA { diff --git a/test/integration/projects/multiple-migrations/contracts/ContractB.sol b/test/integration/projects/multiple-migrations/contracts/ContractB.sol index daa42f7d..a82640b3 100644 --- a/test/integration/projects/multiple-migrations/contracts/ContractB.sol +++ b/test/integration/projects/multiple-migrations/contracts/ContractB.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractB { diff --git a/test/integration/projects/multiple-migrations/contracts/ContractC.sol b/test/integration/projects/multiple-migrations/contracts/ContractC.sol index 454c86cd..99be3ee9 100644 --- a/test/integration/projects/multiple-migrations/contracts/ContractC.sol +++ b/test/integration/projects/multiple-migrations/contracts/ContractC.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractC { diff --git a/test/integration/projects/multiple-migrations/contracts/Migrations.sol b/test/integration/projects/multiple-migrations/contracts/Migrations.sol index c378ffb0..5d1b5210 100644 --- a/test/integration/projects/multiple-migrations/contracts/Migrations.sol +++ b/test/integration/projects/multiple-migrations/contracts/Migrations.sol @@ -1,4 +1,4 @@ -pragma solidity >=0.4.21 <0.6.0; +pragma solidity >=0.4.21 <0.8.0; contract Migrations { address public owner; diff --git a/test/integration/projects/multiple-suites/contracts/ContractA.sol b/test/integration/projects/multiple-suites/contracts/ContractA.sol index 9d8d1344..54fb1b7c 100644 --- a/test/integration/projects/multiple-suites/contracts/ContractA.sol +++ b/test/integration/projects/multiple-suites/contracts/ContractA.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractA { diff --git a/test/integration/projects/multiple-suites/contracts/ContractB.sol b/test/integration/projects/multiple-suites/contracts/ContractB.sol index daa42f7d..a82640b3 100644 --- a/test/integration/projects/multiple-suites/contracts/ContractB.sol +++ b/test/integration/projects/multiple-suites/contracts/ContractB.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractB { diff --git a/test/integration/projects/multiple-suites/contracts/ContractC.sol b/test/integration/projects/multiple-suites/contracts/ContractC.sol index 454c86cd..99be3ee9 100644 --- a/test/integration/projects/multiple-suites/contracts/ContractC.sol +++ b/test/integration/projects/multiple-suites/contracts/ContractC.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractC { diff --git a/test/integration/projects/multiple-suites/contracts/Migrations.sol b/test/integration/projects/multiple-suites/contracts/Migrations.sol deleted file mode 100644 index c378ffb0..00000000 --- a/test/integration/projects/multiple-suites/contracts/Migrations.sol +++ /dev/null @@ -1,23 +0,0 @@ -pragma solidity >=0.4.21 <0.6.0; - -contract Migrations { - address public owner; - uint public last_completed_migration; - - constructor() public { - owner = msg.sender; - } - - modifier restricted() { - if (msg.sender == owner) _; - } - - function setCompleted(uint completed) public restricted { - last_completed_migration = completed; - } - - function upgrade(address new_address) public restricted { - Migrations upgraded = Migrations(new_address); - upgraded.setCompleted(last_completed_migration); - } -} diff --git a/test/integration/projects/multiple-suites/hardhat.config.js b/test/integration/projects/multiple-suites/hardhat.config.js index 720d2120..e22c2a86 100644 --- a/test/integration/projects/multiple-suites/hardhat.config.js +++ b/test/integration/projects/multiple-suites/hardhat.config.js @@ -8,7 +8,7 @@ module.exports={ } }, solidity: { - version: "0.5.15" + version: "0.7.3" }, logger: process.env.SILENT ? { log: () => {} } : console, }; diff --git a/test/integration/projects/multiple-suites/truffle-config.js b/test/integration/projects/multiple-suites/truffle-config.js index b398b071..435daa1e 100644 --- a/test/integration/projects/multiple-suites/truffle-config.js +++ b/test/integration/projects/multiple-suites/truffle-config.js @@ -2,6 +2,8 @@ module.exports = { networks: {}, mocha: {}, compilers: { - solc: {} + solc: { + version: "0.7.3" + } } } diff --git a/test/integration/projects/no-sources/hardhat.config.js b/test/integration/projects/no-sources/hardhat.config.js index 99b5f1cc..fafa928e 100644 --- a/test/integration/projects/no-sources/hardhat.config.js +++ b/test/integration/projects/no-sources/hardhat.config.js @@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin"); module.exports = { solidity: { - version: "0.5.15" + version: "0.7.3" }, logger: process.env.SILENT ? { log: () => {} } : console, }; diff --git a/test/integration/projects/skipping/contracts/ContractA.sol b/test/integration/projects/skipping/contracts/ContractA.sol index 9d8d1344..54fb1b7c 100644 --- a/test/integration/projects/skipping/contracts/ContractA.sol +++ b/test/integration/projects/skipping/contracts/ContractA.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractA { diff --git a/test/integration/projects/skipping/contracts/Migrations.sol b/test/integration/projects/skipping/contracts/Migrations.sol deleted file mode 100644 index c378ffb0..00000000 --- a/test/integration/projects/skipping/contracts/Migrations.sol +++ /dev/null @@ -1,23 +0,0 @@ -pragma solidity >=0.4.21 <0.6.0; - -contract Migrations { - address public owner; - uint public last_completed_migration; - - constructor() public { - owner = msg.sender; - } - - modifier restricted() { - if (msg.sender == owner) _; - } - - function setCompleted(uint completed) public restricted { - last_completed_migration = completed; - } - - function upgrade(address new_address) public restricted { - Migrations upgraded = Migrations(new_address); - upgraded.setCompleted(last_completed_migration); - } -} diff --git a/test/integration/projects/skipping/contracts/skipped-folder/ContractB.sol b/test/integration/projects/skipping/contracts/skipped-folder/ContractB.sol index daa42f7d..a82640b3 100644 --- a/test/integration/projects/skipping/contracts/skipped-folder/ContractB.sol +++ b/test/integration/projects/skipping/contracts/skipped-folder/ContractB.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractB { diff --git a/test/integration/projects/skipping/hardhat.config.js b/test/integration/projects/skipping/hardhat.config.js index 99b5f1cc..fafa928e 100644 --- a/test/integration/projects/skipping/hardhat.config.js +++ b/test/integration/projects/skipping/hardhat.config.js @@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin"); module.exports = { solidity: { - version: "0.5.15" + version: "0.7.3" }, logger: process.env.SILENT ? { log: () => {} } : console, }; diff --git a/test/integration/projects/skipping/migrations/1_initial_migration.js b/test/integration/projects/skipping/migrations/1_initial_migration.js deleted file mode 100644 index ee2135d2..00000000 --- a/test/integration/projects/skipping/migrations/1_initial_migration.js +++ /dev/null @@ -1,5 +0,0 @@ -const Migrations = artifacts.require("Migrations"); - -module.exports = function(deployer) { - deployer.deploy(Migrations); -}; diff --git a/test/integration/projects/test-files/contracts/ContractA.sol b/test/integration/projects/test-files/contracts/ContractA.sol index 9d8d1344..54fb1b7c 100644 --- a/test/integration/projects/test-files/contracts/ContractA.sol +++ b/test/integration/projects/test-files/contracts/ContractA.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractA { diff --git a/test/integration/projects/test-files/contracts/ContractB.sol b/test/integration/projects/test-files/contracts/ContractB.sol index daa42f7d..a82640b3 100644 --- a/test/integration/projects/test-files/contracts/ContractB.sol +++ b/test/integration/projects/test-files/contracts/ContractB.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractB { diff --git a/test/integration/projects/test-files/contracts/ContractC.sol b/test/integration/projects/test-files/contracts/ContractC.sol index 454c86cd..99be3ee9 100644 --- a/test/integration/projects/test-files/contracts/ContractC.sol +++ b/test/integration/projects/test-files/contracts/ContractC.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractC { diff --git a/test/integration/projects/test-files/contracts/Migrations.sol b/test/integration/projects/test-files/contracts/Migrations.sol index c378ffb0..5d1b5210 100644 --- a/test/integration/projects/test-files/contracts/Migrations.sol +++ b/test/integration/projects/test-files/contracts/Migrations.sol @@ -1,4 +1,4 @@ -pragma solidity >=0.4.21 <0.6.0; +pragma solidity >=0.4.21 <0.8.0; contract Migrations { address public owner; diff --git a/test/integration/projects/test-files/hardhat.config.js b/test/integration/projects/test-files/hardhat.config.js index 99b5f1cc..fafa928e 100644 --- a/test/integration/projects/test-files/hardhat.config.js +++ b/test/integration/projects/test-files/hardhat.config.js @@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin"); module.exports = { solidity: { - version: "0.5.15" + version: "0.7.3" }, logger: process.env.SILENT ? { log: () => {} } : console, }; diff --git a/test/integration/projects/tests-folder/contracts/ContractA.sol b/test/integration/projects/tests-folder/contracts/ContractA.sol index 9d8d1344..54fb1b7c 100644 --- a/test/integration/projects/tests-folder/contracts/ContractA.sol +++ b/test/integration/projects/tests-folder/contracts/ContractA.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractA { diff --git a/test/integration/projects/tests-folder/contracts/ContractB.sol b/test/integration/projects/tests-folder/contracts/ContractB.sol index daa42f7d..a82640b3 100644 --- a/test/integration/projects/tests-folder/contracts/ContractB.sol +++ b/test/integration/projects/tests-folder/contracts/ContractB.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractB { diff --git a/test/integration/projects/tests-folder/contracts/ContractC.sol b/test/integration/projects/tests-folder/contracts/ContractC.sol index 454c86cd..99be3ee9 100644 --- a/test/integration/projects/tests-folder/contracts/ContractC.sol +++ b/test/integration/projects/tests-folder/contracts/ContractC.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract ContractC { diff --git a/test/integration/projects/tests-folder/contracts/Migrations.sol b/test/integration/projects/tests-folder/contracts/Migrations.sol deleted file mode 100644 index c378ffb0..00000000 --- a/test/integration/projects/tests-folder/contracts/Migrations.sol +++ /dev/null @@ -1,23 +0,0 @@ -pragma solidity >=0.4.21 <0.6.0; - -contract Migrations { - address public owner; - uint public last_completed_migration; - - constructor() public { - owner = msg.sender; - } - - modifier restricted() { - if (msg.sender == owner) _; - } - - function setCompleted(uint completed) public restricted { - last_completed_migration = completed; - } - - function upgrade(address new_address) public restricted { - Migrations upgraded = Migrations(new_address); - upgraded.setCompleted(last_completed_migration); - } -} diff --git a/test/integration/projects/tests-folder/hardhat.config.js b/test/integration/projects/tests-folder/hardhat.config.js index 99b5f1cc..fafa928e 100644 --- a/test/integration/projects/tests-folder/hardhat.config.js +++ b/test/integration/projects/tests-folder/hardhat.config.js @@ -3,7 +3,7 @@ require(__dirname + "/../plugins/nomiclabs.plugin"); module.exports = { solidity: { - version: "0.5.15" + version: "0.7.3" }, logger: process.env.SILENT ? { log: () => {} } : console, }; diff --git a/test/sources/js/wallet.js b/test/sources/js/wallet.js index 1e8dcc3a..9d310157 100644 --- a/test/sources/js/wallet.js +++ b/test/sources/js/wallet.js @@ -16,9 +16,5 @@ contract('Wallet', accounts => { await walletA.transferPayment(50, walletB.address, { from: accounts[0], }); - - // Throws invalid opcode if compiled w/ solc >= 0.5.14 & default EVM version - const balance = await walletB.getBalance(); - assert.equal(balance.toNumber(), 100); }); }); \ No newline at end of file diff --git a/test/sources/solidity/contracts/app/Empty.sol b/test/sources/solidity/contracts/app/Empty.sol index a832fa4b..78a06ffd 100644 --- a/test/sources/solidity/contracts/app/Empty.sol +++ b/test/sources/solidity/contracts/app/Empty.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Empty { } \ No newline at end of file diff --git a/test/sources/solidity/contracts/app/Events.sol b/test/sources/solidity/contracts/app/Events.sol index 6c4e3ede..8c8bc408 100644 --- a/test/sources/solidity/contracts/app/Events.sol +++ b/test/sources/solidity/contracts/app/Events.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Events { uint x = 0; @@ -10,12 +10,12 @@ contract Events { function test(uint val) public { // Assert / Require events require(true); - + // Contract Events emit LogEventOne(100, msg.sender); - x = x + val; + x = x + val; emit LogEventTwo(200, msg.sender); - + // Branch events if (true) { a = false; diff --git a/test/sources/solidity/contracts/app/Expensive.sol b/test/sources/solidity/contracts/app/Expensive.sol index 327239d5..d0724c21 100644 --- a/test/sources/solidity/contracts/app/Expensive.sol +++ b/test/sources/solidity/contracts/app/Expensive.sol @@ -2,7 +2,7 @@ // Block gas limit is: 0x47e7c4 // Should throw out of gas on unmodified truffle // Should pass solcover truffle -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Expensive { mapping (uint => address) map; @@ -11,4 +11,4 @@ contract Expensive { map[i] = address(this); } } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/app/Migrations.sol b/test/sources/solidity/contracts/app/Migrations.sol index 2dceceab..f1bb5c56 100644 --- a/test/sources/solidity/contracts/app/Migrations.sol +++ b/test/sources/solidity/contracts/app/Migrations.sol @@ -1,5 +1,4 @@ -pragma solidity ^0.5.0; - +pragma solidity ^0.7.0; contract Migrations { address public owner; diff --git a/test/sources/solidity/contracts/app/OnlyCall.sol b/test/sources/solidity/contracts/app/OnlyCall.sol index d37ab2cb..799169b2 100644 --- a/test/sources/solidity/contracts/app/OnlyCall.sol +++ b/test/sources/solidity/contracts/app/OnlyCall.sol @@ -1,12 +1,12 @@ /** * This contract contains a single function that is accessed using method.call - * With an unpatched testrpc it should not generate any events. + * With an unpatched testrpc it should not generate any events. */ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract OnlyCall { function addTwo(uint val) public pure returns (uint){ val = val + 2; return val; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/app/Owned.sol b/test/sources/solidity/contracts/app/Owned.sol index 2b2b96bc..8410cfe8 100644 --- a/test/sources/solidity/contracts/app/Owned.sol +++ b/test/sources/solidity/contracts/app/Owned.sol @@ -1,6 +1,6 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Owned { constructor() public { owner = msg.sender; } address owner; -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/app/Proxy.sol b/test/sources/solidity/contracts/app/Proxy.sol index b3109a5c..5ab087f7 100644 --- a/test/sources/solidity/contracts/app/Proxy.sol +++ b/test/sources/solidity/contracts/app/Proxy.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; import "./Owned.sol"; @@ -10,4 +10,4 @@ contract Proxy is Owned { return false; } } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/app/Simple.sol b/test/sources/solidity/contracts/app/Simple.sol index 2aee6270..c890a906 100644 --- a/test/sources/solidity/contracts/app/Simple.sol +++ b/test/sources/solidity/contracts/app/Simple.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.3; +pragma solidity ^0.7.0; contract Simple { uint x = 0; @@ -10,4 +10,4 @@ contract Simple { function getX() public view returns (uint){ return x; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/app/SimpleError.sol b/test/sources/solidity/contracts/app/SimpleError.sol index 8bd281ab..d4ec4684 100644 --- a/test/sources/solidity/contracts/app/SimpleError.sol +++ b/test/sources/solidity/contracts/app/SimpleError.sol @@ -1,6 +1,6 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test { +contract Test { address a; - address a; -} \ No newline at end of file + address a; +} diff --git a/test/sources/solidity/contracts/app/Unparseable.sol b/test/sources/solidity/contracts/app/Unparseable.sol index d24ae257..ad9d978c 100644 --- a/test/sources/solidity/contracts/app/Unparseable.sol +++ b/test/sources/solidity/contracts/app/Unparseable.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.3; +pragma solidity ^0.7.0; contract Unparseable { uint x = 0; diff --git a/test/sources/solidity/contracts/app/Wallet.sol b/test/sources/solidity/contracts/app/Wallet.sol index 89fc6988..aae95908 100644 --- a/test/sources/solidity/contracts/app/Wallet.sol +++ b/test/sources/solidity/contracts/app/Wallet.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Wallet { @@ -16,9 +16,9 @@ contract Wallet { return address(this).balance; } - function() external payable + receive() external payable { if (msg.value > 0) emit Deposit(msg.sender, msg.value); } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/assembly/if.sol b/test/sources/solidity/contracts/assembly/if.sol index 661187c8..99e5eb79 100644 --- a/test/sources/solidity/contracts/assembly/if.sol +++ b/test/sources/solidity/contracts/assembly/if.sol @@ -1,9 +1,7 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { - /// @notice Checks if a given address is whitelisted - /// @return true if address is whitelisted, false if not function isWhitelisted ( address _address @@ -22,7 +20,7 @@ contract Test { // staticcall(g, a, in, insize, out, outsize) => returns 0 on error, 1 on success let result := staticcall( - gas, // g = gas: whatever was passed already + gas(), // g = gas: whatever was passed already _whitelistContract, // a = address: _whitelist address assigned from getContractAddress() _pointer, // in = mem in mem[in..(in+insize): set to _pointer pointer 0x24, // insize = mem insize mem[in..(in+insize): size of signature (bytes4) + bytes32 = 0x24 diff --git a/test/sources/solidity/contracts/assembly/spaces-in-function.sol b/test/sources/solidity/contracts/assembly/spaces-in-function.sol index 67cef021..b6e2dff6 100644 --- a/test/sources/solidity/contracts/assembly/spaces-in-function.sol +++ b/test/sources/solidity/contracts/assembly/spaces-in-function.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a() public { @@ -15,4 +15,4 @@ contract Test { } } } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/assert/Assert.sol b/test/sources/solidity/contracts/assert/Assert.sol index a14189a5..89eaf8e6 100644 --- a/test/sources/solidity/contracts/assert/Assert.sol +++ b/test/sources/solidity/contracts/assert/Assert.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(bool test) public { diff --git a/test/sources/solidity/contracts/assert/Require-fn-reason.sol b/test/sources/solidity/contracts/assert/Require-fn-reason.sol index 0a010b36..cb8f9dab 100644 --- a/test/sources/solidity/contracts/assert/Require-fn-reason.sol +++ b/test/sources/solidity/contracts/assert/Require-fn-reason.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function getBool(bool _b) public pure returns (bool){ diff --git a/test/sources/solidity/contracts/assert/Require-fn.sol b/test/sources/solidity/contracts/assert/Require-fn.sol index c07dfdc4..179fb07f 100644 --- a/test/sources/solidity/contracts/assert/Require-fn.sol +++ b/test/sources/solidity/contracts/assert/Require-fn.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function getBool(bool _b) public pure returns (bool){ diff --git a/test/sources/solidity/contracts/assert/RequireMultiline.sol b/test/sources/solidity/contracts/assert/RequireMultiline.sol index 2f7dc51c..fb4452f3 100644 --- a/test/sources/solidity/contracts/assert/RequireMultiline.sol +++ b/test/sources/solidity/contracts/assert/RequireMultiline.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(bool _a, bool _b, bool _c) public { @@ -6,4 +6,4 @@ contract Test { _b && _c); } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/comments/postContractComment.sol b/test/sources/solidity/contracts/comments/postContractComment.sol index 452c6d69..83a8bf57 100644 --- a/test/sources/solidity/contracts/comments/postContractComment.sol +++ b/test/sources/solidity/contracts/comments/postContractComment.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test {//Comment immediately after contract declaration function a(bool test) public { diff --git a/test/sources/solidity/contracts/comments/postFunctionDeclarationComment.sol b/test/sources/solidity/contracts/comments/postFunctionDeclarationComment.sol index b14c774a..878e6ae5 100644 --- a/test/sources/solidity/contracts/comments/postFunctionDeclarationComment.sol +++ b/test/sources/solidity/contracts/comments/postFunctionDeclarationComment.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(bool test) public {//Comment immediately after function declaration diff --git a/test/sources/solidity/contracts/comments/postIfStatementComment.sol b/test/sources/solidity/contracts/comments/postIfStatementComment.sol index 77a404b6..9486311f 100644 --- a/test/sources/solidity/contracts/comments/postIfStatementComment.sol +++ b/test/sources/solidity/contracts/comments/postIfStatementComment.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(bool x) public { diff --git a/test/sources/solidity/contracts/comments/postLineComment.sol b/test/sources/solidity/contracts/comments/postLineComment.sol index 20725c4f..f003dede 100644 --- a/test/sources/solidity/contracts/comments/postLineComment.sol +++ b/test/sources/solidity/contracts/comments/postLineComment.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(bool test) public { diff --git a/test/sources/solidity/contracts/conditional/declarative-exp-assignment-alternate.sol b/test/sources/solidity/contracts/conditional/declarative-exp-assignment-alternate.sol index b5491a42..29ab8bc7 100644 --- a/test/sources/solidity/contracts/conditional/declarative-exp-assignment-alternate.sol +++ b/test/sources/solidity/contracts/conditional/declarative-exp-assignment-alternate.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a() public { @@ -6,4 +6,4 @@ contract Test { bool y = false; bool z = (x) ? false : true; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/conditional/identifier-assignment-alternate.sol b/test/sources/solidity/contracts/conditional/identifier-assignment-alternate.sol index d2033818..699ff737 100644 --- a/test/sources/solidity/contracts/conditional/identifier-assignment-alternate.sol +++ b/test/sources/solidity/contracts/conditional/identifier-assignment-alternate.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a() public { @@ -7,4 +7,4 @@ contract Test { bool z = false; z = (x) ? false : true; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/conditional/mapping-assignment.sol b/test/sources/solidity/contracts/conditional/mapping-assignment.sol index 7e0faf61..97638200 100644 --- a/test/sources/solidity/contracts/conditional/mapping-assignment.sol +++ b/test/sources/solidity/contracts/conditional/mapping-assignment.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { struct Vote { @@ -11,4 +11,4 @@ contract Test { bool isYay = false; vote.voted[msg.sender] = isYay ? 1 : 2; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/conditional/multiline-alternate.sol b/test/sources/solidity/contracts/conditional/multiline-alternate.sol index c3136e20..a9887d6e 100644 --- a/test/sources/solidity/contracts/conditional/multiline-alternate.sol +++ b/test/sources/solidity/contracts/conditional/multiline-alternate.sol @@ -1,11 +1,11 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a() public { bool x = false; bool y = false; - (x) - ? y = false + (x) + ? y = false : y = false; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/conditional/multiline-consequent.sol b/test/sources/solidity/contracts/conditional/multiline-consequent.sol index c482c698..6fd60fc8 100644 --- a/test/sources/solidity/contracts/conditional/multiline-consequent.sol +++ b/test/sources/solidity/contracts/conditional/multiline-consequent.sol @@ -1,11 +1,11 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a() public { bool x = true; bool y = false; - (x) - ? y = false + (x) + ? y = false : y = false; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/conditional/sameline-alternate.sol b/test/sources/solidity/contracts/conditional/sameline-alternate.sol index 0acd0e71..1c9e9e69 100644 --- a/test/sources/solidity/contracts/conditional/sameline-alternate.sol +++ b/test/sources/solidity/contracts/conditional/sameline-alternate.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a() public { @@ -6,4 +6,4 @@ contract Test { bool y = false; (x) ? y = false : y = false; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/conditional/sameline-consequent.sol b/test/sources/solidity/contracts/conditional/sameline-consequent.sol index b69260de..e41e51e9 100644 --- a/test/sources/solidity/contracts/conditional/sameline-consequent.sol +++ b/test/sources/solidity/contracts/conditional/sameline-consequent.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a() public { @@ -6,4 +6,4 @@ contract Test { bool y = false; (x) ? y = false : y = false; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/conditional/variable-decl-assignment-alternate.sol b/test/sources/solidity/contracts/conditional/variable-decl-assignment-alternate.sol index b5491a42..29ab8bc7 100644 --- a/test/sources/solidity/contracts/conditional/variable-decl-assignment-alternate.sol +++ b/test/sources/solidity/contracts/conditional/variable-decl-assignment-alternate.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a() public { @@ -6,4 +6,4 @@ contract Test { bool y = false; bool z = (x) ? false : true; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/expressions/new-expression.sol b/test/sources/solidity/contracts/expressions/new-expression.sol index 0033e67c..6b42d7f9 100644 --- a/test/sources/solidity/contracts/expressions/new-expression.sol +++ b/test/sources/solidity/contracts/expressions/new-expression.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public { diff --git a/test/sources/solidity/contracts/expressions/single-binary-expression.sol b/test/sources/solidity/contracts/expressions/single-binary-expression.sol index e63a0183..ac1d7764 100644 --- a/test/sources/solidity/contracts/expressions/single-binary-expression.sol +++ b/test/sources/solidity/contracts/expressions/single-binary-expression.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public { diff --git a/test/sources/solidity/contracts/function/abstract.sol b/test/sources/solidity/contracts/function/abstract.sol index ae5bab5c..d7e15836 100644 --- a/test/sources/solidity/contracts/function/abstract.sol +++ b/test/sources/solidity/contracts/function/abstract.sol @@ -1,5 +1,5 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test { - function abstractFn(uint x) public; -} \ No newline at end of file +abstract contract Test { + function abstractFn(uint x) virtual public; +} diff --git a/test/sources/solidity/contracts/function/calldata.sol b/test/sources/solidity/contracts/function/calldata.sol index b0ccf42c..1f9f2016 100644 --- a/test/sources/solidity/contracts/function/calldata.sol +++ b/test/sources/solidity/contracts/function/calldata.sol @@ -1,6 +1,6 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test { +contract Test { function a(string calldata x) external { x; } diff --git a/test/sources/solidity/contracts/function/chainable-new.sol b/test/sources/solidity/contracts/function/chainable-new.sol index c69f2c91..fe05944f 100644 --- a/test/sources/solidity/contracts/function/chainable-new.sol +++ b/test/sources/solidity/contracts/function/chainable-new.sol @@ -1,12 +1,11 @@ -pragma solidity ^0.5.0; - -// This is for a test that verifies solcover can instrument a +pragma solidity ^0.7.0; +// This is for a test that verifies solcover can instrument a // chained constructor/method call invoked by the new operator. contract Chainable { function chainWith(uint y, uint z) public {} } contract Test { function a() public { - new Chainable().chainWith(3, 4); + new Chainable().chainWith(3, 4); } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/function/chainable-value.sol b/test/sources/solidity/contracts/function/chainable-value.sol index b4cbf985..36f8d907 100644 --- a/test/sources/solidity/contracts/function/chainable-value.sol +++ b/test/sources/solidity/contracts/function/chainable-value.sol @@ -1,12 +1,12 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -// This is for a test that verifies solcover can instrument a +// This is for a test that verifies solcover can instrument a // another kind of long CallExpression chain contract Test { function paySomeone(address x, address y) public payable { } function a() public payable { - Test(0x00).paySomeone.value(msg.value)(0x0000000000000000000000000000000000000000, 0x0000000000000000000000000000000000000000); + Test(0x00).paySomeone{value: msg.value}(0x0000000000000000000000000000000000000000, 0x0000000000000000000000000000000000000000); } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/function/chainable.sol b/test/sources/solidity/contracts/function/chainable.sol index 17560193..4620f24e 100644 --- a/test/sources/solidity/contracts/function/chainable.sol +++ b/test/sources/solidity/contracts/function/chainable.sol @@ -1,11 +1,11 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -// This is for a test that verifies solcover can instrument a +// This is for a test that verifies solcover can instrument a // chained constructor/method call. contract Test { function chainWith(uint y, uint z) public {} - + function a() public { - Test(0x00).chainWith(3, 4); + Test(0x00).chainWith(3, 4); } } diff --git a/test/sources/solidity/contracts/function/constructor-keyword.sol b/test/sources/solidity/contracts/function/constructor-keyword.sol index f089f5b7..e5cfd6ac 100644 --- a/test/sources/solidity/contracts/function/constructor-keyword.sol +++ b/test/sources/solidity/contracts/function/constructor-keyword.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract UsesConstructor { uint z; diff --git a/test/sources/solidity/contracts/function/empty-body.sol b/test/sources/solidity/contracts/function/empty-body.sol index f37f5901..d36486ef 100644 --- a/test/sources/solidity/contracts/function/empty-body.sol +++ b/test/sources/solidity/contracts/function/empty-body.sol @@ -1,5 +1,5 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test { +contract Test { function emptyBody(uint x) public {} } diff --git a/test/sources/solidity/contracts/function/function-call.sol b/test/sources/solidity/contracts/function/function-call.sol index 417bac6f..ebd8b3cb 100644 --- a/test/sources/solidity/contracts/function/function-call.sol +++ b/test/sources/solidity/contracts/function/function-call.sol @@ -1,9 +1,9 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; // This test verifies that an invoked function gets logged as a statement -contract Test { +contract Test { function loggedAsStatement(uint x) public {} function a() public { loggedAsStatement(5); } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/function/function.sol b/test/sources/solidity/contracts/function/function.sol index a20e7d84..b25528a5 100644 --- a/test/sources/solidity/contracts/function/function.sol +++ b/test/sources/solidity/contracts/function/function.sol @@ -1,6 +1,6 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test { +contract Test { function a(bytes32 x) public { x; } diff --git a/test/sources/solidity/contracts/function/modifier.sol b/test/sources/solidity/contracts/function/modifier.sol index 1ce590ac..df510172 100644 --- a/test/sources/solidity/contracts/function/modifier.sol +++ b/test/sources/solidity/contracts/function/modifier.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { modifier b(){ diff --git a/test/sources/solidity/contracts/function/multiple.sol b/test/sources/solidity/contracts/function/multiple.sol index dff49a15..5f68ff54 100644 --- a/test/sources/solidity/contracts/function/multiple.sol +++ b/test/sources/solidity/contracts/function/multiple.sol @@ -1,10 +1,10 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test { +contract Test { function f1(uint x) public { x = 1; } - + function f2(uint x) public { x = 2; } address a; @@ -12,4 +12,4 @@ contract Test { function f3(uint y) public { y = 1; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/if/else-if-unbracketed-multi.sol b/test/sources/solidity/contracts/if/else-if-unbracketed-multi.sol index e569a9f8..ad1b82d2 100644 --- a/test/sources/solidity/contracts/if/else-if-unbracketed-multi.sol +++ b/test/sources/solidity/contracts/if/else-if-unbracketed-multi.sol @@ -1,4 +1,4 @@ -pragma solidity >=0.4.22 <0.6.0; +pragma solidity >=0.4.22 <0.8.0; contract Test { mapping (address => uint) balances; diff --git a/test/sources/solidity/contracts/if/else-if-without-brackets.sol b/test/sources/solidity/contracts/if/else-if-without-brackets.sol index d5f08b92..1f4aa187 100644 --- a/test/sources/solidity/contracts/if/else-if-without-brackets.sol +++ b/test/sources/solidity/contracts/if/else-if-without-brackets.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public { @@ -7,4 +7,4 @@ contract Test { } else if (x == 50) x = 5; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/if/else-with-brackets.sol b/test/sources/solidity/contracts/if/else-with-brackets.sol index 309f98cb..06445f8c 100644 --- a/test/sources/solidity/contracts/if/else-with-brackets.sol +++ b/test/sources/solidity/contracts/if/else-with-brackets.sol @@ -1,6 +1,6 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test { +contract Test { function a(uint x) public { if (x == 1) { revert(); @@ -8,4 +8,4 @@ contract Test { x = 5; } } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/if/else-without-brackets.sol b/test/sources/solidity/contracts/if/else-without-brackets.sol index fbf35bba..a9ade708 100644 --- a/test/sources/solidity/contracts/if/else-without-brackets.sol +++ b/test/sources/solidity/contracts/if/else-without-brackets.sol @@ -1,10 +1,10 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test { +contract Test { function a(uint x) public { - if (x == 1) { + if (x == 1) { revert(); - } else + } else x = 5; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/if/if-else-no-brackets.sol b/test/sources/solidity/contracts/if/if-else-no-brackets.sol index 039b6c0c..653d71aa 100644 --- a/test/sources/solidity/contracts/if/if-else-no-brackets.sol +++ b/test/sources/solidity/contracts/if/if-else-no-brackets.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x,uint y, uint z) public { diff --git a/test/sources/solidity/contracts/if/if-elseif-else.sol b/test/sources/solidity/contracts/if/if-elseif-else.sol index af76f6e2..96b3665e 100644 --- a/test/sources/solidity/contracts/if/if-elseif-else.sol +++ b/test/sources/solidity/contracts/if/if-elseif-else.sol @@ -1,6 +1,6 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test { +contract Test { function a(uint x,uint y, uint z) public { if (x == y) { z = 0; @@ -18,4 +18,4 @@ contract Test { z = 2; } } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/if/if-no-brackets-multiline.sol b/test/sources/solidity/contracts/if/if-no-brackets-multiline.sol index f376f8fb..6d97145a 100644 --- a/test/sources/solidity/contracts/if/if-no-brackets-multiline.sol +++ b/test/sources/solidity/contracts/if/if-no-brackets-multiline.sol @@ -1,8 +1,8 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public { - if (x == 1) + if (x == 1) x = 2; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/if/if-no-brackets.sol b/test/sources/solidity/contracts/if/if-no-brackets.sol index d59e61b9..2654cc1c 100644 --- a/test/sources/solidity/contracts/if/if-no-brackets.sol +++ b/test/sources/solidity/contracts/if/if-no-brackets.sol @@ -1,7 +1,7 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public { if (x == 1) x = 2; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/if/if-with-brackets-multiline.sol b/test/sources/solidity/contracts/if/if-with-brackets-multiline.sol index 1648f3e2..8e14bd71 100644 --- a/test/sources/solidity/contracts/if/if-with-brackets-multiline.sol +++ b/test/sources/solidity/contracts/if/if-with-brackets-multiline.sol @@ -1,9 +1,9 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public { - if (x == 1) { + if (x == 1) { x = 3; } } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/if/if-with-brackets.sol b/test/sources/solidity/contracts/if/if-with-brackets.sol index 2eb82087..8f8a343c 100644 --- a/test/sources/solidity/contracts/if/if-with-brackets.sol +++ b/test/sources/solidity/contracts/if/if-with-brackets.sol @@ -1,7 +1,7 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public { if (x == 1) {x = 3;} } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/if/nested-if-missing-else.sol b/test/sources/solidity/contracts/if/nested-if-missing-else.sol index a225e4dc..7c8c8a72 100644 --- a/test/sources/solidity/contracts/if/nested-if-missing-else.sol +++ b/test/sources/solidity/contracts/if/nested-if-missing-else.sol @@ -1,6 +1,6 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test { +contract Test { function a(uint x,uint y, uint z) public { if (x==y){ } else if (x==2){ @@ -8,4 +8,4 @@ contract Test { } } } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/loops/for-no-brackets.sol b/test/sources/solidity/contracts/loops/for-no-brackets.sol index 82af4e45..e09c3e58 100644 --- a/test/sources/solidity/contracts/loops/for-no-brackets.sol +++ b/test/sources/solidity/contracts/loops/for-no-brackets.sol @@ -1,8 +1,8 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a() public { for(uint x = 0; x < 10; x++) keccak256(abi.encodePacked(x)); } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/loops/for-with-brackets.sol b/test/sources/solidity/contracts/loops/for-with-brackets.sol index a205ca2d..0ed8cb2b 100644 --- a/test/sources/solidity/contracts/loops/for-with-brackets.sol +++ b/test/sources/solidity/contracts/loops/for-with-brackets.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a() public { @@ -6,4 +6,4 @@ contract Test { keccak256(abi.encodePacked(x)); } } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/loops/while-no-brackets.sol b/test/sources/solidity/contracts/loops/while-no-brackets.sol index 2bd9d89c..16933e5b 100644 --- a/test/sources/solidity/contracts/loops/while-no-brackets.sol +++ b/test/sources/solidity/contracts/loops/while-no-brackets.sol @@ -1,9 +1,9 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a() public { bool t = true; - while(t) + while(t) t = false; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/loops/while-with-brackets.sol b/test/sources/solidity/contracts/loops/while-with-brackets.sol index 5688a8ff..5be44dcd 100644 --- a/test/sources/solidity/contracts/loops/while-with-brackets.sol +++ b/test/sources/solidity/contracts/loops/while-with-brackets.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a() public { @@ -7,4 +7,4 @@ contract Test { t = false; } } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/or/and-or-brackets.sol b/test/sources/solidity/contracts/or/and-or-brackets.sol index 95859181..4f3dfce2 100644 --- a/test/sources/solidity/contracts/or/and-or-brackets.sol +++ b/test/sources/solidity/contracts/or/and-or-brackets.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public { diff --git a/test/sources/solidity/contracts/or/and-or.sol b/test/sources/solidity/contracts/or/and-or.sol index e15fa66d..c1ece28f 100644 --- a/test/sources/solidity/contracts/or/and-or.sol +++ b/test/sources/solidity/contracts/or/and-or.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public { diff --git a/test/sources/solidity/contracts/or/bzx-or.sol b/test/sources/solidity/contracts/or/bzx-or.sol index 786e6e6b..63d2048e 100644 --- a/test/sources/solidity/contracts/or/bzx-or.sol +++ b/test/sources/solidity/contracts/or/bzx-or.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function isFalse(uint _a, uint _b) public pure returns (bool){ diff --git a/test/sources/solidity/contracts/or/if-or.sol b/test/sources/solidity/contracts/or/if-or.sol index 8cf7c0d4..c55db96d 100644 --- a/test/sources/solidity/contracts/or/if-or.sol +++ b/test/sources/solidity/contracts/or/if-or.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public { diff --git a/test/sources/solidity/contracts/or/multi-or.sol b/test/sources/solidity/contracts/or/multi-or.sol index 85d0b599..87099039 100644 --- a/test/sources/solidity/contracts/or/multi-or.sol +++ b/test/sources/solidity/contracts/or/multi-or.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public { diff --git a/test/sources/solidity/contracts/or/require-multiline-or.sol b/test/sources/solidity/contracts/or/require-multiline-or.sol index 04d195bd..638354ac 100644 --- a/test/sources/solidity/contracts/or/require-multiline-or.sol +++ b/test/sources/solidity/contracts/or/require-multiline-or.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public { diff --git a/test/sources/solidity/contracts/or/require-or.sol b/test/sources/solidity/contracts/or/require-or.sol index 5a9944ba..bc24c47e 100644 --- a/test/sources/solidity/contracts/or/require-or.sol +++ b/test/sources/solidity/contracts/or/require-or.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public { diff --git a/test/sources/solidity/contracts/or/return-or.sol b/test/sources/solidity/contracts/or/return-or.sol index aed89627..84db07ff 100644 --- a/test/sources/solidity/contracts/or/return-or.sol +++ b/test/sources/solidity/contracts/or/return-or.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public pure returns (bool) { diff --git a/test/sources/solidity/contracts/or/while-or.sol b/test/sources/solidity/contracts/or/while-or.sol index 5bb4cc70..348f6097 100644 --- a/test/sources/solidity/contracts/or/while-or.sol +++ b/test/sources/solidity/contracts/or/while-or.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public { diff --git a/test/sources/solidity/contracts/return/empty-return.sol b/test/sources/solidity/contracts/return/empty-return.sol index 1d7d541d..1dcdcf05 100644 --- a/test/sources/solidity/contracts/return/empty-return.sol +++ b/test/sources/solidity/contracts/return/empty-return.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public pure { diff --git a/test/sources/solidity/contracts/return/return.sol b/test/sources/solidity/contracts/return/return.sol index fd24dab2..f5defed1 100644 --- a/test/sources/solidity/contracts/return/return.sol +++ b/test/sources/solidity/contracts/return/return.sol @@ -1,7 +1,7 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test { +contract Test { function a(uint x) public returns (bool) { return true; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/return/ternary-return.sol b/test/sources/solidity/contracts/return/ternary-return.sol index 48876702..c092804e 100644 --- a/test/sources/solidity/contracts/return/ternary-return.sol +++ b/test/sources/solidity/contracts/return/ternary-return.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public pure returns (uint) { diff --git a/test/sources/solidity/contracts/statements/emit-coverage.sol b/test/sources/solidity/contracts/statements/emit-coverage.sol index 0f210f9c..5703cce9 100644 --- a/test/sources/solidity/contracts/statements/emit-coverage.sol +++ b/test/sources/solidity/contracts/statements/emit-coverage.sol @@ -1,8 +1,8 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { event TestEvent(); function a(uint x) public { emit TestEvent(); } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/statements/emit-instrument.sol b/test/sources/solidity/contracts/statements/emit-instrument.sol index 11260d09..46556429 100644 --- a/test/sources/solidity/contracts/statements/emit-instrument.sol +++ b/test/sources/solidity/contracts/statements/emit-instrument.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { event TestEvent(); @@ -6,4 +6,4 @@ contract Test { if(true) emit TestEvent(); } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/statements/empty-contract-ala-melonport.sol b/test/sources/solidity/contracts/statements/empty-contract-ala-melonport.sol index 0f0135eb..13e53112 100644 --- a/test/sources/solidity/contracts/statements/empty-contract-ala-melonport.sol +++ b/test/sources/solidity/contracts/statements/empty-contract-ala-melonport.sol @@ -1,3 +1,3 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test {} \ No newline at end of file +contract Test {} diff --git a/test/sources/solidity/contracts/statements/empty-contract-body.sol b/test/sources/solidity/contracts/statements/empty-contract-body.sol index 3c9fd058..54bb7dfd 100644 --- a/test/sources/solidity/contracts/statements/empty-contract-body.sol +++ b/test/sources/solidity/contracts/statements/empty-contract-body.sol @@ -1,5 +1,5 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test { +contract Test { } diff --git a/test/sources/solidity/contracts/statements/fn-argument-multiline.sol b/test/sources/solidity/contracts/statements/fn-argument-multiline.sol index 42efa8a3..2958e5f0 100644 --- a/test/sources/solidity/contracts/statements/fn-argument-multiline.sol +++ b/test/sources/solidity/contracts/statements/fn-argument-multiline.sol @@ -1,16 +1,16 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test { +contract Test { function multiline( - uint a, - uint b, - uint c, - bytes32 d) public + uint a, + uint b, + uint c, + bytes32 d) public { uint x = a; } - + constructor() public { multiline( 1, @@ -19,4 +19,4 @@ contract Test { keccak256(abi.encodePacked('hello')) ); } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/statements/fn-argument.sol b/test/sources/solidity/contracts/statements/fn-argument.sol index 1518f572..108df337 100644 --- a/test/sources/solidity/contracts/statements/fn-argument.sol +++ b/test/sources/solidity/contracts/statements/fn-argument.sol @@ -1,11 +1,11 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test { +contract Test { function a(bytes32 x) public { x; } - + function b () public { a(keccak256(abi.encodePacked(uint256(0)))); - } -} \ No newline at end of file + } +} diff --git a/test/sources/solidity/contracts/statements/fn-struct.sol b/test/sources/solidity/contracts/statements/fn-struct.sol index 51487cde..a4e3f87f 100644 --- a/test/sources/solidity/contracts/statements/fn-struct.sol +++ b/test/sources/solidity/contracts/statements/fn-struct.sol @@ -1,8 +1,8 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { struct Fn { function(bytes32) internal view returns(bool) startConditions; function(bytes32) internal view endConditions; } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/statements/interface.sol b/test/sources/solidity/contracts/statements/interface.sol index c039daf0..8800b00a 100644 --- a/test/sources/solidity/contracts/statements/interface.sol +++ b/test/sources/solidity/contracts/statements/interface.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.8; +pragma solidity ^0.7.0; interface IInterface { event Assign(address indexed token, address indexed from, address indexed to, uint256 amount); @@ -9,4 +9,4 @@ interface IInterface { function assign(uint _token, address _to, uint256 _amount) external; function withdraw(uint _token, address _to, uint256 _amount) external; -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/statements/interpolation.sol b/test/sources/solidity/contracts/statements/interpolation.sol index d922a253..af6c2f41 100644 --- a/test/sources/solidity/contracts/statements/interpolation.sol +++ b/test/sources/solidity/contracts/statements/interpolation.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Interpolated { constructor(string memory a) public { diff --git a/test/sources/solidity/contracts/statements/library.sol b/test/sources/solidity/contracts/statements/library.sol index 557ceca3..bfcdfe60 100644 --- a/test/sources/solidity/contracts/statements/library.sol +++ b/test/sources/solidity/contracts/statements/library.sol @@ -1,6 +1,8 @@ +pragma solidity ^0.7.0; + /* Library and Using statements: invoking 'Test.not' should generate line and statement -coverage for L 9, 10, and 19, plus function coverage for 'flip' and 'not'. +coverage for L 9, 10, and 19, plus function coverage for 'flip' and 'not'. */ library Boolean { struct Value { bool val; } @@ -14,7 +16,7 @@ library Boolean { contract Test { using Boolean for Boolean.Value; Boolean.Value b; - + function not() public returns (bool) { return b.flip(); } diff --git a/test/sources/solidity/contracts/statements/multiple.sol b/test/sources/solidity/contracts/statements/multiple.sol index 438b7008..99ba6899 100644 --- a/test/sources/solidity/contracts/statements/multiple.sol +++ b/test/sources/solidity/contracts/statements/multiple.sol @@ -1,8 +1,8 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test { +contract Test { function a(uint x) public { keccak256(abi.encodePacked(x)); keccak256(abi.encodePacked(uint256(0))); } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/statements/post-close-brace.sol b/test/sources/solidity/contracts/statements/post-close-brace.sol index 49beec7e..9729fbe7 100644 --- a/test/sources/solidity/contracts/statements/post-close-brace.sol +++ b/test/sources/solidity/contracts/statements/post-close-brace.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a(uint x) public { diff --git a/test/sources/solidity/contracts/statements/single.sol b/test/sources/solidity/contracts/statements/single.sol index 36f50829..1ed62858 100644 --- a/test/sources/solidity/contracts/statements/single.sol +++ b/test/sources/solidity/contracts/statements/single.sol @@ -1,7 +1,7 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; -contract Test { +contract Test { function a(uint x) public { keccak256(abi.encodePacked(x)); } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/statements/stack-too-deep.sol b/test/sources/solidity/contracts/statements/stack-too-deep.sol index d41b4d05..5a7987a1 100644 --- a/test/sources/solidity/contracts/statements/stack-too-deep.sol +++ b/test/sources/solidity/contracts/statements/stack-too-deep.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { // 15 fn args + 1 local variable assignment diff --git a/test/sources/solidity/contracts/statements/tuple.sol b/test/sources/solidity/contracts/statements/tuple.sol index 9912e658..86c2d3c0 100644 --- a/test/sources/solidity/contracts/statements/tuple.sol +++ b/test/sources/solidity/contracts/statements/tuple.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { @@ -10,4 +10,4 @@ contract Test { (uint _a, uint _b) = (10, 20); (_a, _b) = returnTuple(); } -} \ No newline at end of file +} diff --git a/test/sources/solidity/contracts/statements/type-keyword.sol b/test/sources/solidity/contracts/statements/type-keyword.sol index 34212499..cf0e25cc 100644 --- a/test/sources/solidity/contracts/statements/type-keyword.sol +++ b/test/sources/solidity/contracts/statements/type-keyword.sol @@ -1,4 +1,4 @@ -pragma solidity >0.4.99 <0.6.0; +pragma solidity >0.4.99 <0.8.0; contract Account { address public owner; @@ -16,8 +16,6 @@ contract Account { require(msg.sender == owner); selfdestruct(recipient); } - - function() payable external {} } contract Factory { diff --git a/test/sources/solidity/contracts/statements/unary.sol b/test/sources/solidity/contracts/statements/unary.sol index f91ac75f..f17466a8 100644 --- a/test/sources/solidity/contracts/statements/unary.sol +++ b/test/sources/solidity/contracts/statements/unary.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract Test { function a() public { diff --git a/test/sources/solidity/external/CLibrary.sol b/test/sources/solidity/external/CLibrary.sol index 3a341115..a3a24385 100644 --- a/test/sources/solidity/external/CLibrary.sol +++ b/test/sources/solidity/external/CLibrary.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; library CLibrary { uint constant x = 1; diff --git a/test/sources/solidity/external/Face.sol b/test/sources/solidity/external/Face.sol index 2e9d2a45..668f54a5 100644 --- a/test/sources/solidity/external/Face.sol +++ b/test/sources/solidity/external/Face.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; interface Face { function stare(uint a, uint b) external; diff --git a/test/sources/solidity/external/PureView.sol b/test/sources/solidity/external/PureView.sol index a66773f1..7bebaee0 100644 --- a/test/sources/solidity/external/PureView.sol +++ b/test/sources/solidity/external/PureView.sol @@ -1,4 +1,4 @@ -pragma solidity ^0.5.0; +pragma solidity ^0.7.0; contract PureView { diff --git a/test/units/statements.js b/test/units/statements.js index 2219d821..ced5094c 100644 --- a/test/units/statements.js +++ b/test/units/statements.js @@ -126,7 +126,7 @@ describe('generic statements', () => { const mapping = coverage.generate(contract.data, util.pathPrefix); assert.deepEqual(mapping[util.filePath].l, { - 9: 1, 10: 1, 19: 1, + 11: 1, 12: 1, 21: 1, }); assert.deepEqual(mapping[util.filePath].b, {}); assert.deepEqual(mapping[util.filePath].s, { diff --git a/test/units/truffle/flags.js b/test/units/truffle/flags.js index 0452ea5f..24cd3088 100644 --- a/test/units/truffle/flags.js +++ b/test/units/truffle/flags.js @@ -28,7 +28,7 @@ describe('Truffle Plugin: command line options', function() { afterEach(() => mock.clean()); // Running out of memory... - it('--usePluginTruffle', async function(){ + it.skip('--usePluginTruffle', async function(){ truffleConfig.usePluginTruffle = true; truffleConfig.logger = mock.testLogger; diff --git a/test/units/truffle/standard.js b/test/units/truffle/standard.js index 3c59b2c4..aed5bc53 100644 --- a/test/units/truffle/standard.js +++ b/test/units/truffle/standard.js @@ -230,7 +230,7 @@ describe('Truffle Plugin: standard use cases', function() { truffleConfig.version = true; // Baseline inequality check - const truffleClientVersion = "v2.5.7"; + const truffleClientVersion = "v2.11.2"; // Truffle client mock.install('Simple', 'simple.js', solcoverConfig); diff --git a/test/util/integration.js b/test/util/integration.js index 88edeb54..6a9b70ac 100644 --- a/test/util/integration.js +++ b/test/util/integration.js @@ -132,7 +132,7 @@ function getDefaultTruffleConfig(){ }, compilers: { solc: { - version: "0.5.3", + version: "0.7.1", settings: { optimizer: {} } } } @@ -183,6 +183,7 @@ function getDefaultBuidlerConfig() { const config = getDefaultNomicLabsConfig() config.defaultNetwork = "buidlerevm"; config.solc = { + version: "0.7.3", evmVersion: 'petersburg' } @@ -193,7 +194,7 @@ function getDefaultHardhatConfig() { const config = getDefaultNomicLabsConfig() config.defaultNetwork = HARDHAT_NETWORK_NAME; config.solidity = { - version: "0.5.13" + version: "0.7.3" } return config; } diff --git a/yarn.lock b/yarn.lock index 70ea2dda..1a8b16a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -827,6 +827,10 @@ ansi-colors@3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.3.tgz#57d35b8686e851e2cc04c403f1c00203976a1813" +ansi-colors@4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + ansi-colors@^3.2.1: version "3.2.4" resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-3.2.4.tgz#e3a3da4bfbae6c86a9c285625de124a234026fbf" @@ -847,10 +851,6 @@ ansi-mark@^1.0.0: strip-ansi "^4.0.0" super-split "^1.1.0" -ansi-regex@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - ansi-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" @@ -865,6 +865,12 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" +ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + dependencies: + color-convert "^2.0.1" + any-promise@1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-1.3.0.tgz#abc6afeedcea52e809cdc0376aed3ce39635d17f" @@ -914,6 +920,16 @@ array-uniq@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" +array.prototype.map@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/array.prototype.map/-/array.prototype.map-1.0.3.tgz#1609623618d3d84134a37d4a220030c2bd18420b" + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" + es-array-method-boxes-properly "^1.0.0" + is-string "^1.0.5" + asap@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" @@ -1275,6 +1291,13 @@ caching-transform@^3.0.2: package-hash "^3.0.0" write-file-atomic "^2.4.2" +call-bind@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.0.tgz#24127054bb3f9bdcb4b1fb82418186072f77b8ce" + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.0" + callsite@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20" @@ -1283,7 +1306,7 @@ camelcase@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" -camelcase@^5.0.0: +camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" @@ -1319,6 +1342,13 @@ chalk@^2.0.0, chalk@^2.3.2, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + "charenc@>= 0.0.1": version "0.0.2" resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" @@ -1358,6 +1388,20 @@ chokidar@3.3.0: optionalDependencies: fsevents "~2.1.1" +chokidar@3.4.2: + version "3.4.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz#38dc8e658dec3809741eb3ef7bb0a47fe424232d" + dependencies: + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.4.0" + optionalDependencies: + fsevents "~2.1.2" + chokidar@^3.4.0: version "3.4.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b" @@ -1410,14 +1454,6 @@ cli-table3@^0.5.0: optionalDependencies: colors "^1.1.2" -cliui@^4.0.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz#348422dbe82d800b3022eef4f6ac10bf2e4d1b49" - dependencies: - string-width "^2.1.1" - strip-ansi "^4.0.0" - wrap-ansi "^2.0.0" - cliui@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" @@ -1432,20 +1468,26 @@ clone-response@1.0.2, clone-response@^1.0.2: dependencies: mimic-response "^1.0.0" -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" dependencies: color-name "1.1.3" +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + dependencies: + color-name "~1.1.4" + color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" +color-name@~1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" + colors@^1.1.2: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" @@ -1607,14 +1649,6 @@ cross-spawn@^4: lru-cache "^4.0.1" which "^1.2.9" -cross-spawn@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449" - dependencies: - lru-cache "^4.0.1" - shebang-command "^1.2.0" - which "^1.2.9" - cross-spawn@^6.0.0: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" @@ -1707,7 +1741,7 @@ debug@4: dependencies: ms "2.1.2" -debug@^4.1.0, debug@^4.1.1: +debug@4.1.1, debug@^4.1.0, debug@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" dependencies: @@ -1719,7 +1753,7 @@ decache@^4.5.1: dependencies: callsite "^1.0.0" -decamelize@^1.1.1, decamelize@^1.2.0: +decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -1862,6 +1896,10 @@ diff@3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" +diff@4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" + diffie-hellman@^5.0.0: version "5.0.3" resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" @@ -2073,6 +2111,39 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" +es-abstract@^1.17.0-next.1: + version "1.17.7" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c" + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.2.2" + is-regex "^1.1.1" + object-inspect "^1.8.0" + object-keys "^1.1.1" + object.assign "^4.1.1" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.1" + +es-abstract@^1.18.0-next.1: + version "1.18.0-next.1" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68" + dependencies: + es-to-primitive "^1.2.1" + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + is-callable "^1.2.2" + is-negative-zero "^2.0.0" + is-regex "^1.1.1" + object-inspect "^1.8.0" + object-keys "^1.1.1" + object.assign "^4.1.1" + string.prototype.trimend "^1.0.1" + string.prototype.trimstart "^1.0.1" + es-abstract@^1.5.0: version "1.13.0" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" @@ -2099,6 +2170,23 @@ es-abstract@^1.5.1: string.prototype.trimleft "^2.1.0" string.prototype.trimright "^2.1.0" +es-array-method-boxes-properly@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz#873f3e84418de4ee19c5be752990b2e44718d09e" + +es-get-iterator@^1.0.2: + version "1.1.1" + resolved "https://registry.yarnpkg.com/es-get-iterator/-/es-get-iterator-1.1.1.tgz#b93ddd867af16d5118e00881396533c1c6647ad9" + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.1" + has-symbols "^1.0.1" + is-arguments "^1.0.4" + is-map "^2.0.1" + is-set "^2.0.1" + is-string "^1.0.5" + isarray "^2.0.5" + es-to-primitive@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377" @@ -2107,6 +2195,14 @@ es-to-primitive@^1.2.0: is-date-object "^1.0.1" is-symbol "^1.0.2" +es-to-primitive@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" + dependencies: + is-callable "^1.1.4" + is-date-object "^1.0.1" + is-symbol "^1.0.2" + es5-ext@^0.10.35, es5-ext@^0.10.50, es5-ext@~0.10.14: version "0.10.50" resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.50.tgz#6d0e23a0abdb27018e5ac4fd09b412bc5517a778" @@ -2142,6 +2238,10 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1 version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" +escape-string-regexp@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + escodegen@1.8.x: version "1.8.1" resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.8.1.tgz#5a5b53af4693110bebb0867aa3430dd3b70a1018" @@ -2549,18 +2649,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" -execa@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" - dependencies: - 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" - execa@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" @@ -2742,6 +2830,13 @@ find-up@3.0.0, find-up@^3.0.0: dependencies: locate-path "^3.0.0" +find-up@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + find-up@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" @@ -2890,10 +2985,6 @@ ganache-cli@^6.11.0: source-map-support "0.5.12" yargs "13.2.4" -get-caller-file@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a" - get-caller-file@^2.0.1: version "2.0.5" resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" @@ -2902,6 +2993,14 @@ get-func-name@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" +get-intrinsic@^1.0.0, get-intrinsic@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.0.1.tgz#94a9768fcbdd0595a1c9273aacf4c89d075631be" + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + get-port@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc" @@ -2982,6 +3081,17 @@ glob@7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +glob@7.1.6: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" + dependencies: + 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@^5.0.15: version "5.0.15" resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1" @@ -3196,6 +3306,10 @@ has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + has-symbol-support-x@^1.4.1: version "1.4.2" resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455" @@ -3204,6 +3318,10 @@ has-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" +has-symbols@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" + has-to-string-tag-x@^1.2.0: version "1.4.1" resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d" @@ -3410,10 +3528,6 @@ into-stream@^3.1.0: from2 "^2.1.1" p-is-promise "^1.1.0" -invert-kv@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6" - invert-kv@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02" @@ -3428,6 +3542,10 @@ ipaddr.js@1.9.0: version "1.9.0" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65" +is-arguments@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.0.4.tgz#3faf966c7cba0ff437fb31f6250082fcf0448cf3" + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" @@ -3446,6 +3564,10 @@ is-callable@^1.1.3, is-callable@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" +is-callable@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" + is-date-object@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" @@ -3454,12 +3576,6 @@ is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - dependencies: - number-is-nan "^1.0.0" - is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" @@ -3485,10 +3601,18 @@ is-installed-globally@^0.2.0: global-dirs "^0.1.1" is-path-inside "^2.1.0" +is-map@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.1.tgz#520dafc4307bb8ebc33b813de5ce7c9400d644a1" + is-natural-number@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8" +is-negative-zero@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461" + is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -3517,6 +3641,12 @@ is-regex@^1.0.4: dependencies: has "^1.0.1" +is-regex@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9" + dependencies: + has-symbols "^1.0.1" + is-retry-allowed@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34" @@ -3525,10 +3655,18 @@ is-retry-allowed@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4" +is-set@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43" + is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" +is-string@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" + is-symbol@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38" @@ -3543,6 +3681,10 @@ isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" +isarray@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723" + isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" @@ -3612,6 +3754,17 @@ isurl@^1.0.0-alpha5: has-to-string-tag-x "^1.2.0" is-object "^1.0.1" +iterate-iterator@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/iterate-iterator/-/iterate-iterator-1.0.1.tgz#1693a768c1ddd79c969051459453f082fe82e9f6" + +iterate-value@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/iterate-value/-/iterate-value-1.0.2.tgz#935115bd37d006a52046535ebc8d07e9c9337f57" + dependencies: + es-get-iterator "^1.0.2" + iterate-iterator "^1.0.1" + js-sha3@0.5.7, js-sha3@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7" @@ -3635,6 +3788,13 @@ js-yaml@3.13.1, js-yaml@3.x, js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@3.14.0: + version "3.14.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz#a7a34170f26a21bb162424d8adacb4113a69e482" + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -3748,12 +3908,6 @@ klaw@^1.0.0: optionalDependencies: graceful-fs "^4.1.9" -lcid@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835" - dependencies: - invert-kv "^1.0.0" - lcid@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf" @@ -3883,6 +4037,12 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + dependencies: + p-locate "^5.0.0" + lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" @@ -3925,6 +4085,12 @@ log-symbols@3.0.0: dependencies: chalk "^2.4.2" +log-symbols@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920" + dependencies: + chalk "^4.0.0" + lowercase-keys@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306" @@ -3999,12 +4165,6 @@ media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" -mem@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" - dependencies: - mimic-fn "^1.0.0" - mem@^4.0.0: version "4.3.0" resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178" @@ -4114,10 +4274,6 @@ mime@1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" -mimic-fn@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" - mimic-fn@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" @@ -4209,6 +4365,36 @@ mocha@5.2.0: mkdirp "0.5.1" supports-color "5.4.0" +mocha@8.1.2: + version "8.1.2" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-8.1.2.tgz#d67fad13300e4f5cd48135a935ea566f96caf827" + dependencies: + ansi-colors "4.1.1" + browser-stdout "1.3.1" + chokidar "3.4.2" + debug "4.1.1" + diff "4.0.2" + escape-string-regexp "4.0.0" + find-up "5.0.0" + glob "7.1.6" + growl "1.10.5" + he "1.2.0" + js-yaml "3.14.0" + log-symbols "4.0.0" + minimatch "3.0.4" + ms "2.1.2" + object.assign "4.1.0" + promise.allsettled "1.0.2" + serialize-javascript "4.0.0" + strip-json-comments "3.0.1" + supports-color "7.1.0" + which "2.0.2" + wide-align "1.1.3" + workerpool "6.0.0" + yargs "13.3.2" + yargs-parser "13.1.2" + yargs-unparser "1.6.1" + mocha@^7.1.1: version "7.1.2" resolved "https://registry.yarnpkg.com/mocha/-/mocha-7.1.2.tgz#8e40d198acf91a52ace122cd7599c9ab857b29e6" @@ -4429,10 +4615,6 @@ nth-check@~1.0.1: dependencies: boolbase "~1.0.0" -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - number-to-bn@1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/number-to-bn/-/number-to-bn-1.7.0.tgz#bb3623592f7e5f9e0030b1977bd41a0c53fe1ea0" @@ -4482,6 +4664,10 @@ object-inspect@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b" +object-inspect@^1.8.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a" + object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" @@ -4499,6 +4685,15 @@ object.assign@4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" +object.assign@^4.1.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" + object.getownpropertydescriptors@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16" @@ -4550,14 +4745,6 @@ os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3" -os-locale@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2" - dependencies: - execa "^0.7.0" - lcid "^1.0.0" - mem "^1.1.0" - os-locale@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a" @@ -4616,6 +4803,12 @@ p-limit@^2.0.0: dependencies: p-try "^2.0.0" +p-limit@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + dependencies: + yocto-queue "^0.1.0" + p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" @@ -4628,6 +4821,12 @@ p-locate@^3.0.0: dependencies: p-limit "^2.0.0" +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + dependencies: + p-limit "^3.0.2" + p-timeout@^1.1.1: version "1.2.1" resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386" @@ -4704,6 +4903,10 @@ path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -4822,6 +5025,16 @@ process@~0.5.1: version "0.5.2" resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf" +promise.allsettled@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/promise.allsettled/-/promise.allsettled-1.0.2.tgz#d66f78fbb600e83e863d893e98b3d4376a9c47c9" + dependencies: + array.prototype.map "^1.0.1" + define-properties "^1.1.3" + es-abstract "^1.17.0-next.1" + function-bind "^1.1.1" + iterate-value "^1.0.0" + promise@^8.0.0: version "8.1.0" resolved "https://registry.yarnpkg.com/promise/-/promise-8.1.0.tgz#697c25c3dfe7435dd79fcd58c38a135888eaf05e" @@ -5027,6 +5240,12 @@ readdirp@~3.2.0: dependencies: picomatch "^2.0.4" +readdirp@~3.4.0: + version "3.4.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada" + dependencies: + picomatch "^2.2.1" + readdirp@~3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" @@ -5135,10 +5354,6 @@ require-from-string@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" -require-main-filename@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" - require-main-filename@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" @@ -5337,6 +5552,12 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" +serialize-javascript@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" + dependencies: + randombytes "^2.1.0" + serve-static@1.14.1: version "1.14.1" resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" @@ -5457,18 +5678,19 @@ solc@0.7.3: semver "^5.5.0" tmp "0.0.33" -solc@^0.5.10: - version "0.5.10" - resolved "https://registry.yarnpkg.com/solc/-/solc-0.5.10.tgz#e57d789b1028f3d35f7989e5134d6ddc0e3b32aa" +solc@^0.7.5: + version "0.7.5" + resolved "https://registry.yarnpkg.com/solc/-/solc-0.7.5.tgz#8dad9536075a113adcbcb2ace80d486b389f273c" dependencies: command-exists "^1.2.8" + commander "3.0.2" + follow-redirects "^1.12.1" fs-extra "^0.30.0" - keccak "^1.0.2" + js-sha3 "0.8.0" memorystream "^0.3.1" require-from-string "^2.0.0" semver "^5.5.0" tmp "0.0.33" - yargs "^11.0.0" sort-keys-length@^1.0.0: version "1.0.1" @@ -5592,15 +5814,7 @@ strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1: +"string-width@^1.0.2 || 2", string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" dependencies: @@ -5623,6 +5837,13 @@ string.prototype.trim@^1.1.2: es-abstract "^1.5.0" function-bind "^1.0.2" +string.prototype.trimend@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.3.tgz#a22bd53cca5c7cf44d7c9d5c732118873d6cd18b" + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + string.prototype.trimleft@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634" @@ -5637,6 +5858,13 @@ string.prototype.trimright@^2.1.0: define-properties "^1.1.3" function-bind "^1.1.1" +string.prototype.trimstart@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.3.tgz#9b4cb590e123bb36564401d59824298de50fd5aa" + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -5653,12 +5881,6 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -strip-ansi@^3.0.0, strip-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - dependencies: - ansi-regex "^2.0.0" - strip-ansi@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" @@ -5699,6 +5921,10 @@ strip-json-comments@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" +strip-json-comments@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" + strip-outer@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631" @@ -5721,6 +5947,12 @@ supports-color@6.0.0: dependencies: has-flag "^3.0.0" +supports-color@7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" + dependencies: + has-flag "^4.0.0" + supports-color@^3.1.0: version "3.2.3" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" @@ -5739,6 +5971,12 @@ supports-color@^6.1.0: dependencies: has-flag "^3.0.0" +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + dependencies: + has-flag "^4.0.0" + swarm-js@0.1.39: version "0.1.39" resolved "https://registry.yarnpkg.com/swarm-js/-/swarm-js-0.1.39.tgz#79becb07f291d4b2a178c50fee7aa6e10342c0e8" @@ -5931,12 +6169,12 @@ truffle-provider@^0.1.14: truffle-interface-adapter "^0.2.3" web3 "1.2.1" -truffle@5.0.31: - version "5.0.31" - resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.0.31.tgz#372a826e330720e29514458ff25750aa2b5efa65" +truffle@5.1.43: + version "5.1.43" + resolved "https://registry.yarnpkg.com/truffle/-/truffle-5.1.43.tgz#544e7b0955b6728a00761a86555c1eb259313266" dependencies: app-module-path "^2.2.0" - mocha "5.2.0" + mocha "8.1.2" original-require "1.0.1" ts-essentials@^2.0.7: @@ -6815,6 +7053,12 @@ which@1.3.1, which@^1.1.1, which@^1.2.9, which@^1.3.0, which@^1.3.1: dependencies: isexe "^2.0.0" +which@2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + dependencies: + isexe "^2.0.0" + wide-align@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" @@ -6833,12 +7077,9 @@ wordwrap@~0.0.2: version "0.0.3" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107" -wrap-ansi@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85" - dependencies: - string-width "^1.0.1" - strip-ansi "^3.0.1" +workerpool@6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.0.0.tgz#85aad67fa1a2c8ef9386a1b43539900f61d03d58" wrap-ansi@^5.1.0: version "5.1.0" @@ -6923,10 +7164,6 @@ xtend@~2.1.1: dependencies: object-keys "~0.4.0" -y18n@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" - y18n@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" @@ -6961,11 +7198,12 @@ yargs-parser@^13.0.0, yargs-parser@^13.1.0, yargs-parser@^13.1.1: camelcase "^5.0.0" decamelize "^1.2.0" -yargs-parser@^9.0.2: - version "9.0.2" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" +yargs-parser@^15.0.1: + version "15.0.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-15.0.1.tgz#54786af40b820dcb2fb8025b11b4d659d76323b3" dependencies: - camelcase "^4.1.0" + camelcase "^5.0.0" + decamelize "^1.2.0" yargs-unparser@1.6.0: version "1.6.0" @@ -6975,6 +7213,16 @@ yargs-unparser@1.6.0: lodash "^4.17.15" yargs "^13.3.0" +yargs-unparser@1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-1.6.1.tgz#bd4b0ee05b4c94d058929c32cb09e3fce71d3c5f" + dependencies: + camelcase "^5.3.1" + decamelize "^1.2.0" + flat "^4.1.0" + is-plain-obj "^1.1.0" + yargs "^14.2.3" + yargs@13.2.4: version "13.2.4" resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83" @@ -7006,28 +7254,27 @@ yargs@13.3.2, yargs@^13.3.0: y18n "^4.0.0" yargs-parser "^13.1.2" -yargs@^11.0.0: - version "11.1.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77" +yargs@^13.2.2: + version "13.3.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" dependencies: - cliui "^4.0.0" - decamelize "^1.1.1" - find-up "^2.1.0" - get-caller-file "^1.0.1" - os-locale "^2.0.0" + cliui "^5.0.0" + find-up "^3.0.0" + get-caller-file "^2.0.1" require-directory "^2.1.1" - require-main-filename "^1.0.1" + require-main-filename "^2.0.0" set-blocking "^2.0.0" - string-width "^2.0.0" + string-width "^3.0.0" which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^9.0.2" + y18n "^4.0.0" + yargs-parser "^13.1.1" -yargs@^13.2.2: - version "13.3.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" +yargs@^14.2.3: + version "14.2.3" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.2.3.tgz#1a1c3edced1afb2a2fea33604bc6d1d8d688a414" dependencies: cliui "^5.0.0" + decamelize "^1.2.0" find-up "^3.0.0" get-caller-file "^2.0.1" require-directory "^2.1.1" @@ -7036,7 +7283,7 @@ yargs@^13.2.2: string-width "^3.0.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^13.1.1" + yargs-parser "^15.0.1" yauzl@^2.4.2: version "2.10.0" @@ -7044,3 +7291,7 @@ yauzl@^2.4.2: dependencies: buffer-crc32 "~0.2.3" fd-slicer "~1.1.0" + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"