From b03385cdc97d2ad8ca40eab83c706142f280a509 Mon Sep 17 00:00:00 2001
From: Mudit Gupta <guptamudit@ymail.com>
Date: Thu, 13 Jun 2019 17:03:55 +0530
Subject: [PATCH 1/3] Set solcjs as default compiler If you want to use native
 solc, set the environemnt variable POLYMATH_NATIVE_SOLC as true.

---
 .gitignore        |  1 +
 package.json      |  1 +
 truffle-config.js | 14 +++++++++++---
 yarn.lock         |  5 +++++
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index dac654947..97604bff8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ extract/
 extract.py
 extract.zip
 /test-results
+.env
diff --git a/package.json b/package.json
index 9eaf3e5a4..253fa445b 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
   },
   "homepage": "https://github.com/PolymathNetwork/polymath-core#readme",
   "dependencies": {
+    "dotenv": "^8.0.0",
     "truffle": "^5.0.4",
     "truffle-hdwallet-provider": "^1.0.4",
     "web3-provider-engine": "^14.1.0"
diff --git a/truffle-config.js b/truffle-config.js
index 21bfd6097..e9097c648 100644
--- a/truffle-config.js
+++ b/truffle-config.js
@@ -1,10 +1,18 @@
 require('babel-register');
 require('babel-polyfill');
+require('dotenv').config();
 const fs = require('fs');
 const NonceTrackerSubprovider = require("web3-provider-engine/subproviders/nonce-tracker")
 
 const HDWalletProvider = require("truffle-hdwallet-provider");
 
+let ver;
+if (process.env.POLYMATH_NATIVE_SOLC) {
+  ver = "native";
+} else {
+  ver = "0.5.8";
+}
+
 module.exports = {
   networks: {
     development: {
@@ -59,11 +67,11 @@ module.exports = {
   },
   compilers: {
     solc: {
-      version: "native",  
+      version: ver,
       settings: {
         optimizer: {
-          enabled: true, 
-          runs: 200    
+          enabled: true,
+          runs: 200
         }
       }
     }
diff --git a/yarn.lock b/yarn.lock
index 811ba256c..66ba16a49 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1825,6 +1825,11 @@ dom-walk@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
 
+dotenv@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.0.0.tgz#ed310c165b4e8a97bb745b0a9d99c31bda566440"
+  integrity sha512-30xVGqjLjiUOArT4+M5q9sYdvuR4riM6yK9wMcas9Vbp6zZa+ocC9dp6QoftuhTPhFAiLK/0C5Ni2nou/Bk8lg==
+
 drbg.js@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/drbg.js/-/drbg.js-1.0.1.tgz#3e36b6c42b37043823cdbc332d58f31e2445480b"

From 32ae89a8b2304cc70434c4f24090a707ab7af279 Mon Sep 17 00:00:00 2001
From: Mudit Gupta <guptamudit@ymail.com>
Date: Thu, 13 Jun 2019 17:21:37 +0530
Subject: [PATCH 2/3] Removed native solc from travis

---
 .travis.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dd6e62466..f136f7448 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,13 +8,6 @@ jobs:
   include:
     - stage: Test
       install:
-        - echo -ne '\n' | sudo add-apt-repository ppa:ethereum/ethereum
-        - sudo apt-get update
-        - sudo apt-get install -y dpkg
-        - sudo apt-get install -y solc
-        - curl -L -o solc https://github.com/ethereum/solidity/releases/download/v0.5.8/solc-static-linux
-        - sudo mv solc /usr/bin/solc
-        - sudo chmod +x /usr/bin/solc
         - yarn install
       before_script:
         - truffle version

From 35482b31ee9c68abbc998207276963ac1a546308 Mon Sep 17 00:00:00 2001
From: Mudit Gupta <guptamudit@ymail.com>
Date: Thu, 13 Jun 2019 17:25:02 +0530
Subject: [PATCH 3/3] Removed native solc version query from travis

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f136f7448..f95062929 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,6 @@ jobs:
         - yarn install
       before_script:
         - truffle version
-        - solc --version
       script: npm run test
 notifications:
   slack: