mirror of https://github.com/embarklabs/embark.git
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.
This commit is contained in:
parent
06c2d9807d
commit
4202d5e832
|
@ -9,7 +9,7 @@
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"homepage": "",
|
"homepage": "",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"embark": "^2.4.0",
|
"embark": "^2.4.3",
|
||||||
"mocha": "^2.2.5"
|
"mocha": "^2.2.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"homepage": "",
|
"homepage": "",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"embark": "^2.4.1",
|
"embark": "^2.4.3",
|
||||||
"mocha": "^2.2.5"
|
"mocha": "^2.2.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,7 +60,7 @@ author = u'Iuri Matias'
|
||||||
# The short X.Y version.
|
# The short X.Y version.
|
||||||
version = u'2.4'
|
version = u'2.4'
|
||||||
# The full version, including alpha/beta/rc tags.
|
# 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
|
# The language for content autogenerated by Sphinx. Refer to documentation
|
||||||
# for a list of supported languages.
|
# for a list of supported languages.
|
||||||
|
|
|
@ -85,8 +85,15 @@ class Compiler {
|
||||||
|
|
||||||
let compiled_object = {};
|
let compiled_object = {};
|
||||||
|
|
||||||
for (let className in json) {
|
for (let contractName in json) {
|
||||||
let contract = json[className];
|
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] = {};
|
||||||
compiled_object[className].code = contract.bytecode;
|
compiled_object[className].code = contract.bytecode;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "embark",
|
"name": "embark",
|
||||||
"version": "2.4.0",
|
"version": "2.4.3",
|
||||||
"description": "Embark is a framework that allows you to easily develop and deploy DApps",
|
"description": "Embark is a framework that allows you to easily develop and deploy DApps",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "grunt jshint && mocha test/ --no-timeouts"
|
"test": "grunt jshint && mocha test/ --no-timeouts"
|
||||||
|
@ -29,7 +29,7 @@
|
||||||
"promptly": "^2.1.0",
|
"promptly": "^2.1.0",
|
||||||
"serve-static": "^1.11.1",
|
"serve-static": "^1.11.1",
|
||||||
"shelljs": "^0.5.0",
|
"shelljs": "^0.5.0",
|
||||||
"solc": "0.4.8",
|
"solc": "0.4.11",
|
||||||
"toposort": "^1.0.0",
|
"toposort": "^1.0.0",
|
||||||
"underscore": "^1.8.3",
|
"underscore": "^1.8.3",
|
||||||
"underscore.string": "^3.3.4",
|
"underscore.string": "^3.3.4",
|
||||||
|
|
Loading…
Reference in New Issue