From c170e0328f026aecec6f572c1b3ac3a8dcc07b7f Mon Sep 17 00:00:00 2001 From: Alex Beregszaszi Date: Tue, 20 Apr 2021 21:04:03 +0100 Subject: [PATCH 1/3] Use binaries.soliditylang.org instead of solc-bin --- apps/remix-ide/manifest.json | 2 +- apps/remix-ide/src/app/compiler/compiler-utils.js | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/remix-ide/manifest.json b/apps/remix-ide/manifest.json index edf7247913..c00da5630b 100644 --- a/apps/remix-ide/manifest.json +++ b/apps/remix-ide/manifest.json @@ -27,5 +27,5 @@ "" ], - "content_security_policy": "script-src 'self' https://solc-bin.ethereum.org/; object-src 'self'" + "content_security_policy": "script-src 'self' https://binaries.soliditylang.org/; object-src 'self'" } diff --git a/apps/remix-ide/src/app/compiler/compiler-utils.js b/apps/remix-ide/src/app/compiler/compiler-utils.js index 41bb7e7769..bd3fc3a016 100644 --- a/apps/remix-ide/src/app/compiler/compiler-utils.js +++ b/apps/remix-ide/src/app/compiler/compiler-utils.js @@ -2,8 +2,8 @@ const semver = require('semver') const minixhr = require('minixhr') /* global Worker */ -export const baseURLBin = 'https://solc-bin.ethereum.org/bin' -export const baseURLWasm = 'https://solc-bin.ethereum.org/wasm' +export const baseURLBin = 'https://binaries.soliditylang.org/bin' +export const baseURLWasm = 'https://binaries.soliditylang.org/wasm' export const pathToURL = {} diff --git a/package.json b/package.json index 91ea9b8ccd..eb2d33e79e 100644 --- a/package.json +++ b/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://solc-bin.ethereum.org/bin/soljson-v0.8.1+commit.df193b15.js -O ./apps/remix-ide/src/assets/js/soljson.js", + "downloadsolc_assets": "wget --no-check-certificate https://binaries.soliditylang.org/bin/soljson-v0.8.1+commit.df193b15.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", From 932a5e31ec65288d5319edfd7670455660675b7f Mon Sep 17 00:00:00 2001 From: Liana Husikyan Date: Tue, 27 Apr 2021 11:33:17 +0200 Subject: [PATCH 2/3] Update compiler-utils.js --- apps/remix-ide/src/app/compiler/compiler-utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/remix-ide/src/app/compiler/compiler-utils.js b/apps/remix-ide/src/app/compiler/compiler-utils.js index bd3fc3a016..0f06f9c3da 100644 --- a/apps/remix-ide/src/app/compiler/compiler-utils.js +++ b/apps/remix-ide/src/app/compiler/compiler-utils.js @@ -26,9 +26,9 @@ export function canUseWorker (selectedVersion) { const isNightly = selectedVersion.includes('nightly') return browserSupportWorker() && ( // All compiler versions (including nightlies) after 0.6.3 are wasm compiled - semver.gt(version, '0.6.3') || + semver.gte(version, '0.6.2') || // Only releases are wasm compiled starting with 0.3.6 - (semver.gte(version, '0.3.6') && !isNightly) + (semver.gte(version, '0.3.6') && !semver.eq(version, '0.5.17') && !isNightly) ) } From bfd7e1a2ad680758ba40af2767dc2b9db95f2556 Mon Sep 17 00:00:00 2001 From: lianahus Date: Tue, 27 Apr 2021 11:44:01 +0200 Subject: [PATCH 3/3] Revert "Update compiler-utils.js" This reverts commit 932a5e31ec65288d5319edfd7670455660675b7f. --- apps/remix-ide/src/app/compiler/compiler-utils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/remix-ide/src/app/compiler/compiler-utils.js b/apps/remix-ide/src/app/compiler/compiler-utils.js index 0f06f9c3da..bd3fc3a016 100644 --- a/apps/remix-ide/src/app/compiler/compiler-utils.js +++ b/apps/remix-ide/src/app/compiler/compiler-utils.js @@ -26,9 +26,9 @@ export function canUseWorker (selectedVersion) { const isNightly = selectedVersion.includes('nightly') return browserSupportWorker() && ( // All compiler versions (including nightlies) after 0.6.3 are wasm compiled - semver.gte(version, '0.6.2') || + semver.gt(version, '0.6.3') || // Only releases are wasm compiled starting with 0.3.6 - (semver.gte(version, '0.3.6') && !semver.eq(version, '0.5.17') && !isNightly) + (semver.gte(version, '0.3.6') && !isNightly) ) }