From 35bb010c3542f4c324a8cea9d8437ff63969b1b1 Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Fri, 20 Apr 2018 13:38:51 -0700
Subject: Add support for solidity 0.4.23

---
 packages/contracts/package.json         | 2 +-
 packages/deployer/CHANGELOG.json        | 9 +++++++++
 packages/deployer/package.json          | 2 +-
 packages/deployer/src/solc/bin_paths.ts | 1 +
 yarn.lock                               | 6 +++---
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/packages/contracts/package.json b/packages/contracts/package.json
index 1c22b2bec..30867476f 100644
--- a/packages/contracts/package.json
+++ b/packages/contracts/package.json
@@ -54,7 +54,7 @@
         "npm-run-all": "^4.1.2",
         "prettier": "^1.11.1",
         "shx": "^0.2.2",
-        "solc": "^0.4.22",
+        "solc": "^0.4.23",
         "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 6185aa7ce..943d4a6f5 100644
--- a/packages/deployer/CHANGELOG.json
+++ b/packages/deployer/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "version": "0.4.2",
+        "changes": [
+            {
+                "note": "Add support for solidity 0.4.23",
+                "pr": 545
+            }
+        ]
+    },
     {
         "version": "0.4.1",
         "changes": [
diff --git a/packages/deployer/package.json b/packages/deployer/package.json
index 5e855e393..2d5538c97 100644
--- a/packages/deployer/package.json
+++ b/packages/deployer/package.json
@@ -81,7 +81,7 @@
         "lodash": "^4.17.4",
         "require-from-string": "^2.0.1",
         "semver": "^5.5.0",
-        "solc": "^0.4.22",
+        "solc": "^0.4.23",
         "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 9ac00ea9d..1b5e8c6f1 100644
--- a/packages/deployer/src/solc/bin_paths.ts
+++ b/packages/deployer/src/solc/bin_paths.ts
@@ -16,4 +16,5 @@ export const binPaths: BinaryPaths = {
     '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',
 };
diff --git a/yarn.lock b/yarn.lock
index a62d48512..be72ead11 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9664,9 +9664,9 @@ 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"
+solc@^0.4.23:
+  version "0.4.23"
+  resolved "https://registry.yarnpkg.com/solc/-/solc-0.4.23.tgz#54a0ff4015827b32fddb62c0a418b5247310a58e"
   dependencies:
     fs-extra "^0.30.0"
     memorystream "^0.3.1"
-- 
cgit 


From a10e466fedaf1d291d24931f1743bb6becd101db Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Fri, 20 Apr 2018 13:39:29 -0700
Subject: Fix getABIEncodedTransactionData in contract templates

---
 packages/contract_templates/partials/tx.handlebars | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/contract_templates/partials/tx.handlebars b/packages/contract_templates/partials/tx.handlebars
index 22fe0c597..1bdf80c42 100644
--- a/packages/contract_templates/partials/tx.handlebars
+++ b/packages/contract_templates/partials/tx.handlebars
@@ -52,7 +52,7 @@ public {{this.tsName}} = {
         const self = this as any as {{contractName}}Contract;
         const inputAbi = self._lookupAbi('{{this.functionSignature}}').inputs;
         [{{> params inputs=inputs}}] = BaseContract._formatABIDataItemList(inputAbi, [{{> params inputs=inputs}}], BaseContract._bigNumberToString.bind(self));
-        const abiEncodedTransactionData = self._lookupEthersInterface('{{this.name}}').functions.{{this.name}}(
+        const abiEncodedTransactionData = self._lookupEthersInterface('{{this.functionSignature}}').functions.{{this.name}}(
             {{> params inputs=inputs}}
         ).data;
         return abiEncodedTransactionData;
-- 
cgit