output the wasm file in .embark

This commit is contained in:
Jonathan Rainville 2019-10-04 14:03:58 -04:00
parent 453c1d3aa2
commit aa88b9c2b4
1 changed files with 7 additions and 3 deletions

View File

@ -8,6 +8,8 @@ function buf2hex(buffer) { // buffer is an ArrayBuffer
return Array.prototype.map.call(new Uint8Array(buffer), x => ('00' + x.toString(16)).slice(-2)).join(''); return Array.prototype.map.call(new Uint8Array(buffer), x => ('00' + x.toString(16)).slice(-2)).join('');
} }
const OUTPUT_DIR = '.embark/ewasm-contract-outputs';
class NimCompiler { class NimCompiler {
constructor(embark) { constructor(embark) {
this.events = embark.events; this.events = embark.events;
@ -45,7 +47,9 @@ class NimCompiler {
compiledObject[className] = {}; compiledObject[className] = {};
// Compile file // Compile file
exec(`docker run --entrypoint="nimplayc" -v "${this.dappPath()}":/code/ -w /code/ jacqueswww/nimclang ${file.path.replace(/\\/g, '/')}`, (err, stdout, stderr) => { const formattedFile = file.path.replace(/\\/g, '/');
const output = OUTPUT_DIR + '/' + path.basename(formattedFile);
exec(`docker run --entrypoint="nimplayc" -v "${this.dappPath()}":/code/ -w /code/ jacqueswww/nimclang ${formattedFile} ${output}`, (err, stdout, stderr) => {
if (err) { if (err) {
this.logger.error('Error while compiling Nim contract'); this.logger.error('Error while compiling Nim contract');
this.logger.error(stderr); this.logger.error(stderr);
@ -54,7 +58,7 @@ class NimCompiler {
// Get bytecode from the WASM file // Get bytecode from the WASM file
let escapedWast = ''; let escapedWast = '';
const wasm = buf2hex(fs.readFileSync(file.path.replace('.nim', '.wasm'))); const wasm = buf2hex(fs.readFileSync(this.dappPath(output)));
for (let i = 0; i < wasm.length; i += 2) { for (let i = 0; i < wasm.length; i += 2) {
escapedWast += "\\" + wasm.slice(i, i + 2); escapedWast += "\\" + wasm.slice(i, i + 2);
} }
@ -74,7 +78,7 @@ class NimCompiler {
compiledObject[className].code = codeHex; compiledObject[className].code = codeHex;
// Get ABI from nim file // Get ABI from nim file
exec(`docker run --entrypoint="abi_gen" -v "${this.dappPath('contracts')}":/code/ -w /code/ jacqueswww/nimclang ${path.basename(file.path)}`, (err, stdout, stderr) => { exec(`docker run --entrypoint="abi_gen" -v "${this.dappPath()}":/code/ -w /code/ jacqueswww/nimclang ${formattedFile}`, (err, stdout, stderr) => {
if (err) { if (err) {
this.logger.error('Error while getting ABI'); this.logger.error('Error while getting ABI');
this.logger.error(stderr); this.logger.error(stderr);