embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(embark/compiler): fix errors and bugs with solc 0.4.18

This commit is contained in:
Jonathan Rainville 2019-04-16 12:06:46 -04:00 committed by Iuri Matias
parent eb9de680d3
commit bfebb3ce41
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
packages/embark/src/lib/modules/solidity/index.js
View File

@ -129,14 +129,21 @@ class Solidity {
for (let contractFile in json) { for (let contractFile in json) {
for (let contractName in json[contractFile]) { for (let contractName in json[contractFile]) {
let className = contractName;
let realContractFile = contractFile;
// This is for solc 0.4.18 which outputs weirdly
if (className.indexOf(':') > -1) {
const nameParts = className.split(':');
realContractFile += nameParts[0];
className = nameParts[nameParts.length - 1];
}
let contract = json[contractFile][contractName]; let contract = json[contractFile][contractName];
const className = contractName; let filename = realContractFile;
let filename = contractFile;
compiled_object[className] = {}; compiled_object[className] = {};
compiled_object[className].code = contract.evm.bytecode.object; compiled_object[className].code = contract.evm.bytecode.object;
compiled_object[className].linkReferences = contract.evm.bytecode.linkReferences; compiled_object[className].linkReferences = self.getLinkReferences(contract.evm.bytecode.linkReferences);
compiled_object[className].runtimeBytecode = contract.evm.deployedBytecode.object; compiled_object[className].runtimeBytecode = contract.evm.deployedBytecode.object;
compiled_object[className].realRuntimeBytecode = contract.evm.deployedBytecode.object.slice(0, -68); compiled_object[className].realRuntimeBytecode = contract.evm.deployedBytecode.object.slice(0, -68);
compiled_object[className].swarmHash = contract.evm.deployedBytecode.object.slice(-68).slice(0, 64); compiled_object[className].swarmHash = contract.evm.deployedBytecode.object.slice(-68).slice(0, 64);
@ -157,6 +164,26 @@ class Solidity {
}); });
} }
getLinkReferences(linkReferences) {
const finalReferences = {};
for (let contractFile in linkReferences) {
for (let contractName in linkReferences[contractFile]) {
let className = contractName;
let realContractFile = contractFile;
if (className.indexOf(':') > -1) {
const nameParts = className.split(':');
realContractFile += nameParts[0];
className = nameParts[nameParts.length - 1];
}
if (!finalReferences[realContractFile]) {
finalReferences[realContractFile] = {};
}
finalReferences[realContractFile][className] = linkReferences[contractFile][contractName];
}
}
return finalReferences;
}
compile_solidity(contractFiles, options, cb) { compile_solidity(contractFiles, options, cb) {
if (!contractFiles.length) { if (!contractFiles.length) {
return cb(); return cb();

2
packages/embark/src/lib/modules/solidity/solcP.js
View File

@ -57,7 +57,7 @@ class SolcProcess extends ProcessWrapper {
let output = func(JSON.stringify(jsonObj), this.findImports.bind(this)); let output = func(JSON.stringify(jsonObj), this.findImports.bind(this));
cb(null, output); cb(null, output);
} catch (err) { } catch (err) {
cb(err.message); cb(err.message || err);
} }
} }