load soljson.js

Author: yann300

.circleci/config.yml

@@ -39,7 +39,7 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "[email protected]"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/soljson.js dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
     working_directory: ~/remix-project
 
     parallelism: 20
@@ -48,9 +48,9 @@ jobs:
       - run: npm install
       - run: npm run lint
       # - run: npm run lint remix-ide-e2e
-      - run: npm run build:libs
-      - run: npm run downloadsolc_root
+      - run: npm run build:libs      
       - run: npm run build
+      - run: npm run downloadsolc_root
       - run:
           name: Download Selenium
           command: ./node_modules/.bin/selenium-standalone install --drivers.chrome.version=2.39 --drivers.chrome.baseURL=https://chromedriver.storage.googleapis.com
@@ -77,7 +77,7 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "[email protected]"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/soljson.js dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
     working_directory: ~/remix-project
 
     parallelism: 20
@@ -87,8 +87,8 @@ jobs:
       - run: npm run lint
       # - run: npm run lint remix-ide-e2e
       - run: npm run build:libs
-      - run: npm run downloadsolc_root
       - run: npm run build
+      - run: npm run downloadsolc_root
       - run:
           name: Download Selenium
           command: ./node_modules/.bin/selenium-standalone install --config=../remix-project/apps/remix-ide-e2e/seleniumConfig.js
@@ -121,7 +121,7 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "[email protected]"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/soljson.js dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
     working_directory: ~/remix-project
 
     steps:
@@ -130,8 +130,8 @@ jobs:
       - run: npm run lint
       # - run: npm run lint remix-ide-e2e
       - run: npm run build:libs
-      - run: npm run downloadsolc_root
       - run: npm run build
+      - run: npm run downloadsolc_root
       - run:
           name: Download Selenium
           command: ./node_modules/.bin/selenium-standalone install --drivers.chrome.version=2.39 --drivers.chrome.baseURL=https://chromedriver.storage.googleapis.com
@@ -159,16 +159,16 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "[email protected]"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/soljson.js dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
     working_directory: ~/remix-project
 
     steps:
       - checkout
       - run: npm install
       - run: npm run lint
       - run: npm run build:libs
-      - run: npm run downloadsolc_root
       - run: npm run build
+      - run: npm run downloadsolc_root
       - run: 
           name: Deploy
           command: |
@@ -189,16 +189,16 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "[email protected]"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/soljson.js dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
     working_directory: ~/remix-project
 
     steps:
       - checkout
       - setup_remote_docker
       - run: npm install
       - run: npm run build:libs
-      - run: npm run downloadsolc_root
       - run: npm run build
+      - run: npm run downloadsolc_root
       - run: ./apps/remix-ide/ci/copy_resources.sh     
       - run: ./apps/remix-ide/ci/publishIpfs
       - run: ./apps/remix-ide/ci/build_and_publish_docker_images.sh
@@ -216,16 +216,16 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "[email protected]"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/soljson.js dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
     working_directory: ~/remix-project
 
     steps:
       - checkout
       - run: npm install
       - run: npm run lint
       - run: npm run build:libs
-      - run: npm run downloadsolc_root
       - run: npm run build
+      - run: npm run downloadsolc_root
       - run: 
           name: Deploy
           command: |
@@ -246,16 +246,16 @@ jobs:
     environment:
       - COMMIT_AUTHOR_EMAIL: "[email protected]"
       - COMMIT_AUTHOR: "Circle CI"
-      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
+      - FILES_TO_PACKAGE: "dist/apps/remix-ide/assets dist/apps/remix-ide/index.html dist/apps/remix-ide/soljson.js dist/apps/remix-ide/main.js dist/apps/remix-ide/polyfills.js dist/apps/remix-ide/runtime.js dist/apps/remix-ide/vendor.js dist/apps/remix-ide/favicon.ico"
     working_directory: ~/remix-project
 
     steps:
       - checkout
       - run: npm install
       - run: npm run lint
       - run: npm run build:libs
-      - run: npm run downloadsolc_root
       - run: npm run build
+      - run: npm run downloadsolc_root
       - run: 
           name: Deploy
           command: |

apps/remix-ide/ci/deploy_from_travis_remix-alpha.sh

@@ -14,7 +14,7 @@ echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md
 cp -r $FILES_TO_PACKAGE "./"
 rm -rf dist
 ls
-FILES_TO_DEPLOY="assets index.html main.js polyfills.js runtime.js vendor.js favicon.ico"
+FILES_TO_DEPLOY="assets index.html soljson.js main.js polyfills.js runtime.js vendor.js favicon.ico"
 # ZIP the whole directory
 zip -r remix-$SHA.zip $FILES_TO_DEPLOY
 # -f is needed because "build" is part of .gitignore

