Update deployer and contracts repo to use solidity 0.4.22

5 files changed, 36 insertions, 12 deletions

diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index eb1701a18..67d4257f5 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -15,10 +15,13 @@
         "test": "run-s build run_mocha",
         "test:coverage": "SOLIDITY_COVERAGE=true run-s build run_mocha coverage:report:text coverage:report:lcov",
         "run_mocha": "mocha 'lib/test/**/*.js' --timeout 100000 --bail --exit",
-        "compile:comment": "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846",
-        "compile": "node ../deployer/lib/src/cli.js compile --contracts ${npm_package_config_contracts} --contracts-dir src/contracts --artifacts-dir ../migrations/src/artifacts",
+        "compile:comment":
+            "Yarn workspaces do not link binaries correctly so we need to reference them directly https://github.com/yarnpkg/yarn/issues/3846",
+        "compile":
+            "node ../deployer/lib/src/cli.js compile --contracts ${npm_package_config_contracts} --contracts-dir src/contracts --artifacts-dir ../migrations/src/artifacts",
         "clean": "shx rm -rf ./lib",
-        "generate_contract_wrappers": "node ../abi-gen/lib/index.js --abis  ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
+        "generate_contract_wrappers":
+            "node ../abi-gen/lib/index.js --abis  ${npm_package_config_abis} --template ../contract_templates/contract.handlebars --partials '../contract_templates/partials/**/*.handlebars' --output src/contract_wrappers/generated --backend ethers && prettier --write 'src/contract_wrappers/generated/**.ts'",
         "lint": "tslint --project . 'migrations/**/*.ts' 'test/**/*.ts' 'util/**/*.ts' 'deploy/**/*.ts'",
         "coverage:report:text": "istanbul report text",
         "coverage:report:html": "istanbul report html && open coverage/index.html",
@@ -26,8 +29,10 @@
         "test:circleci": "yarn test:coverage"
     },
     "config": {
-        "abis": "../migrations/src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|Arbitrage|EtherDelta|AccountLevels).json",
-        "contracts": "Exchange,DummyToken,ZRXToken,Token,WETH9,TokenTransferProxy,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,MaliciousToken,TokenRegistry,Arbitrage,EtherDelta,AccountLevels"
+        "abis":
+            "../migrations/src/artifacts/@(DummyToken|TokenTransferProxy|Exchange|TokenRegistry|MultiSigWallet|MultiSigWalletWithTimeLock|MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress|TokenRegistry|ZRXToken|Arbitrage|EtherDelta|AccountLevels).json",
+        "contracts":
+            "Exchange,DummyToken,ZRXToken,Token,WETH9,TokenTransferProxy,MultiSigWallet,MultiSigWalletWithTimeLock,MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress,MaliciousToken,TokenRegistry,Arbitrage,EtherDelta,AccountLevels"
     },
     "repository": {
         "type": "git",
@@ -54,7 +59,7 @@
         "npm-run-all": "^4.1.2",
         "prettier": "^1.11.1",
         "shx": "^0.2.2",
-        "solc": "^0.4.18",
+        "solc": "^0.4.22",
         "tslint": "5.8.0",
         "typescript": "2.7.1",
         "yargs": "^10.0.3"
diff --git a/packages/deployer/CHANGELOG.json b/packages/deployer/CHANGELOG.json
index b130405dc..c6dc6262c 100644
--- a/packages/deployer/CHANGELOG.json
+++ b/packages/deployer/CHANGELOG.json
@@ -1,5 +1,13 @@
 [
     {
+        "version": "0.4.1",
+        "changes": [
+            {
+                "note": "Add support for solidity 0.4.22"
+            }
+        ]
+    },
+    {
         "version": "0.4.0",
         "changes": [
             {
diff --git a/packages/deployer/package.json b/packages/deployer/package.json
index d529382ac..d4882c932 100644
--- a/packages/deployer/package.json
+++ b/packages/deployer/package.json
@@ -6,7 +6,8 @@
     "types": "lib/src/index.d.ts",
     "scripts": {
         "build:watch": "tsc -w",
-        "build": "yarn clean && copyfiles 'test/fixtures/contracts/**/*' ./lib && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
+        "build":
+            "yarn clean && copyfiles 'test/fixtures/contracts/**/*' ./lib && tsc && copyfiles -u 3 './lib/src/monorepo_scripts/**/*' ./scripts",
         "test": "run-s build run_mocha",
         "run_mocha": "mocha lib/test/*_test.js --bail --exit",
         "test:coverage": "nyc npm run test --all && yarn coverage:report:lcov",
@@ -19,15 +20,14 @@
         "docs:stage": "yarn build && node ./scripts/stage_docs.js",
         "manual:postpublish": "yarn build; node ./scripts/postpublish.js",
         "docs:json": "typedoc --excludePrivate --excludeExternals --target ES5 --json $JSON_FILE_PATH $PROJECT_FILES",
-        "upload_docs_json": "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json"
+        "upload_docs_json":
+            "aws s3 cp generated_docs/index.json $S3_URL --profile 0xproject --grants read=uri=http://acs.amazonaws.com/groups/global/AllUsers --content-type application/json"
     },
     "config": {
         "postpublish": {
             "assets": [],
             "docPublishConfigs": {
-                "extraFileIncludes": [
-                    "../types/src/index.ts"
-                ],
+                "extraFileIncludes": ["../types/src/index.ts"],
                 "s3BucketPath": "s3://doc-jsons/deployer/",
                 "s3StagingBucketPath": "s3://staging-doc-jsons/deployer/"
             }
@@ -81,7 +81,7 @@
         "lodash": "^4.17.4",
         "require-from-string": "^2.0.1",
         "semver": "^5.5.0",
-        "solc": "^0.4.18",
+        "solc": "^0.4.22",
         "web3": "^0.20.0",
         "web3-eth-abi": "^1.0.0-beta.24",
         "yargs": "^10.0.3"
diff --git a/packages/deployer/src/solc/bin_paths.ts b/packages/deployer/src/solc/bin_paths.ts
index 53086113a..9ac00ea9d 100644
--- a/packages/deployer/src/solc/bin_paths.ts
+++ b/packages/deployer/src/solc/bin_paths.ts
@@ -15,4 +15,5 @@ export const binPaths: BinaryPaths = {
     '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',
 };
diff --git a/yarn.lock b/yarn.lock
index e936833d4..2d3af8b03 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9621,6 +9621,16 @@ solc@^0.4.18, solc@^0.4.2:
     semver "^5.3.0"
     yargs "^4.7.1"
 
+solc@^0.4.22:
+  version "0.4.22"
+  resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.22.tgz#bbb879e4bc371604158430130a978f43f55ee48a"
+  dependencies:
+    fs-extra "^0.30.0"
+    memorystream "^0.3.1"
+    require-from-string "^1.1.0"
+    semver "^5.3.0"
+    yargs "^4.7.1"
+
 solidity-parser-antlr@^0.2.8:
   version "0.2.8"
   resolved "https://registry.yarnpkg.com/solidity-parser-antlr/-/solidity-parser-antlr-0.2.8.tgz#8eb8547a88dfeaf6cf4c7811e3824084214244d4"