From 667d399e6e1e39600a2e818902559cf990b46445 Mon Sep 17 00:00:00 2001 From: Aniket-Engg Date: Fri, 3 Jan 2020 18:30:36 +0530 Subject: [PATCH] default solidity version set to 0.6.1 --- ci/makeMockCompiler.js | 2 +- package.json | 2 +- src/app/tabs/compileTab/compilerContainer.js | 2 +- src/app/tabs/testTab/testTab.js | 2 +- test-browser/tests/signingMessage.js | 2 +- test-browser/tests/staticAnalysis.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/makeMockCompiler.js b/ci/makeMockCompiler.js index fbcf5f433c..c1c0bbf51c 100644 --- a/ci/makeMockCompiler.js +++ b/ci/makeMockCompiler.js @@ -3,7 +3,7 @@ var fs = require('fs') var compiler = require('solc') var compilerInput = require('remix-solidity').CompilerInput -var defaultVersion = 'v0.6.0+commit.26b70077' +var defaultVersion = 'v0.6.1+commit.e6f7d5a4' compiler.loadRemoteVersion(defaultVersion, (error, solcSnapshot) => { if (error) console.log(error) diff --git a/package.json b/package.json index 4c6cbc0c20..ec518ecf41 100644 --- a/package.json +++ b/package.json @@ -154,7 +154,7 @@ "build_debugger": "browserify src/app/debugger/remix-debugger/index.js -o src/app/debugger/remix-debugger/build/app.js", "browsertest": "sleep 5 && npm run nightwatch_local", "csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='assets/css/font-awesome.min.css' assets/css/", - "downloadsolc_root": "wget --no-check-certificate https://solc-bin.ethereum.org/bin/soljson-v0.6.0+commit.26b70077.js -O soljson.js", + "downloadsolc_root": "wget --no-check-certificate https://solc-bin.ethereum.org/bin/soljson-v0.6.1+commit.e6f7d5a4.js -O soljson.js", "lint": "standard | notify-error", "make-mock-compiler": "node ci/makeMockCompiler.js", "minify": "uglifyjs --in-source-map inline --source-map-inline -c warnings=false", diff --git a/src/app/tabs/compileTab/compilerContainer.js b/src/app/tabs/compileTab/compilerContainer.js index 9790b66784..28c1aff092 100644 --- a/src/app/tabs/compileTab/compilerContainer.js +++ b/src/app/tabs/compileTab/compilerContainer.js @@ -24,7 +24,7 @@ class CompilerContainer { timeout: 300, allversions: null, selectedVersion: null, - defaultVersion: 'soljson-v0.6.0+commit.26b70077.js', // this default version is defined: in makeMockCompiler (for browser test) and in package.json (downloadsolc_root) for the builtin compiler + defaultVersion: 'soljson-v0.6.1+commit.e6f7d5a4.js', // this default version is defined: in makeMockCompiler (for browser test) and in package.json (downloadsolc_root) for the builtin compiler baseurl: 'https://solc-bin.ethereum.org/bin' } } diff --git a/src/app/tabs/testTab/testTab.js b/src/app/tabs/testTab/testTab.js index f630632634..715a239c4a 100644 --- a/src/app/tabs/testTab/testTab.js +++ b/src/app/tabs/testTab/testTab.js @@ -37,7 +37,7 @@ class TestTabLogic { } generateTestContractSample () { - return `pragma solidity >=0.4.0 <0.6.0; + return `pragma solidity >=0.4.0 <0.7.0; import "remix_tests.sol"; // this import is automatically injected by Remix. // file name has to end with '_test.sol' diff --git a/test-browser/tests/signingMessage.js b/test-browser/tests/signingMessage.js index d4cea4c6ab..b0e182e425 100644 --- a/test-browser/tests/signingMessage.js +++ b/test-browser/tests/signingMessage.js @@ -49,7 +49,7 @@ module.exports = { var sources = [ { 'browser/signMassage.sol': {content: ` - pragma solidity >=0.4.22 <0.6.0; + pragma solidity >=0.4.22 <0.7.0; contract SignMassageTest { function testRecovery(bytes32 h, uint8 v, bytes32 r, bytes32 s) public pure returns (address) { return ecrecover(h, v, r, s); diff --git a/test-browser/tests/staticAnalysis.js b/test-browser/tests/staticAnalysis.js index df03b739d5..1020e2c454 100644 --- a/test-browser/tests/staticAnalysis.js +++ b/test-browser/tests/staticAnalysis.js @@ -5,7 +5,7 @@ var sauce = require('./sauce') var sources = [ { 'browser/Untitled.sol': {content: ` -pragma solidity >=0.4.22 <0.6.0; +pragma solidity >=0.4.22 <0.7.0; contract test1 { address test = tx.origin; } contract test2 {} contract TooMuchGas {