submit contract for deployment, not working yet

lib/modules/vyper/index.js

@@ -1,5 +1,6 @@
 let async = require('../../utils/async_extend.js');
 const shelljs = require('shelljs');
+const path = require('path');
 
 class Vyper {
 
@@ -8,7 +9,6 @@ class Vyper {
     this.events = embark.events;
     this.contractDirectories = options.contractDirectories;
 
-    console.log('Construct VYPER');
     embark.registerCompiler(".py", this.compile_vyper.bind(this));
   }
 
@@ -17,53 +17,53 @@ class Vyper {
     async.waterfall([
       function compileContracts(callback) {
         self.logger.info("compiling vyper contracts...");
+        const compiled_object = {};
         async.each(contractFiles,
-            function(file, fileCb) {
+          function (file, fileCb) {
-                shelljs.exec(`vyper ${file.filename}`, (code, stdout, stderr) => {
+            const fileNameOnly = path.basename(file.filename);
-                  console.log('Code', code);
+            compiled_object[fileNameOnly] = {};
-                  console.log('Stdout', stdout);
+            async.parallel([
-                  console.log('Stderr', stderr);
+              function getByteCode(paraCb) {
-                  fileCb();
+                shelljs.exec(`vyper ${file.filename}`, { silent: true }, (code, stdout, stderr) => {
+                  if (stderr) {
+                    return paraCb(stderr);
+                  }
+                  if (code !== 0) {
+                    return paraCb(`Vyper exited with error code ${code}`)
+                  }
+                  if (!stdout) {
+                    return paraCb('Execution returned no bytecode');
+                  }
+                  compiled_object[fileNameOnly].code = stdout.replace(/\n/g, '');
+                  paraCb();
                 });
               },
+              function getABI(paraCb) {
+                shelljs.exec(`vyper -f json ${file.filename}`, { silent: true }, (code, stdout, stderr) => {
+                  if (stderr) {
+                    return paraCb(stderr);
+                  }
+                  if (code !== 0) {
+                    return paraCb(`Vyper exited with error code ${code}`)
+                  }
+                  if (!stdout) {
+                    return paraCb('Execution returned no ABI');
+                  }
+                  let ABI = [];
+                  try {
+                    ABI = JSON.parse(stdout.replace(/\n/g, ''));
+                  } catch (e) {
+                    return paraCb('ABI is not valid JSON');
+                  }
+                  compiled_object[fileNameOnly].abiDefinition = ABI;
+                  paraCb();
+                });
+              }
+            ], fileCb);
+          },
           function (err) {
-              process.exit(); // TODO remove me
+            callback(err, compiled_object);
-              callback(err);
           });
-      },
-      function createCompiledObject(output, callback) {
-        let json = output.contracts;
-
-        if (!output || !output.contracts) {
-          return callback(new Error("error compiling for unknown reasons"));
-        }
-
-        if (Object.keys(output.contracts).length === 0 && output.sourceList.length > 0) {
-          return callback(new Error("error compiling. There are sources available but no code could be compiled, likely due to fatal errors in the solidity code").message);
-        }
-
-        let compiled_object = {};
-
-        for (let contractFile in json) {
-          for (let contractName in json[contractFile]) {
-            let contract = json[contractFile][contractName];
-
-            const className = contractName;
-            const filename = contractFile;
-
-            compiled_object[className] = {};
-            compiled_object[className].code = contract.evm.bytecode.object;
-            compiled_object[className].runtimeBytecode = contract.evm.deployedBytecode.object;
-            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].gasEstimates = contract.evm.gasEstimates;
-            compiled_object[className].functionHashes = contract.evm.methodIdentifiers;
-            compiled_object[className].abiDefinition = contract.abi;
-            compiled_object[className].filename = filename;
-          }
-        }
-
-        callback(null, compiled_object);
       }
     ], function (err, result) {
       cb(err, result);