status-im/embark-area-51
2
0
Fork 0
mirror of https://github.com/status-im/embark-area-51.git synced 2025-02-03 10:54:16 +00:00
Code Issues Projects Releases Wiki Activity

Contract constructor deploy visible

Browse Source 
Contract constructor now visible after compile, but the deploy button is not operational yet.

Modified the compilation for returning all errors that still allows for a fatal compilation error to be passed through.

Empty fiddle profile now treated as undefined.
This commit is contained in:
emizzle 2018-09-04 22:34:52 +10:00
parent 7899a03fac
commit bd3ac7c8ec
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
embark-ui/src/actions/index.js
View File

@ -222,6 +222,7 @@ export const fiddleProfile = {
timestamp = lastFiddle.timestamp; timestamp = lastFiddle.timestamp;
compilationResult = lastFiddle.compilationResult; compilationResult = lastFiddle.compilationResult;
} }
if(fiddleProfile === '') fiddleProfile = undefined;
return action(FIDDLE_PROFILE[SUCCESS], {fiddleProfiles: [{fiddleProfile, timestamp, compilationResult}]}); return action(FIDDLE_PROFILE[SUCCESS], {fiddleProfiles: [{fiddleProfile, timestamp, compilationResult}]});
}, },
failure: (error) => action(FIDDLE_PROFILE[FAILURE], {error}) failure: (error) => action(FIDDLE_PROFILE[FAILURE], {error})

2
embark-ui/src/containers/FiddleContainer.js
View File

@ -223,7 +223,7 @@ class FiddleContainer extends Component {
fatalFiddleDeployCard={this._renderFatalCard("Failed to deploy", fiddleDeployError)} fatalFiddleDeployCard={this._renderFatalCard("Failed to deploy", fiddleDeployError)}
compiledContractsCard={compiledFiddle && compiledFiddle.compilationResult && this._renderSuccessCard("Contract(s) compiled!", compiledContractsCard={compiledFiddle && compiledFiddle.compilationResult && this._renderSuccessCard("Contract(s) compiled!",
profiledFiddle && <ContractFunctions contractProfile={profiledFiddle} profiledFiddle && <ContractFunctions contractProfile={profiledFiddle}
contractFunctions={deployedFiddle} contractFunctions={[]}
onlyConstructor onlyConstructor
postContractFunction={this._onDeployClick}/> postContractFunction={this._onDeployClick}/>
)} )}

18
lib/modules/solidity/index.js
View File

@ -28,14 +28,16 @@ class Solidity {
return res.status(422).send({error: 'Body parameter \'codeToCompile\' must be a string'}); return res.status(422).send({error: 'Body parameter \'codeToCompile\' must be a string'});
} }
const input = {'fiddle': {content: sourceCode.replace(/\r\n/g, '\n')}}; const input = {'fiddle': {content: sourceCode.replace(/\r\n/g, '\n')}};
this.compile_solidity_code(input, {}, true, (errors, compilationResult) => { this.compile_solidity_code(input, {}, true, (error, compilationResult, errors) => {
if (error) res.status(500).send({error: error.message});
// write code to filesystem so we can view the source after page refresh // write code to filesystem so we can view the source after page refresh
const className = !compilationResult ? 'temp' : Object.keys(compilationResult).join('_'); const className = !compilationResult ? 'temp' : Object.keys(compilationResult).join('_');
this._writeFiddleToFile(sourceCode, className, Boolean(compilationResult), (err) => { this._writeFiddleToFile(sourceCode, className, Boolean(compilationResult), (err) => {
if (err) this.logger.trace('Error writing fiddle to filesystem: ', err); if (err) this.logger.trace('Error writing fiddle to filesystem: ', err);
}); // async, do not need to wait }); // async, do not need to wait
const responseData = {errors: errors, compilationResult: compilationResult}; const responseData = {errors, compilationResult};
this.logger.trace(`POST response /embark-api/contract/compile:\n ${JSON.stringify(responseData)}`); this.logger.trace(`POST response /embark-api/contract/compile:\n ${JSON.stringify(responseData)}`);
res.send(responseData); res.send(responseData);
}); });
@ -71,16 +73,13 @@ class Solidity {
if (err) { if (err) {
return callback(err); return callback(err);
} }
if (output.errors && returnAllErrors) {
return callback(output.errors);
}
if (output.errors) { if (output.errors) {
for (let i = 0; i < output.errors.length; i++) { for (let i = 0; i < output.errors.length; i++) {
if (output.errors[i].type === 'Warning') { if (output.errors[i].type === 'Warning') {
self.logger.warn(output.errors[i].formattedMessage); self.logger.warn(output.errors[i].formattedMessage);
} }
if (output.errors[i].type === 'Error' || output.errors[i].severity === 'error') { if ((output.errors[i].type === 'Error' || output.errors[i].severity === 'error') && !returnAllErrors) {
return callback(new Error("Solidity errors: " + output.errors[i].formattedMessage).message); return callback(new Error("Solidity errors: " + output.errors[i].formattedMessage).message);
} }
} }
@ -175,9 +174,12 @@ class Solidity {
} }
} }
callback(null, compiled_object); callback(null, compiled_object, output.errors);
}
], function (err, result, errors) {
if (returnAllErrors) {
return cb(err, result, errors);
} }
], function (err, result) {
cb(err, result); cb(err, result);
}); });
} }