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

Merge pull request #367 from embark-framework/refactor/vyper-utils

Browse Source 
Refactor Vyper compiler
This commit is contained in:
Iuri Matias 2018-04-17 11:35:38 -04:00 committed by GitHub
commit e5ae6bc86e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
lib/modules/vyper/index.js
View File

@ -12,11 +12,28 @@ class Vyper {
embark.registerCompiler(".py", this.compile_vyper.bind(this)); embark.registerCompiler(".py", this.compile_vyper.bind(this));
} }
static compileVyperContract(filename, compileABI, callback) {
const params = compileABI ? '-f json ' : '';
shelljs.exec(`vyper ${params}${filename}`, {silent: true}, (code, stdout, stderr) => {
if (stderr) {
return callback(stderr);
}
if (code !== 0) {
return callback(`Vyper exited with error code ${code}`);
}
if (!stdout) {
return callback('Execution returned no result');
}
callback(null, stdout.replace(/\n/g, ''));
});
}
compile_vyper(contractFiles, cb) { compile_vyper(contractFiles, cb) {
let self = this; let self = this;
async.waterfall([ if (!contractFiles || !contractFiles.length) {
function compileContracts(callback) { return cb();
self.logger.info("compiling vyper contracts..."); }
self.logger.info("compiling Vyper contracts...");
const compiled_object = {}; const compiled_object = {};
async.each(contractFiles, async.each(contractFiles,
function (file, fileCb) { function (file, fileCb) {
@ -24,17 +41,10 @@ class Vyper {
compiled_object[className] = {}; compiled_object[className] = {};
async.parallel([ async.parallel([
function getByteCode(paraCb) { function getByteCode(paraCb) {
shelljs.exec(`vyper ${file.filename}`, {silent: true}, (code, stdout, stderr) => { Vyper.compileVyperContract(file.filename, false, (err, byteCode) => {
if (stderr) { if (err) {
return paraCb(stderr); return paraCb(err);
} }
if (code !== 0) {
return paraCb(`Vyper exited with error code ${code}`);
}
if (!stdout) {
return paraCb('Execution returned no bytecode');
}
const byteCode = stdout.replace(/\n/g, '');
compiled_object[className].runtimeBytecode = byteCode; compiled_object[className].runtimeBytecode = byteCode;
compiled_object[className].realRuntimeBytecode = byteCode; compiled_object[className].realRuntimeBytecode = byteCode;
compiled_object[className].code = byteCode; compiled_object[className].code = byteCode;
@ -42,19 +52,13 @@ class Vyper {
}); });
}, },
function getABI(paraCb) { function getABI(paraCb) {
shelljs.exec(`vyper -f json ${file.filename}`, {silent: true}, (code, stdout, stderr) => { Vyper.compileVyperContract(file.filename, true, (err, ABIString) => {
if (stderr) { if (err) {
return paraCb(stderr); return paraCb(err);
}
if (code !== 0) {
return paraCb(`Vyper exited with error code ${code}`);
}
if (!stdout) {
return paraCb('Execution returned no ABI');
} }
let ABI = []; let ABI = [];
try { try {
ABI = JSON.parse(stdout.replace(/\n/g, '')); ABI = JSON.parse(ABIString);
} catch (e) { } catch (e) {
return paraCb('ABI is not valid JSON'); return paraCb('ABI is not valid JSON');
} }
@ -65,14 +69,9 @@ class Vyper {
], fileCb); ], fileCb);
}, },
function (err) { function (err) {
callback(err, compiled_object); cb(err, compiled_object);
}); });
} }
], function (err, result) {
cb(err, result);
});
}
} }
module.exports = Vyper; module.exports = Vyper;