fix(scriptmanager) Add registering of compiled template code + 0.21.3

Signed-off-by: Jerome Simeon <jeromesimeon@me.com>
accordproject · Aug 11, 2020 · 44f8ab5 · 44f8ab5
1 parent e2315fb
commit 44f8ab5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 4 deletions.
diff --git a/mechanization/Version.v b/mechanization/Version.v
@@ -17,7 +17,7 @@
 Require Import String.
 
 Section Version.
-    Definition ergo_version := "0.21.2"%string.
+    Definition ergo_version := "0.21.3"%string.
 
 End Version.
 
diff --git a/packages/ergo-cli/extracted/ergoccore.js b/packages/ergo-cli/extracted/ergoccore.js
diff --git a/packages/ergo-cli/extracted/ergotopcore.js b/packages/ergo-cli/extracted/ergotopcore.js
diff --git a/packages/ergo-compiler/extracted/compilercore.js b/packages/ergo-compiler/extracted/compilercore.js
diff --git a/packages/ergo-compiler/lib/logicmanager.js b/packages/ergo-compiler/lib/logicmanager.js
@@ -22,6 +22,7 @@ const Serializer = require('@accordproject/concerto-core').Serializer;
 const ResourceValidator = require('@accordproject/concerto-core/lib/serializer/resourcevalidator');
 const ModelFile = require('@accordproject/concerto-core').ModelFile;
 const APModelManager = require('../lib/apmodelmanager');
+const Script = require('./script');
 const ScriptManager = require('../lib/scriptmanager');
 const ErgoCompiler = require('./compiler');
 const Builtin = require('./builtin');
@@ -256,6 +257,20 @@ unwrapError(__result);
         }
     }
 
+    /**
+     * Register compiled logic
+     */
+    registerCompiledLogicSync() {
+        const scriptManager = this.getScriptManager();
+        const mainScript = scriptManager.getCombinedScripts();
+        if (mainScript) {
+            const script = new Script(this, 'main.js', '.js', mainScript, null);
+            const contractName = script.getContractName();
+            if (contractName) { this.setContractName(contractName); }
+            scriptManager.compiledScript = script;
+        }
+    }
+
     /**
      * Compiles the logic to the target.
      * @param {boolean} force - whether to force recompilation of the logic