Merge 1908e2f into 19518b7

examples/initemittest/logic.ergo

@@ -21,4 +21,10 @@ contract InitEmitTest over TemplateModel state State {
 		return Response{
 		}
 	}
+	clause greet(request:Request) : Response {
+		set state State {};
+    emit Greeting{ message: "Voila!" };
+		return Response{
+		}
+	}
 }

examples/initemittest/state.json

@@ -1,2 +1 @@
-{ "$class": "org.accordproject.cicero.contract.AccordContractState",
-  "stateId" : "1" }
+{ "$class": "org.accordproject.initemittest.State" }

extraction/compilerJS.ml

@@ -103,13 +103,23 @@ let json_of_result res =
     val error = json_of_ergo_success ()
     val result = Js.string res
     val code = Js.bool false
+    val contractName = Js.null
+  end
+
+let json_of_result_with_contract_name cn res =
+  object%js
+    val error = json_of_ergo_success ()
+    val result = Js.string res
+    val code = Js.bool false
+    val contractName = Js.some (Js.string cn)
   end
 
 let json_of_error gconf error =
   object%js
     val error = json_of_ergo_error gconf error
     val result = Js.string ""
     val code = Js.bool true
+    val contractName = Js.null
   end
 
 let ergo_compile input =
@@ -118,9 +128,12 @@ let ergo_compile input =
     let gconf = global_config_of_json gconf input in
     let target_lang = ErgoConfig.get_target_lang gconf in
     let all_modules = ErgoConfig.get_all_sorted gconf in
-    let (file,res) = ErgoCompile.ergo_compile target_lang all_modules in
+    let (contract_name,file,res) = ErgoCompile.ergo_compile target_lang all_modules in
     let res = ErgoCompile.ergo_link gconf res in
-    json_of_result res
+    begin match contract_name with
+    | None -> json_of_result res
+    | Some cn -> json_of_result_with_contract_name cn res
+    end
   with
   | Ergo_Error error -> json_of_error gconf error
   | exn -> json_of_error gconf (ergo_system_error (Printexc.to_string exn))

extraction/src/ErgoCompile.ml

@@ -20,8 +20,14 @@ open ErgoConfig
 open PrettyIL
 
 let res_convert code =
+  let contract_name =
+    begin match code.res_contract_name with
+    | None -> None
+    | Some cn -> Some (string_of_char_list cn)
+    end
+  in
   (* Printf.printf "NNRC Module: %s" (pretty_nnrc_module false 0 false (Jarray []) false code.res_nnrc); *)
-  (string_of_char_list code.res_file, code.res_content)
+  (contract_name, string_of_char_list code.res_file, code.res_content)
 
 let compile_module_to_javascript version inputs =
   let code = ErgoCompiler.ergo_module_to_javascript version inputs in
@@ -75,7 +81,7 @@ let print_monitor source_file =
 let ergo_proc gconf inputs =
   let target_lang = ErgoConfig.get_target_lang gconf in
   let ext = extension_of_lang target_lang in
-  let (source_file,result) = ergo_compile target_lang inputs in
+  let (contract_name,source_file,result) = ergo_compile target_lang inputs in
   Printf.printf "Compiling Ergo '%s' -- " source_file;
   let result = ergo_link gconf result in
   print_generate source_file ext result;

mechanization/Compiler/ErgoDriver.v

@@ -269,7 +269,7 @@ Section ErgoDriver.
                 eolift (fun init : laergo_module * compilation_context =>
                           let (p, ctxt) := init in
                           let res := ergo_module_to_javascript version ctxt p in
-                          elift (fun xy => mkResultFile p.(module_file) (fst xy) (snd xy)) res)
+                          elift (fun xy => mkResultFile None p.(module_file) (fst xy) (snd xy)) res)
                        cinit) bm.
 
     Definition ergo_module_to_java_top
