From 0a6481d54abf540851db03a4ee464fe77e170fd6 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Thu, 23 Apr 2020 23:12:03 +0200 Subject: [PATCH 1/3] bump default solidity version --- ci/makeMockCompiler.js | 2 +- package.json | 2 +- src/app/tabs/compileTab/compilerContainer.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/makeMockCompiler.js b/ci/makeMockCompiler.js index c1c0bbf51c..3df463d342 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.1+commit.e6f7d5a4' +var defaultVersion = 'v0.6.6+commit.6c089d02' compiler.loadRemoteVersion(defaultVersion, (error, solcSnapshot) => { if (error) console.log(error) diff --git a/package.json b/package.json index d845677cda..42df13d6a9 100644 --- a/package.json +++ b/package.json @@ -158,7 +158,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.1+commit.e6f7d5a4.js -O soljson.js", + "downloadsolc_root": "wget --no-check-certificate https://solc-bin.ethereum.org/bin/soljson-v0.6.6+commit.6c089d02.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 e5ad6fe58a..3801c86abf 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.1+commit.e6f7d5a4.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.6+commit.6c089d02.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' } } From 58ed1953c59c46d81de4e1e594076fd29f161fbc Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 28 Apr 2020 13:31:32 +0200 Subject: [PATCH 2/3] better log --- test-browser/commands/checkVariableDebug.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-browser/commands/checkVariableDebug.js b/test-browser/commands/checkVariableDebug.js index 2527360006..d5ad7834e1 100644 --- a/test-browser/commands/checkVariableDebug.js +++ b/test-browser/commands/checkVariableDebug.js @@ -29,7 +29,7 @@ function checkDebug (browser, id, debugValue, done) { } var equal = deepequal(debugValue, value) if (!equal) { - browser.assert.fail('checkDebug on ' + id, 'info about error', '') + browser.assert.fail('checkDebug on ' + id, 'info about error\n ' + JSON.stringify(debugValue) + '\n ' + JSON.stringify(value), '') } done() }) From 590892d0b403c27e59ff6ec1a60d71f69ef31ee0 Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 28 Apr 2020 13:31:52 +0200 Subject: [PATCH 3/3] fix e2e tests --- test-browser/tests/ballot.js | 2 +- test-browser/tests/runAndDeploy.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test-browser/tests/ballot.js b/test-browser/tests/ballot.js index 0cebb4ba5e..a53dd8a0e3 100644 --- a/test-browser/tests/ballot.js +++ b/test-browser/tests/ballot.js @@ -38,7 +38,7 @@ module.exports = { browser.pause(500) .click('*[data-id="txLoggerDebugButton0x41fab8ea5b1d9fba5e0a6545ca1a2d62fff518578802c033c2b9a031a01c31b3"]') .pause(2000) - .clickLaunchIcon('debugger') + // .clickLaunchIcon('debugger') .click('*[data-id="buttonNavigatorJumpPreviousBreakpoint"]') .pause(2000) .goToVMTraceStep(79) diff --git a/test-browser/tests/runAndDeploy.js b/test-browser/tests/runAndDeploy.js index 531935252f..b7dabedc14 100644 --- a/test-browser/tests/runAndDeploy.js +++ b/test-browser/tests/runAndDeploy.js @@ -48,9 +48,9 @@ module.exports = { .waitForElementPresent('*[data-id="Deploy - transact (not payable)"]') .click('*[data-id="Deploy - transact (not payable)"]') .pause(5000) - .testFunction('0xf887e3ac3143430b0c22d055eb25d234675e7f3246cb0824efc4c1437a1405d5', { + .testFunction('0xe9b627a180f90a24feb6850f29e4121ea312f315f61756c31468ffbda2955a64', { status: '0x1 Transaction mined and execution succeed', - 'transaction hash': '0xf887e3ac3143430b0c22d055eb25d234675e7f3246cb0824efc4c1437a1405d5' + 'transaction hash': '0xe9b627a180f90a24feb6850f29e4121ea312f315f61756c31468ffbda2955a64' }) },