Merge pull request #1351 from ethereum/solcUpdate

package-lock.json

@@ -1721,8 +1721,7 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -1743,14 +1742,12 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -1765,20 +1762,17 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -1895,8 +1889,7 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "ini": {
           "version": "1.3.5",
@@ -1908,7 +1901,6 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -1923,7 +1915,6 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -1931,14 +1922,12 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -1957,7 +1946,6 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -2038,8 +2026,7 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -2051,7 +2038,6 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -2137,8 +2123,7 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -2174,7 +2159,6 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -2194,7 +2178,6 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -2238,14 +2221,12 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         }
       }
     },

remix-debug/package.json

@@ -34,7 +34,7 @@
     "babel-eslint": "^7.1.1",
     "babelify": "^10.0.0",
     "notify-error": "^1.2.0",
-    "solc": "^0.5.0",
+    "solc": "^0.5.13",
     "standard": "^7.0.1",
     "standard-reporter": "^1.0.5",
     "tape": "^4.6.0"

remix-debugger/package.json

@@ -41,7 +41,7 @@
     "remix-lib": "^0.2.9",
     "remix-solidity": "^0.1.11",
     "selenium-standalone": "^6.0.1",
-    "solc": "^0.4.13",
+    "solc": "^0.5.13",
     "standard": "^7.0.1",
     "standard-reporter": "^1.0.5",
     "tape": "^4.6.0",

remix-lib/package.json

@@ -21,7 +21,7 @@
     "ethereumjs-vm": "4.1.1",
     "ethers": "^4.0.27",
     "events": "^3.0.0",
-    "solc": "^0.5.0",
+    "solc": "^0.5.13",
     "web3": "0.20.6"
   },
   "devDependencies": {

remix-solidity/package.json

@@ -15,7 +15,7 @@
   "main": "./index.js",
   "dependencies": {
     "remix-lib": "0.4.15",
-    "solc": "^0.5.0",
+    "solc": "^0.5.13",
     "webworkify": "^1.2.1"
   },
   "devDependencies": {

remix-solidity/src/compiler/compiler-worker.js

@@ -22,10 +22,11 @@ module.exports = function (self) {
 
         compileJSON = function (input) {
           try {
-            return compiler.compile(input, function (path) {
+            let missingInputsCallback = function (path) {
               missingInputs.push(path)
               return { 'error': 'Deferred import' }
-            })
+            }
+            return compiler.compile(input, { import: missingInputsCallback })
           } catch (exception) {
             return JSON.stringify({ error: 'Uncaught JavaScript exception:\n' + exception })
           }

remix-solidity/src/compiler/compiler.js

@@ -101,7 +101,7 @@ function Compiler (handleImportCall) {
         var result
         try {
           var input = compilerInput(source.sources, {optimize: optimize, evmVersion: evmVersion, language: language, target: source.target})
-          result = compiler.compile(input, missingInputsCallback)
+          result = compiler.compile(input, { import: missingInputsCallback })
           result = JSON.parse(result)
         } catch (exception) {
           result = { error: { formattedMessage: 'Uncaught JavaScript exception:\n' + exception, severity: 'error', mode: 'panic' } }