Merge pull request #1496 from 0xProject/feature/solc-5.0

Solc 5.0 support in sol-compiler

11 files changed, 76 insertions, 42 deletions

diff --git a/contracts/examples/package.json b/contracts/examples/package.json
index 37b73f98c..a3a79bce3 100644
--- a/contracts/examples/package.json
+++ b/contracts/examples/package.json
@@ -53,7 +53,6 @@
         "mocha": "^4.1.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
-        "solc": "^0.4.24",
         "solhint": "^1.4.1",
         "tslint": "5.11.0",
         "typescript": "3.0.1",
diff --git a/contracts/extensions/package.json b/contracts/extensions/package.json
index aee995645..6f35b2e58 100644
--- a/contracts/extensions/package.json
+++ b/contracts/extensions/package.json
@@ -65,7 +65,6 @@
         "mocha": "^4.1.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
-        "solc": "^0.4.24",
         "solhint": "^1.4.1",
         "tslint": "5.11.0",
         "typescript": "3.0.1",
diff --git a/contracts/libs/package.json b/contracts/libs/package.json
index ce7b97502..6b3a15143 100644
--- a/contracts/libs/package.json
+++ b/contracts/libs/package.json
@@ -64,7 +64,6 @@
         "mocha": "^4.1.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
-        "solc": "^0.4.24",
         "solhint": "^1.4.1",
         "tslint": "5.11.0",
         "typescript": "3.0.1",
diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json
index 2d7b4aa05..b9cf3659f 100644
--- a/contracts/multisig/package.json
+++ b/contracts/multisig/package.json
@@ -64,7 +64,6 @@
         "mocha": "^4.1.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
-        "solc": "^0.4.24",
         "solhint": "^1.4.1",
         "tslint": "5.11.0",
         "typescript": "3.0.1",
diff --git a/contracts/protocol/package.json b/contracts/protocol/package.json
index 891838e54..e10da0946 100644
--- a/contracts/protocol/package.json
+++ b/contracts/protocol/package.json
@@ -63,7 +63,6 @@
         "mocha": "^4.1.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
-        "solc": "^0.4.24",
         "solhint": "^1.4.1",
         "tslint": "5.11.0",
         "typescript": "3.0.1",
diff --git a/contracts/tokens/package.json b/contracts/tokens/package.json
index 79afc4820..fe9438a56 100644
--- a/contracts/tokens/package.json
+++ b/contracts/tokens/package.json
@@ -64,7 +64,6 @@
         "mocha": "^4.1.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
-        "solc": "^0.4.24",
         "solhint": "^1.4.1",
         "tslint": "5.11.0",
         "typescript": "3.0.1",
diff --git a/contracts/utils/package.json b/contracts/utils/package.json
index cf94af0f6..77693f003 100644
--- a/contracts/utils/package.json
+++ b/contracts/utils/package.json
@@ -65,7 +65,6 @@
         "mocha": "^4.1.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
-        "solc": "^0.4.24",
         "solhint": "^1.4.1",
         "tslint": "5.11.0",
         "typescript": "3.0.1",
diff --git a/packages/sol-compiler/CHANGELOG.json b/packages/sol-compiler/CHANGELOG.json
index 8548fd73f..c9b487fe9 100644
--- a/packages/sol-compiler/CHANGELOG.json
+++ b/packages/sol-compiler/CHANGELOG.json
@@ -9,6 +9,10 @@
             {
                 "note": "Make error and warning colouring more visually pleasant and consistent with other compilers",
                 "pr": 1461
+            },
+            {
+                "note": "Add newest solidity versions from 0.4.25 to 0.5.2",
+                "pr": 1496
             }
         ]
     },
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json
index 86167a603..4b68d6fb3 100644
--- a/packages/sol-compiler/package.json
+++ b/packages/sol-compiler/package.json
@@ -84,7 +84,7 @@
         "pluralize": "^7.0.0",
         "require-from-string": "^2.0.1",
         "semver": "5.5.0",
-        "solc": "^0.4.23",
+        "solc": "^0.5.2",
         "source-map-support": "^0.5.0",
         "web3-eth-abi": "^1.0.0-beta.24",
         "yargs": "^10.0.3"
diff --git a/packages/sol-compiler/src/solc/bin_paths.ts b/packages/sol-compiler/src/solc/bin_paths.ts
index a75255dc6..b653c0926 100644
--- a/packages/sol-compiler/src/solc/bin_paths.ts
+++ b/packages/sol-compiler/src/solc/bin_paths.ts
@@ -3,19 +3,50 @@ export interface BinaryPaths {
 }
 
 export const binPaths: BinaryPaths = {
-    '0.4.10': 'soljson-v0.4.10+commit.f0d539ae.js',
-    '0.4.11': 'soljson-v0.4.11+commit.68ef5810.js',
-    '0.4.12': 'soljson-v0.4.12+commit.194ff033.js',
-    '0.4.13': 'soljson-v0.4.13+commit.fb4cb1a.js',
-    '0.4.14': 'soljson-v0.4.14+commit.c2215d46.js',
-    '0.4.15': 'soljson-v0.4.15+commit.bbb8e64f.js',
-    '0.4.16': 'soljson-v0.4.16+commit.d7661dd9.js',
-    '0.4.17': 'soljson-v0.4.17+commit.bdeb9e52.js',
-    '0.4.18': 'soljson-v0.4.18+commit.9cf6e910.js',
-    '0.4.19': 'soljson-v0.4.19+commit.c4cbbb05.js',
-    '0.4.20': 'soljson-v0.4.20+commit.3155dd80.js',
-    '0.4.21': 'soljson-v0.4.21+commit.dfe3193c.js',
-    '0.4.22': 'soljson-v0.4.22+commit.4cb486ee.js',
-    '0.4.23': 'soljson-v0.4.23+commit.124ca40d.js',
+    '0.5.2': 'soljson-v0.5.2+commit.1df8f40c.js',
+    '0.5.1': 'soljson-v0.5.1+commit.c8a2cb62.js',
+    '0.5.0': 'soljson-v0.5.0+commit.1d4f565a.js',
+    '0.4.25': 'soljson-v0.4.25+commit.59dbf8f1.js',
     '0.4.24': 'soljson-v0.4.24+commit.e67f0147.js',
+    '0.4.23': 'soljson-v0.4.23+commit.124ca40d.js',
+    '0.4.22': 'soljson-v0.4.22+commit.4cb486ee.js',
+    '0.4.21': 'soljson-v0.4.21+commit.dfe3193c.js',
+    '0.4.20': 'soljson-v0.4.20+commit.3155dd80.js',
+    '0.4.19': 'soljson-v0.4.19+commit.c4cbbb05.js',
+    '0.4.18': 'soljson-v0.4.18+commit.9cf6e910.js',
+    '0.4.17': 'soljson-v0.4.17+commit.bdeb9e52.js',
+    '0.4.16': 'soljson-v0.4.16+commit.d7661dd9.js',
+    '0.4.15': 'soljson-v0.4.15+commit.bbb8e64f.js',
+    '0.4.14': 'soljson-v0.4.14+commit.c2215d46.js',
+    '0.4.13': 'soljson-v0.4.13+commit.fb4cb1a.js',
+    '0.4.12': 'soljson-v0.4.12+commit.194ff033.js',
+    '0.4.11': 'soljson-v0.4.11+commit.68ef5810.js',
+    '0.4.10': 'soljson-v0.4.10+commit.f0d539ae.js',
+    '0.4.9': 'soljson-v0.4.9+commit.364da425.js',
+    '0.4.8': 'soljson-v0.4.8+commit.60cc1668.js',
+    '0.4.7': 'soljson-v0.4.7+commit.822622cf.js',
+    '0.4.6': 'soljson-v0.4.6+commit.2dabbdf0.js',
+    '0.4.5': 'soljson-v0.4.5+commit.b318366e.js',
+    '0.4.4': 'soljson-v0.4.4+commit.4633f3de.js',
+    '0.4.3': 'soljson-v0.4.3+commit.2353da71.js',
+    '0.4.2': 'soljson-v0.4.2+commit.af6afb04.js',
+    '0.4.1': 'soljson-v0.4.1+commit.4fc6fc2c.js',
+    '0.4.0': 'soljson-v0.4.0+commit.acd334c9.js',
+    '0.3.6': 'soljson-v0.3.6+commit.3fc68da.js',
+    '0.3.5': 'soljson-v0.3.5+commit.5f97274.js',
+    '0.3.4': 'soljson-v0.3.4+commit.7dab890.js',
+    '0.3.3': 'soljson-v0.3.3+commit.4dc1cb1.js',
+    '0.3.2': 'soljson-v0.3.2+commit.81ae2a7.js',
+    '0.3.1': 'soljson-v0.3.1+commit.c492d9b.js',
+    '0.3.0': 'soljson-v0.3.0+commit.11d6736.js',
+    '0.2.2': 'soljson-v0.2.2+commit.ef92f56.js',
+    '0.2.1': 'soljson-v0.2.1+commit.91a6b35.js',
+    '0.2.0': 'soljson-v0.2.0+commit.4dc2445.js',
+    '0.1.7': 'soljson-v0.1.7+commit.b4e666c.js',
+    '0.1.6': 'soljson-v0.1.6+commit.d41f8b7.js',
+    '0.1.5': 'soljson-v0.1.5+commit.23865e3.js',
+    '0.1.4': 'soljson-v0.1.4+commit.5f6c3cd.js',
+    '0.1.3': 'soljson-v0.1.3+commit.28f561.js',
+    '0.1.2': 'soljson-v0.1.2+commit.d0d36e3.js',
+    '0.1.1': 'soljson-v0.1.1+commit.6ff4cd6.js',
 };
