From 4933d7da27de60ad76d3c53bee9477fb961a2da2 Mon Sep 17 00:00:00 2001
From: LianaHus <liana@ethdev.com>
Date: Thu, 7 May 2020 20:04:49 +0200
Subject: [PATCH] load wasm builds

---
 apps/remix-ide/src/app/compiler/compiler-utils.js           | 4 ++--
 apps/remix-ide/src/app/tabs/compileTab/compilerContainer.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/remix-ide/src/app/compiler/compiler-utils.js b/apps/remix-ide/src/app/compiler/compiler-utils.js
index f7afcf9307..a1020bd9ef 100644
--- a/apps/remix-ide/src/app/compiler/compiler-utils.js
+++ b/apps/remix-ide/src/app/compiler/compiler-utils.js
@@ -1,7 +1,7 @@
 const semver = require('semver')
 /* global Worker */
 
-export const baseUrl = 'https://solc-bin.ethereum.org/bin'
+export const baseUrl = 'https://solc-bin.ethereum.org/wasm'
 
 export function urlFromVersion (version) {
   return `${baseUrl}/soljson-v${version}.js`
@@ -30,7 +30,7 @@ export function canUseWorker (selectedVersion) {
     default :
       isFromWhiteList = true
   }
-  return browserSupportWorker() && (!isChrome || (isChrome && isFromWhiteList))
+  return browserSupportWorker()// && (!isChrome || (isChrome && isFromWhiteList))
 }
 
 function browserSupportWorker () {
diff --git a/apps/remix-ide/src/app/tabs/compileTab/compilerContainer.js b/apps/remix-ide/src/app/tabs/compileTab/compilerContainer.js
index 46e4967926..960f5c8d16 100644
--- a/apps/remix-ide/src/app/tabs/compileTab/compilerContainer.js
+++ b/apps/remix-ide/src/app/tabs/compileTab/compilerContainer.js
@@ -389,7 +389,7 @@ class CompilerContainer {
     // Workers cannot load js on "file:"-URLs and we get a
     // "Uncaught RangeError: Maximum call stack size exceeded" error on Chromium,
     // resort to non-worker version in that case.
-    if (canUseWorker(this.data.selectedVersion)) {
+    if (this.data.selectedVersion !== 'builtin' && canUseWorker(this.data.selectedVersion)) {
       this.compileTabLogic.compiler.loadVersion(true, url)
       this.setVersionText('(loading using worker)')
     } else {