@@ -281,7 +281,7 @@ Section ErgoDriver.
                 eolift (fun init : laergo_module * compilation_context =>
                           let (p, ctxt) := init in
                           let res := ergo_module_to_java ctxt p in
-                          elift (fun xy => mkResultFile p.(module_file) (fst xy) (string_to_estring (snd xy))) res)
+                          elift (fun xy => mkResultFile None p.(module_file) (fst xy) (string_to_estring (snd xy))) res)
                        cinit) bm.
 
     Definition ergo_module_to_cicero_top
@@ -302,10 +302,13 @@ Section ErgoDriver.
                          let sigs := lookup_contract_signatures (snd c) in
                          let pc := ergo_module_to_ergoct ctxt p in
                          let pn := eolift (fun xy => ergoct_module_to_nnrc (fst xy)) pc in
-                         elift (fun x => (x,ergoc_module_to_cicero contract_name (snd c).(contract_state) sigs x)) pn)
+                         elift (fun x => (contract_name, x,ergoc_module_to_cicero contract_name (snd c).(contract_state) sigs x)) pn)
                       ec
                 in
-                elift (fun xy => mkResultFile p.(module_file) (fst xy) (snd xy)) res)
+                elift (fun xyz =>
+                         let '(contract_name, nmod, ncontent) := xyz in
+                         mkResultFile (Some contract_name) p.(module_file) nmod ncontent)
+                      res)
              ctxt) bm.
 
   End CompilerTop.

mechanization/ErgoNNRC/Lang/ErgoNNRC.v

@@ -64,11 +64,12 @@ Section ErgoNNRC.
 
   Record result_file :=
     mkResultFile {
+        res_contract_name : option string;
         res_file : string;
         res_nnrc : nnrc_module;
         res_content : estring;
       }.
-  
+
   Section Semantics.
     (* XXX Nothing yet -- relational semantics should go here *)
   End Semantics.

mechanization/Translation/ErgoNNRCtoCicero.v

@@ -67,7 +67,6 @@ Section ErgoNNRCtoCicero.
              (clause_name:string)
              (eol:estring)
              (quotel:estring) : estring :=
-    let state_init := `"context.state" in
     (accord_annotation
        generated
        clause_name
@@ -78,7 +77,7 @@ Section ErgoNNRCtoCicero.
        eol
        quotel)
       +++ `"function " +++ `fun_name +++ `"(context) {" +++ eol
-      +++ `"  let pcontext = { '" +++ `request_param +++ `"' : context.request, 'state': " +++ state_init +++ `", 'contract': context.contract, 'emit': context.emit, 'now': context.now};" +++ eol
+      +++ `"  let pcontext = { '" +++ `request_param +++ `"' : context.request, 'state': context.state, 'contract': context.contract, 'emit': context.emit, 'now': context.now};" +++ eol
       +++ `"  //logger.info('ergo context: '+JSON.stringify(pcontext))" +++ eol
       +++ `"  return new " +++ `ErgoCodeGen.javascript_identifier_sanitizer contract_name +++ `"()." +++ `ErgoCodeGen.javascript_identifier_sanitizer clause_name +++ `"(pcontext);" +++ eol
       +++ `"}" +++ eol.
