Merge branch 'master' into react-plugin-manager

apps/remix-ide-e2e/src/tests/debugger.spec.ts

@@ -72,8 +72,8 @@ module.exports = {
       .waitForElementContainsText('*[data-id="stepdetail"]', 'execution step:\n0', 60000)
       .click('*[data-id="buttonNavigatorJumpNextBreakpoint"]')
       .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) {
@@ -212,7 +212,7 @@ module.exports = {
   'Should start debugging using remix debug nodes (rinkeby)': '' + function (browser: NightwatchBrowser) {
     browser
       .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
       .clickLaunchIcon('udapp')
       .click('*[data-id="settingsWeb3Mode"]') // select web3 provider with debug nodes URL

apps/remix-ide-e2e/src/tests/solidityImport.spec.ts

@@ -80,7 +80,7 @@ module.exports = {
 
   'Test NPM Import (with unpkg.com)': function (browser: NightwatchBrowser) {
     browser
-      .setSolidityCompilerVersion('soljson-v0.8.4+commit.c7e474f2.js')
+      .setSolidityCompilerVersion('soljson-v0.8.7+commit.e28d00a7.js')
       .clickLaunchIcon('filePanel')
       .click('li[data-id="treeViewLitreeViewItemREADME.txt"')
       .addFile('Untitled9.sol', sources[8]['Untitled9.sol'])

apps/remix-ide-e2e/src/tests/transactionExecution.spec.ts

@@ -264,7 +264,7 @@ contract C {
     'customError.sol': {
       content: `// SPDX-License-Identifier: GPL-3.0
 
-      pragma solidity ^0.8.4;
+      pragma solidity ^0.8.7;
       
       /// error description
       /// @param a param1

apps/remix-ide/ci/makeMockCompiler.js

@@ -3,7 +3,7 @@
 var fs = require('fs')
 var compiler = require('solc')
 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')
 
 compiler.loadRemoteVersion(defaultVersion, (error, solcSnapshot) => {

libs/remix-ui/solidity-compiler/src/lib/compiler-container.tsx

@@ -28,7 +28,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
     allversions: [],
     customVersions: [],
     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: '',
     runs: '',
     compiledFileName: '',
@@ -534,6 +534,7 @@ export const CompilerContainer = (props: CompilerContainerProps) => {
             <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">
               <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 === 'muirGlacier' ? 'selected' : ''} value="muirGlacier">muirGlacier</option>
               <option data-id={state.evmVersion === 'istanbul' ? 'selected' : ''} value="istanbul">istanbul</option>

package.json

@@ -50,7 +50,7 @@
     "bumpVersion:libs": "gulp & gulp syncLibVersions;",
     "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/",
-    "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",
     "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",