Skip to content

B
baas-ide
Commit c366a02f authored by bunsenstraat's avatar bunsenstraat
Browse files
Options

Merge branch 'master' of https://github.com/ethereum/remix-project into matCont

parents 28c70ae7 c0c5aa07
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 8 deletions
apps/remix-ide-e2e/src/tests/debugger.spec.ts
View file @ c366a02f
...@@ -72,8 +72,8 @@ module.exports = { ...@@ -72,8 +72,8 @@ module.exports = {
.waitForElementContainsText('*[data-id="stepdetail"]', 'execution step:\n0', 60000) .waitForElementContainsText('*[data-id="stepdetail"]', 'execution step:\n0', 60000)
.click('*[data-id="buttonNavigatorJumpNextBreakpoint"]') .click('*[data-id="buttonNavigatorJumpNextBreakpoint"]')
.pause(10000) .pause(10000)
.waitForElementContainsText('*[data-id="stepdetail"]', 'vm trace step:\n348', 60000) .waitForElementContainsText('*[data-id="stepdetail"]', 'vm trace step:\n352', 60000)
.waitForElementContainsText('*[data-id="stepdetail"]', 'execution step:\n348', 60000) .waitForElementContainsText('*[data-id="stepdetail"]', 'execution step:\n352', 60000)
}, },
'Should display solidity imported code while debugging github import': function (browser: NightwatchBrowser) { 'Should display solidity imported code while debugging github import': function (browser: NightwatchBrowser) {
...@@ -212,7 +212,7 @@ module.exports = { ...@@ -212,7 +212,7 @@ module.exports = {
'Should start debugging using remix debug nodes (rinkeby)': '' + function (browser: NightwatchBrowser) { 'Should start debugging using remix debug nodes (rinkeby)': '' + function (browser: NightwatchBrowser) {
browser browser
.clickLaunchIcon('solidity') .clickLaunchIcon('solidity')
.setSolidityCompilerVersion('soljson-v0.8.4+commit.c7e474f2.js') .setSolidityCompilerVersion('soljson-v0.8.7+commit.e28d00a7.js')
.addFile('useDebugNodes.sol', sources[5]['useDebugNodes.sol']) // compile contract .addFile('useDebugNodes.sol', sources[5]['useDebugNodes.sol']) // compile contract
.clickLaunchIcon('udapp') .clickLaunchIcon('udapp')
.click('*[data-id="settingsWeb3Mode"]') // select web3 provider with debug nodes URL .click('*[data-id="settingsWeb3Mode"]') // select web3 provider with debug nodes URL
......
apps/remix-ide-e2e/src/tests/solidityImport.spec.ts
View file @ c366a02f
...@@ -80,7 +80,7 @@ module.exports = { ...@@ -80,7 +80,7 @@ module.exports = {
'Test NPM Import (with unpkg.com)': function (browser: NightwatchBrowser) { 'Test NPM Import (with unpkg.com)': function (browser: NightwatchBrowser) {
browser browser
.setSolidityCompilerVersion('soljson-v0.8.4+commit.c7e474f2.js') .setSolidityCompilerVersion('soljson-v0.8.7+commit.e28d00a7.js')
.clickLaunchIcon('filePanel') .clickLaunchIcon('filePanel')
.click('li[data-id="treeViewLitreeViewItemREADME.txt"') .click('li[data-id="treeViewLitreeViewItemREADME.txt"')
.addFile('Untitled9.sol', sources[8]['Untitled9.sol']) .addFile('Untitled9.sol', sources[8]['Untitled9.sol'])
......
apps/remix-ide-e2e/src/tests/transactionExecution.spec.ts
View file @ c366a02f
...@@ -264,7 +264,7 @@ contract C { ...@@ -264,7 +264,7 @@ contract C {
'customError.sol': { 'customError.sol': {
content: `// SPDX-License-Identifier: GPL-3.0 content: `// SPDX-License-Identifier: GPL-3.0
pragma solidity ^0.8.4; pragma solidity ^0.8.7;
/// error description /// error description
/// @param a param1 /// @param a param1
......
apps/remix-ide/ci/makeMockCompiler.js
View file @ c366a02f
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
var fs = require('fs') var fs = require('fs')
var compiler = require('solc') var compiler = require('solc')
var compilerInput = require('@remix-project/remix-solidity').CompilerInput var compilerInput = require('@remix-project/remix-solidity').CompilerInput
var defaultVersion = 'soljson-v0.8.4+commit.c7e474f2.js' var defaultVersion = 'soljson-v0.8.7+commit.e28d00a7.js'
const path = require('path') const path = require('path')
compiler.loadRemoteVersion(defaultVersion, (error, solcSnapshot) => { compiler.loadRemoteVersion(defaultVersion, (error, solcSnapshot) => {
......
libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx
View file @ c366a02f
...@@ -28,7 +28,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => { ...@@ -28,7 +28,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
allversions: [], allversions: [],
customVersions: [], customVersions: [],
selectedVersion: null, selectedVersion: null,
defaultVersion: 'soljson-v0.8.4+commit.c7e474f2.js', // this default version is defined: in makeMockCompiler (for browser test) defaultVersion: 'soljson-v0.8.7+commit.e28d00a7.js', // this default version is defined: in makeMockCompiler (for browser test)
selectedLanguage: '', selectedLanguage: '',
runs: '', runs: '',
compiledFileName: '', compiledFileName: '',
...@@ -534,6 +534,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => { ...@@ -534,6 +534,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
<label className="remixui_compilerLabel form-check-label" htmlFor="evmVersionSelector">EVM Version</label> <label className="remixui_compilerLabel form-check-label" htmlFor="evmVersionSelector">EVM Version</label>
<select value={state.evmVersion} onChange={(e) => handleEvmVersionChange(e.target.value)} className="custom-select" id="evmVersionSelector"> <select value={state.evmVersion} onChange={(e) => handleEvmVersionChange(e.target.value)} className="custom-select" id="evmVersionSelector">
<option data-id={state.evmVersion === 'default' ? 'selected' : ''} value="default">compiler default</option> <option data-id={state.evmVersion === 'default' ? 'selected' : ''} value="default">compiler default</option>
<option data-id={state.evmVersion === 'london' ? 'selected' : ''} value="london">london</option>
<option data-id={state.evmVersion === 'berlin' ? 'selected' : ''} value="berlin">berlin</option> <option data-id={state.evmVersion === 'berlin' ? 'selected' : ''} value="berlin">berlin</option>
<option data-id={state.evmVersion === 'muirGlacier' ? 'selected' : ''} value="muirGlacier">muirGlacier</option> <option data-id={state.evmVersion === 'muirGlacier' ? 'selected' : ''} value="muirGlacier">muirGlacier</option>
<option data-id={state.evmVersion === 'istanbul' ? 'selected' : ''} value="istanbul">istanbul</option> <option data-id={state.evmVersion === 'istanbul' ? 'selected' : ''} value="istanbul">istanbul</option>
......
package.json
View file @ c366a02f
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
"bumpVersion:libs": "gulp & gulp syncLibVersions;", "bumpVersion:libs": "gulp & gulp syncLibVersions;",
"browsertest": "sleep 5 && npm run nightwatch_local", "browsertest": "sleep 5 && npm run nightwatch_local",
"csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='apps/remix-ide/src/assets/css/font-awesome.min.css' apps/remix-ide/src/assets/css/", "csslint": "csslint --ignore=order-alphabetical --errors='errors,duplicate-properties,empty-rules' --exclude-list='apps/remix-ide/src/assets/css/font-awesome.min.css' apps/remix-ide/src/assets/css/",
"downloadsolc_assets": "wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.8.4+commit.c7e474f2.js -O ./apps/remix-ide/src/assets/js/soljson.js", "downloadsolc_assets": "wget --no-check-certificate https://binaries.soliditylang.org/wasm/soljson-v0.8.7+commit.e28d00a7.js -O ./apps/remix-ide/src/assets/js/soljson.js",
"make-mock-compiler": "node apps/remix-ide/ci/makeMockCompiler.js", "make-mock-compiler": "node apps/remix-ide/ci/makeMockCompiler.js",
"minify": "uglifyjs --in-source-map inline --source-map-inline -c warnings=false", "minify": "uglifyjs --in-source-map inline --source-map-inline -c warnings=false",
"nightwatch_parallel": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js --env=chrome,firefox", "nightwatch_parallel": "npm run build:e2e && nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js --env=chrome,firefox",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment