6 files changed, 18 insertions, 60 deletions
diff --git a/packages/sol-compiler/README.md b/packages/sol-compiler/README.md
index 412a5fc02..a75d92e7e 100644
--- a/packages/sol-compiler/README.md
+++ b/packages/sol-compiler/README.md
@@ -1,4 +1,4 @@
-## @0x/sol-compiler
+## @dexon-foundation/sol-compiler
 
 Sol-compiler is a wrapper around [solc-js](https://www.npmjs.com/package/solc) that adds:
 
@@ -15,13 +15,13 @@ Sol-compiler is a wrapper around [solc-js](https://www.npmjs.com/package/solc) t
 #### CLI Installation
 
 ```bash
-yarn global add @0x/sol-compiler
+yarn global add @dexon-foundation/sol-compiler
 ```
 
 #### API Installation
 
 ```bash
-yarn add @0x/sol-compiler
+yarn add @dexon-foundation/sol-compiler
 ```
 
 If your project is in [TypeScript](https://www.typescriptlang.org/), add the following to your `tsconfig.json`:
@@ -35,13 +35,13 @@ If your project is in [TypeScript](https://www.typescriptlang.org/), add the fol
 **Import**
 
 ```typescript
-import { Compiler } from '@0x/sol-compiler';
+import { Compiler } from '@dexon-foundation/sol-compiler';
 ```
 
 or
 
 ```javascript
-var Compiler = require('@0x/sol-compiler').Compiler;
+var Compiler = require('@dexon-foundation/sol-compiler').Compiler;
 ```
 
 ## Contributing
@@ -69,13 +69,13 @@ yarn install
 To build this package and all other monorepo packages that it depends on, run the following from the monorepo root directory:
 
 ```bash
-PKG=@0x/sol-compiler yarn build
+PKG=@dexon-foundation/sol-compiler yarn build
 ```
 
 Or continuously rebuild on change:
 
 ```bash
-PKG=@0x/sol-compiler yarn watch
+PKG=@dexon-foundation/sol-compiler yarn watch
 ```
 
 ### Clean
diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json
index 0b53cffd5..344621285 100644
--- a/packages/sol-compiler/package.json
+++ b/packages/sol-compiler/package.json
@@ -1,6 +1,6 @@
 {
-    "name": "@0x/sol-compiler",
-    "version": "2.0.2",
+    "name": "@dexon-foundation/sol-compiler",
+    "version": "2.0.5",
     "engines": {
         "node": ">=6.12"
     },
@@ -29,7 +29,7 @@
         }
     },
     "bin": {
-        "sol-compiler": "bin/sol-compiler.js"
+        "dsol-compiler": "bin/sol-compiler.js"
     },
     "repository": {
         "type": "git",
@@ -74,6 +74,8 @@
         "@0x/typescript-typings": "^3.0.8",
         "@0x/utils": "^3.0.1",
         "@0x/web3-wrapper": "^3.2.4",
+        "@dexon-foundation/dsolc": "^0.5.1",
+        "@dexon-foundation/typescript-typings": "^1.0.0",
         "@types/yargs": "^11.0.0",
         "chalk": "^2.3.0",
         "chokidar": "^2.0.4",
@@ -84,7 +86,6 @@
         "pluralize": "^7.0.0",
         "require-from-string": "^2.0.1",
         "semver": "5.5.0",
-        "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/compiler.ts b/packages/sol-compiler/src/compiler.ts
index d38ccbf39..4bc9343e7 100644
--- a/packages/sol-compiler/src/compiler.ts
+++ b/packages/sol-compiler/src/compiler.ts
@@ -17,7 +17,7 @@ import * as _ from 'lodash';
 import * as path from 'path';
 import * as pluralize from 'pluralize';
 import * as semver from 'semver';
-import solc = require('solc');
+import solc = require('@dexon-foundation/dsolc');
 
 import { compilerOptionsSchema } from './schemas/compiler_options_schema';
 import { binPaths } from './solc/bin_paths';
diff --git a/packages/sol-compiler/src/solc/bin_paths.ts b/packages/sol-compiler/src/solc/bin_paths.ts
index b653c0926..daa17ae6c 100644
--- a/packages/sol-compiler/src/solc/bin_paths.ts
+++ b/packages/sol-compiler/src/solc/bin_paths.ts
@@ -3,50 +3,7 @@ export interface BinaryPaths {
 }
 
 export const binPaths: BinaryPaths = {
-    '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',
+    '0.5.1': 'soljson-v0.5.1+commit.d7688b80.js',
+    '0.5.0': 'soljson-v0.5.0+commit.366fa976.js',
+    '0.4.25': 'soljson-v0.4.25+commit.433aebb7.js',
 };
diff --git a/packages/sol-compiler/src/utils/compiler.ts b/packages/sol-compiler/src/utils/compiler.ts
index db308f2b5..e6a8825d8 100644
--- a/packages/sol-compiler/src/utils/compiler.ts
+++ b/packages/sol-compiler/src/utils/compiler.ts
@@ -6,7 +6,7 @@ import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 import * as path from 'path';
 import * as requireFromString from 'require-from-string';
-import * as solc from 'solc';
+import * as solc from '@dexon-foundation/dsolc';
 
 import { binPaths } from '../solc/bin_paths';
 
diff --git a/packages/sol-compiler/src/utils/constants.ts b/packages/sol-compiler/src/utils/constants.ts
index 433897f8a..ed33be835 100644
--- a/packages/sol-compiler/src/utils/constants.ts
+++ b/packages/sol-compiler/src/utils/constants.ts
@@ -2,7 +2,7 @@ import * as path from 'path';
 
 export const constants = {
     SOLIDITY_FILE_EXTENSION: '.sol',
-    BASE_COMPILER_URL: 'https://ethereum.github.io/solc-bin/bin/',
+    BASE_COMPILER_URL: 'https://dexon-foundation.github.io/dsolc-bin/bin/',
     LATEST_ARTIFACT_VERSION: '2.0.0',
     SOLC_BIN_DIR: path.join(__dirname, '..', '..', 'solc_bin'),
 };