apps/remix-ide/ci/deploy_from_travis_remix-beta.sh

@@ -14,7 +14,7 @@ echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md
 cp -r $FILES_TO_PACKAGE "./"
 rm -rf dist
 ls
-FILES_TO_DEPLOY="assets index.html main.js polyfills.js runtime.js vendor.js favicon.ico"
+FILES_TO_DEPLOY="assets index.html soljson.js  main.js polyfills.js runtime.js vendor.js favicon.ico"
 # ZIP the whole directory
 zip -r remix-$SHA.zip $FILES_TO_DEPLOY
 # -f is needed because "build" is part of .gitignore

apps/remix-ide/ci/deploy_from_travis_remix-live.sh

@@ -13,7 +13,7 @@ echo "Built website from \`$SHA\`. See https://github.com/ethereum/remix-ide/ fo
 echo "To use an offline copy, download \`remix-$SHA.zip\`." >> README.md
 cp -r $FILES_TO_PACKAGE "./"
 rm -rf dist
-FILES_TO_DEPLOY="assets index.html main.js polyfills.js runtime.js vendor.js"
+FILES_TO_DEPLOY="assets index.html soljson.js  main.js polyfills.js runtime.js vendor.js"
 # ZIP the whole directory
 zip -r remix-$SHA.zip $FILES_TO_DEPLOY
 # -f is needed because "build" is part of .gitignore

apps/remix-ide/src/app/tabs/compileTab/compilerContainer.js

@@ -209,6 +209,7 @@ class CompilerContainer {
     this._view.versionSelector = yo`
       <select onchange="${this.onchangeLoadVersion.bind(this)}" class="custom-select" id="versionSelector" disabled>
         <option disabled selected>${this.data.defaultVersion}</option>
+        <option disabled>builtin</option>
       </select>`
     this._view.languageSelector = yo`
       <select onchange="${this.onchangeLanguage.bind(this)}" class="custom-select" id="compilierLanguageSelector" title="Available since v0.5.7">
@@ -449,7 +450,9 @@ class CompilerContainer {
       this.queryParams.update({ version: this.data.selectedVersion })
     } else if (this.data.selectedVersion === 'builtin') {
       let location = window.document.location
-      location = `${location.protocol}//${location.host}/${location.pathname}`
+      const path = location.pathname
+      if (!path.startsWith('/')) path = '/' + path
+      location = `${location.protocol}//${location.host}${path}`
       if (location.endsWith('index.html')) location = location.substring(0, location.length - 10)
       if (!location.endsWith('/')) location += '/'
       url = location + 'soljson.js'
@@ -499,18 +502,20 @@ class CompilerContainer {
 
   // fetching both normal and wasm builds and creating a [version, baseUrl] map
   async fetchAllVersion (callback) {
-    let allVersions, selectedVersion, allVersionsWasm, isURL
+    let selectedVersion, allVersionsWasm, isURL
+    let allVersions = [{ path: 'builtin', longVersion: 'latest local version' }]
     // fetch normal builds
     const binRes = await promisedMiniXhr(`${baseURLBin}/list.json`)
     // fetch wasm builds
     const wasmRes = await promisedMiniXhr(`${baseURLWasm}/list.json`)
     if (binRes.event.type === 'error' && wasmRes.event.type === 'error') {
       allVersions = [{ path: 'builtin', longVersion: 'latest local version' }]
       selectedVersion = 'builtin'
-      callback(allVersions, selectedVersion)
+      return callback(allVersions, selectedVersion)
     }
     try {
-      allVersions = JSON.parse(binRes.json).builds.slice().reverse()
+      const versions = JSON.parse(binRes.json).builds.slice().reverse()
+      allVersions = [...allVersions, ...versions]
       selectedVersion = this.data.defaultVersion
       if (this.queryParams.get().version) selectedVersion = this.queryParams.get().version
       // Check if version is a URL and corresponding filename starts with 'soljson'

package.json

@@ -49,7 +49,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/assets/css/font-awesome.min.css' apps/remix-ide/assets/css/",
-    "downloadsolc_root": "wget --no-check-certificate https://solc-bin.ethereum.org/bin/soljson-v0.7.4+commit.3f05b770.js -O ./apps/remix-ide/soljson.js",
+    "downloadsolc_root": "wget --no-check-certificate https://solc-bin.ethereum.org/bin/soljson-v0.7.4+commit.3f05b770.js -O ./dist/apps/remix-ide/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",

workspace.json

@@ -59,7 +59,6 @@
               "**/node_modules/**",
               "apps/remix-ide/build/**/*.js",
               "apps/remix-ide/src/app/editor/mode-solidity.js",
-              "apps/remix-ide/soljson.js",
               "apps/remix-ide/js/**/*.js",
               "apps/remix-ide/src/assets/js/**/*.js"
             ]