diff --git a/yarn.lock b/yarn.lock
index b86969e3b..ce638ddcd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4437,6 +4437,11 @@ comma-separated-tokens@^1.0.0:
   dependencies:
     trim "0.0.1"
 
+command-exists@^1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/command-exists/-/command-exists-1.2.8.tgz#715acefdd1223b9c9b37110a149c6392c2852291"
+  integrity sha512-PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw==
+
 commander@2.11.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
@@ -10190,6 +10195,7 @@ lodash._root@^3.0.0:
 lodash.assign@^4.0.3, lodash.assign@^4.0.6:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
+  integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
 
 lodash.camelcase@^3.0.1:
   version "3.0.1"
@@ -14058,8 +14064,9 @@ require-directory@^2.1.1:
 require-from-string@^1.1.0:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418"
+  integrity sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=
 
-require-from-string@^2.0.1:
+require-from-string@^2.0.0, require-from-string@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
 
@@ -14860,6 +14867,7 @@ socks@~2.2.0:
 solc@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.24.tgz#354f14b269b38cbaa82a47d1ff151723502b954e"
+  integrity sha512-2xd7Cf1HeVwrIb6Bu1cwY2/TaLRodrppCq3l7rhLimFQgmxptXhTC3+/wesVLpB09F1A2kZgvbMOgH7wvhFnBQ==
   dependencies:
     fs-extra "^0.30.0"
     memorystream "^0.3.1"
@@ -14868,18 +14876,9 @@ solc@0.4.24:
     yargs "^4.7.1"
 
 solc@^0.4.2:
-  version "0.4.21"
-  resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.21.tgz#6a7ecd505bfa0fc268330d5de6b9ae65c8c68264"
-  dependencies:
-    fs-extra "^0.30.0"
-    memorystream "^0.3.1"
-    require-from-string "^1.1.0"
-    semver "^5.3.0"
-    yargs "^4.7.1"
-
-solc@^0.4.23:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.23.tgz#54a0ff4015827b32fddb62c0a418b5247310a58e"
+  version "0.4.25"
+  resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.25.tgz#06b8321f7112d95b4b903639b1138a4d292f5faa"
+  integrity sha512-jU1YygRVy6zatgXrLY2rRm7HW1d7a8CkkEgNJwvH2VLpWhMFsMdWcJn6kUqZwcSz/Vm+w89dy7Z/aB5p6AFTrg==
   dependencies:
     fs-extra "^0.30.0"
     memorystream "^0.3.1"
@@ -14887,15 +14886,19 @@ solc@^0.4.23:
     semver "^5.3.0"
     yargs "^4.7.1"
 
-solc@^0.4.24:
-  version "0.4.25"
-  resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.25.tgz#06b8321f7112d95b4b903639b1138a4d292f5faa"
+solc@^0.5.2:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/solc/-/solc-0.5.2.tgz#45d5d11569e41c2b2535f3a50fe0616ca771a347"
+  integrity sha512-gZSRM+2HKe8TXeXE+RJtdPq9+8IxpukMnUXXfphJ4d5duHfKfi7lu0eBFh6WSWvnYQ8xis+sfidiurOop2q1KQ==
   dependencies:
+    command-exists "^1.2.8"
     fs-extra "^0.30.0"
+    keccak "^1.0.2"
     memorystream "^0.3.1"
-    require-from-string "^1.1.0"
-    semver "^5.3.0"
-    yargs "^4.7.1"
+    require-from-string "^2.0.0"
+    semver "^5.5.0"
+    tmp "0.0.33"
+    yargs "^11.0.0"
 
 solhint@^1.4.1:
   version "1.4.1"
@@ -15900,7 +15903,7 @@ tmp@0.0.31:
   dependencies:
     os-tmpdir "~1.0.1"
 
-tmp@^0.0.33:
+tmp@0.0.33, tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   dependencies:
@@ -17432,6 +17435,7 @@ window-size@^0.1.4:
 window-size@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075"
+  integrity sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=
 
 winston@2.1.x:
   version "2.1.1"
@@ -17688,6 +17692,7 @@ yargs-parser@10.x, yargs-parser@^10.0.0, yargs-parser@^10.1.0:
 yargs-parser@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4"
+  integrity sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=
   dependencies:
     camelcase "^3.0.0"
     lodash.assign "^4.0.6"
@@ -17816,6 +17821,7 @@ yargs@^3.7.2:
 yargs@^4.7.1:
   version "4.8.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0"
+  integrity sha1-wMQpJMpKqmsObaFznfshZDn53cA=
   dependencies:
     cliui "^3.2.0"
     decamelize "^1.1.1"