@@ -93,22 +92,11 @@ Section ErgoNNRCtoCicero.
              (eol:estring)
              (quotel:estring) : estring :=
     let state_init := `"{ '$class': 'org.accordproject.cicero.contract.AccordContractState', 'stateId' : 'org.accordproject.cicero.contract.AccordContractState#1' }" in
-    let request_type := "org.accordproject.cicero.runtime.Request" in
-    let clause_name := "init" in
-    (accord_annotation
-       generated
-       clause_name
-       request_type
-       response_type
-       emit_type
-       state_type
-       eol
-       quotel)
-      +++ `"function " +++ `fun_name +++ `"(context) {" +++ eol
-      +++ `"  let pcontext = { 'state': " +++ state_init +++ `", 'contract': context.contract, 'emit': context.emit, 'now': context.now};" +++ eol
-      +++ `"  //logger.info('ergo context: '+JSON.stringify(pcontext))" +++ eol
-      +++ `"  return new " +++ `ErgoCodeGen.javascript_identifier_sanitizer contract_name +++ `"()." +++ `ErgoCodeGen.javascript_identifier_sanitizer clause_name +++ `"(pcontext);" +++ eol
-      +++ `"}" +++ eol.
+    `"function " +++ `fun_name +++ `"(context) {" +++ eol
+     +++ `"  let pcontext = { 'state': " +++ state_init +++ `", 'contract': context.contract, 'emit': context.emit, 'now': context.now};" +++ eol
+     +++ `"  //logger.info('ergo context: '+JSON.stringify(pcontext))" +++ eol
+     +++ `"  return new " +++ `ErgoCodeGen.javascript_identifier_sanitizer contract_name +++ `"().init(pcontext);" +++ eol
+     +++ `"}" +++ eol.
 
   Definition apply_wrapper_function
              (contract_name:string)

packages/ergo-cli/.cucumber.js

@@ -1 +1 @@
-require('@accordproject/ergo-engine/lib/steps');
+require('@accordproject/ergo-test').Steps;

packages/ergo-cli/lib/commands.js

@@ -76,7 +76,7 @@ class Commands {
         }
         let initResponse;
         if (stateInput === null) {
-            initResponse = engine.compileAndInit(templateLogic, contractName, contractJson, currentTime);
+            initResponse = engine.compileAndInit(templateLogic, contractName, contractJson, {}, currentTime);
         } else {
             const stateJson = getJson(stateInput);
             initResponse = Promise.resolve({ state: stateJson });
@@ -155,7 +155,7 @@ class Commands {
         }
         const contractJson = getJson(contractInput);
         const clauseParams = getJson(paramsInput);
-        return engine.compileAndInit(templateLogic,contractName,contractJson,currentTime,clauseParams);
+        return engine.compileAndInit(templateLogic,contractName,contractJson,clauseParams,currentTime);
     }
 
     /**

packages/ergo-cli/package.json

@@ -30,6 +30,7 @@
   "dependencies": {
     "@accordproject/ergo-compiler": "0.7.3",
     "@accordproject/ergo-engine": "0.7.3",
+    "@accordproject/ergo-test": "0.7.3",
     "moment-mini": "2.22.1",
     "jsome": "2.5.0",
     "winston": "^3.2.1",

packages/ergo-compiler/lib/compiler.js

@@ -88,7 +88,7 @@ class Compiler {
         if (compiled.code) {
             return { 'error' : compiled.error };
         } else {
-            return { 'success' : compiled.result };
+            return { 'success' : compiled.result, 'contractName' : compiled.contractName };
         }
     }
 

packages/ergo-compiler/lib/script.js

@@ -35,10 +35,12 @@ class Script {
      * @param {string} identifier - The identifier of the script
      * @param {string} language - The language type of the script
      * @param {string} contents - The contents of the script
+     * @param {string} contractName - The name of the contract if known or null
      */
-    constructor(modelManager, identifier, language, contents) {
+    constructor(modelManager, identifier, language, contents, contractName) {
         this.modelManager = modelManager;
         this.identifier = identifier;
+        this.contractName = contractName;
         this.language = language;
         this.contents = contents;
         this.functions = [];
@@ -74,6 +76,13 @@ class Script {
             }
 
             this.tokens = parser.getTokens();
+
+            if (!this.getContractName()) {
+                let classNames = parser.getClasses().map(x => x.name);
+                if (classNames.length !== 0) {
+                    this.contractName = classNames[0];
+                }
+            }
         }
     }
 
@@ -97,11 +106,11 @@ class Script {
     }
 
     /**
-     * Returns the identifier of the script
-     * @return {string} the identifier of the script
+     * Returns the name of the contract for this script
+     * @return {string} the name of the contract, if known
      */
-    getName() {
-        return this.identifier;
+    getContractName() {
+        return this.contractName;
     }
 
     /**

packages/ergo-compiler/lib/scriptmanager.js

@@ -149,6 +149,23 @@ class ScriptManager {
         return result;
     }
 
+    /**
+     * Get a single combined Script
+     * @return {string} The source for all Scripts registered, including compiled ones
+     * @private
+     */
+    getCombinedScripts() {
+        let allJsScripts = '';
+
+        this.getAllScripts().forEach(function (element) {
+            if (element.getLanguage() === '.js') {
+                allJsScripts += element.getContents();
+            }
+        }, this);
+
+        return allJsScripts;
+    }
+
     /**
      * Get the array of Script instances for the given language
      * @param {string} language - The scripts' language
@@ -176,13 +193,13 @@ class ScriptManager {
         let logic = [];
         const scripts = this.getScriptsForLanguage('.ergo');
         scripts.forEach(function (script) {
-            logic.push({ 'name' : script.getName(), 'content' : script.getContents() });
+            logic.push({ 'name' : script.getIdentifier(), 'content' : script.getContents() });
         });
         return logic;
     }
 
     /**
-     * Remove all registered Composer files
+     * Remove all registered scripts
      */
     clearScripts() {
         this.scripts = {};
@@ -200,15 +217,32 @@ class ScriptManager {
     }
 
     /**
-     * Get the Script associated with an identifier
-     * @param {string} identifier - the identifier of the Script
+     * Get the compiled Script
      * @return {Script} the Script
      * @private
      */
     getCompiledScript() {
         return this.compileLogic(false);
     }
 
+    /**
+     * Get the compiled JavaScript
+     * @return {string} the Script
+     * @private
+     */
+    getCompiledJavaScript() {
+        const compiledScript = this.compiledScript;
+        let allJsScripts = '';
+
+        if (compiledScript) {
+            allJsScripts += compiledScript.getContents();
+        } else {
+            throw new Error('Did not find any compiled JavaScript logic');
+        }
+
+        return allJsScripts;
+    }
+
     /**
      * Get the identifiers of all registered scripts
      * @return {string[]} The identifiers of all registered scripts
@@ -226,18 +260,23 @@ class ScriptManager {
         if (this.compiledScript && !force) {
             return this.compiledScript;
         }
+        const codeExt = this.target === 'java' ? '.java' : '.js';
         let sourceErgo = this.getLogic();
         if (sourceErgo === undefined || sourceErgo.length === 0) {
-            return null;
-        }
-        // Do not link to runtime for Java target, only for JavaScript
-        const link = this.target === 'java' ? false : true;
-        const compiledErgo = ErgoCompiler.compileToJavaScript(sourceErgo,this.modelManager.getModels(),this.target,link);
-        if (compiledErgo.hasOwnProperty('error')) {
-            throw new Error(ErgoCompiler.ergoVerboseErrorToString(compiledErgo.error));
+            const allJsScripts = this.getCombinedScripts();
+            if (allJsScripts === '') {
+                return null;
+            }
+            this.compiledScript = new Script(this.modelManager, 'main'+codeExt, codeExt, allJsScripts, null);
+        } else {
+            // Do not link to runtime for Java target, only for JavaScript
+            const link = this.target === 'java' ? false : true;
+            const compiledErgo = ErgoCompiler.compileToJavaScript(sourceErgo,this.modelManager.getModels(),this.target,link);
+            if (compiledErgo.hasOwnProperty('error')) {
+                throw new Error(ErgoCompiler.ergoVerboseErrorToString(compiledErgo.error));
+            }
+            this.compiledScript = new Script(this.modelManager, 'main'+codeExt, codeExt, compiledErgo.success, compiledErgo.contractName);
         }
-        const codeExt = this.target === 'java' ? '.java' : '.js';
-        this.compiledScript = new Script(this.modelManager, 'main'+codeExt, codeExt, compiledErgo.success);
         return this.compiledScript;
     }