From 796f6f5b0daf05d5d13083e9bfdba589c6ecd974 Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 20 Mar 2018 12:08:47 +0100 Subject: [PATCH 1/2] fix loading compiler --- manifest.json | 4 ++-- package.json | 6 +++--- src/app/panels/file-panel.js | 2 +- src/app/tabs/settings-tab.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest.json b/manifest.json index 998eda1025..edf7247913 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "Solidity", "description": "Realtime compiler and runtime", - "update_url": "https://ethereum.github.io/remix-ide/", + "update_url": "https://remix.ethereum.org", "version": "1.1", "manifest_version": 2, "background": { @@ -27,5 +27,5 @@ "" ], - "content_security_policy": "script-src 'self' https://ethereum.github.io/solc-bin/bin/; object-src 'self'" + "content_security_policy": "script-src 'self' https://solc-bin.ethereum.org/; object-src 'self'" } diff --git a/package.json b/package.json index c9b6555393..2589a3c312 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "remix-ide", - "version": "0.5.2-alpha.6", + "version": "0.5.2-alpha.7", "description": "Minimalistic browser-based Solidity IDE", "devDependencies": { "async": "^2.1.2", @@ -144,8 +144,8 @@ "build": "browserify src/index.js -o 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": "rimraf soljson.js && cd node_modules/solc && wget https://ethereum.github.io/solc-bin/soljson.js && cd ../../", - "downloadsolc_root": "wget https://ethereum.github.io/solc-bin/soljson.js", + "downloadsolc": "rimraf soljson.js && cd node_modules/solc && wget https://solc-bin.ethereum.org/soljson.js && cd ../../", + "downloadsolc_root": "wget https://solc-bin.ethereum.org/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/panels/file-panel.js b/src/app/panels/file-panel.js index 20f2a68852..5a8bf47bb2 100644 --- a/src/app/panels/file-panel.js +++ b/src/app/panels/file-panel.js @@ -318,7 +318,7 @@ function filepanel (appAPI, filesProvider) { // ------------------ copy files -------------- function copyFiles () { - modalDialogCustom.prompt(null, 'To which other remix-ide instance do you want to copy over all files?', 'https://ethereum.github.io/remix-ide/', (target) => { + modalDialogCustom.prompt(null, 'To which other remix-ide instance do you want to copy over all files?', 'https://remix.ethereum.org', (target) => { doCopy(target) }) function doCopy (target) { diff --git a/src/app/tabs/settings-tab.js b/src/app/tabs/settings-tab.js index 76b3bb17c4..62dc86ee52 100644 --- a/src/app/tabs/settings-tab.js +++ b/src/app/tabs/settings-tab.js @@ -174,7 +174,7 @@ function SettingsTab (appAPI = {}, appEvents = {}, opts = {}) { header.selected = true versionSelector.appendChild(header) - $.getJSON('https://ethereum.github.io/solc-bin/bin/list.json').done(function (data) { + $.getJSON('https://solc-bin.ethereum.org/bin/list.json').done(function (data) { // populate version dropdown with all available compiler versions (descending order) $.each(data.builds.slice().reverse(), function (i, build) { versionSelector.appendChild(new Option(build.longVersion, build.path)) @@ -228,7 +228,7 @@ function loadVersion (version, queryParams, appAPI, el) { console.log('loading ' + version + ' not allowed') return } - url = 'https://ethereum.github.io/solc-bin/bin/' + version + url = 'https://solc-bin.ethereum.org/bin/' + version } var isFirefox = typeof InstallTrigger !== 'undefined' if (document.location.protocol !== 'file:' && Worker !== undefined && isFirefox) { From 5b6719850eec238a83e3780c5124b79d1036bd45 Mon Sep 17 00:00:00 2001 From: yann300 Date: Tue, 20 Mar 2018 12:17:05 +0100 Subject: [PATCH 2/2] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2589a3c312..807443c392 100644 --- a/package.json +++ b/package.json @@ -144,8 +144,8 @@ "build": "browserify src/index.js -o 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": "rimraf soljson.js && cd node_modules/solc && wget https://solc-bin.ethereum.org/soljson.js && cd ../../", - "downloadsolc_root": "wget https://solc-bin.ethereum.org/soljson.js", + "downloadsolc": "rimraf soljson.js && cd node_modules/solc && wget --no-check-certificate https://solc-bin.ethereum.org/soljson.js && cd ../../", + "downloadsolc_root": "wget --no-check-certificate https://solc-bin.ethereum.org/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",