From 4202d5e832c9edf873861c1f58a36a42d6a205aa Mon Sep 17 00:00:00 2001
From: Nathan Hernandez <email@nathanph.com>
Date: Fri, 2 Jun 2017 21:20:27 -0400
Subject: [PATCH] Update solc to 0.4.11

The solidity compiler was at 0.4.8, 3 patches behind. At some point the
output of the compiler changed, `compiler.js` reflects those changes.
I'm not sure if other properties changed.
---
 boilerplate/package.json  |  2 +-
 demo/package.json         |  2 +-
 docs/conf.py              |  2 +-
 lib/contracts/compiler.js | 11 +++++++++--
 package.json              |  4 ++--
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/boilerplate/package.json b/boilerplate/package.json
index ebd650e94..a1ab4c7fa 100644
--- a/boilerplate/package.json
+++ b/boilerplate/package.json
@@ -9,7 +9,7 @@
   "license": "ISC",
   "homepage": "",
   "devDependencies": {
-    "embark": "^2.4.0",
+    "embark": "^2.4.3",
     "mocha": "^2.2.5"
   }
 }
diff --git a/demo/package.json b/demo/package.json
index d955d134d..e6a56c6a1 100644
--- a/demo/package.json
+++ b/demo/package.json
@@ -10,7 +10,7 @@
   "license": "ISC",
   "homepage": "",
   "devDependencies": {
-    "embark": "^2.4.1",
+    "embark": "^2.4.3",
     "mocha": "^2.2.5"
   }
 }
diff --git a/docs/conf.py b/docs/conf.py
index 7af4b190a..a8b3afd5a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -60,7 +60,7 @@ author = u'Iuri Matias'
 # The short X.Y version.
 version = u'2.4'
 # The full version, including alpha/beta/rc tags.
-release = u'2.4.0'
+release = u'2.4.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/lib/contracts/compiler.js b/lib/contracts/compiler.js
index 20b0d932a..4644d4bef 100644
--- a/lib/contracts/compiler.js
+++ b/lib/contracts/compiler.js
@@ -85,8 +85,15 @@ class Compiler {
 
         let compiled_object = {};
 
-        for (let className in json) {
-          let contract = json[className];
+        for (let contractName in json) {
+          let contract = json[contractName];
+
+          // Pull out filename:classname
+          // [0] filename:classname
+          // [1] filename
+          // [2] classname
+          const regex = /(.*):(.*)/;
+          const className = contractName.match(regex)[2];
 
           compiled_object[className] = {};
           compiled_object[className].code = contract.bytecode;
diff --git a/package.json b/package.json
index 7b77491d0..ef7de2440 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "embark",
-  "version": "2.4.0",
+  "version": "2.4.3",
   "description": "Embark is a framework that allows you to easily develop and deploy DApps",
   "scripts": {
     "test": "grunt jshint && mocha test/ --no-timeouts"
@@ -29,7 +29,7 @@
     "promptly": "^2.1.0",
     "serve-static": "^1.11.1",
     "shelljs": "^0.5.0",
-    "solc": "0.4.8",
+    "solc": "0.4.11",
     "toposort": "^1.0.0",
     "underscore": "^1.8.3",
     "underscore.string": "^3.3.4",