feat(*): state management for contract instances

lerna.json

@@ -3,6 +3,6 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.22.1",
+  "version": "0.22.2",
   "hoist": true
 }

package.json

@@ -1,15 +1,11 @@
 {
   "devDependencies": {
     "colors": "1.4.0",
-    "concurrently": "4.1.1",
     "coveralls": "3.0.4",
     "dayjs": "1.10.2",
-    "eslint": "6.0.1",
-    "istanbul-combine": "0.3.0",
-    "istanbul-merge": "1.1.1",
-    "jsdoc": "3.6.3",
-    "jsdoc-sphinx": "0.0.6",
-    "lerna": "^3.22.1",
+    "eslint": "8.1.0",
+    "jsdoc": "^3.6.7",
+    "lerna": "^4.0.0",
     "license-check-and-add": "2.3.6",
     "semver": "6.3.0",
     "sleep-promise": "8.0.1",
@@ -21,14 +17,13 @@
   },
   "name": "cicero",
   "description": "You must install [Lerna](https://lernajs.io) to build this multi-package repository.",
-  "version": "0.22.1",
+  "version": "0.22.2",
   "private": true,
   "scripts": {
-    "doc": "jsdoc -t ./node_modules/jsdoc-sphinx/template/ -c jsdoc.json -r -d ../cicero-docs/docs/api --verbose",
-    "coverage": "istanbul-combine -d coverage -r lcov packages/cicero-cli/coverage/*.json packages/cicero-core/coverage/*.json  packages/cicero-engine/coverage/*.json packages/generator-cicero-template/coverage/*.json packages/cicero-server/coverage/*.json && cat ./coverage/lcov.info",
+    "coverage": "node ./scripts/coverage.js \"packages/cicero-*\" && nyc report -t coverage --cwd . --report-dir coverage --reporter=lcov && cat ./coverage/lcov.info",
     "postinstall": "npm run bootstrap",
     "bootstrap": "lerna bootstrap",
-    "pretest": "npm run doc && npm run licchk",
+    "pretest": "npm run licchk",
     "test": "lerna exec -- npm run test:cov",
     "repoclean": "lerna clean",
     "licchk": "license-check-and-add"

packages/cicero-cli/index.js

@@ -286,6 +286,10 @@ require('yargs')
             describe: 'path to the JSON state',
             type: 'string'
         });
+        yargs.option('party', {
+            describe: 'party which triggers the contract',
+            type: 'string'
+        });
         yargs.option('currentTime', {
             describe: 'set current time',
             type: 'string',
@@ -314,7 +318,7 @@ require('yargs')
                 offline: argv.offline,
                 warnings: argv.warnings,
             };
-            return Commands.trigger(argv.template, argv.contract, argv.sample, argv.data, argv.request, argv.state, argv.currentTime, argv.utcOffset, options)
+            return Commands.trigger(argv.template, argv.contract, argv.sample, argv.data, argv.request, argv.state, argv.party, argv.currentTime, argv.utcOffset, options)
                 .then((result) => {
                     if(result) {Logger.info(JSON.stringify(result));}
                 })
@@ -356,6 +360,10 @@ require('yargs')
             describe: 'path to the JSON state',
             type: 'string'
         });
+        yargs.option('party', {
+            describe: 'party which invokes the contract',
+            type: 'string'
+        });
         yargs.option('currentTime', {
             describe: 'set current time',
             type: 'string',
@@ -383,7 +391,7 @@ require('yargs')
                 offline: argv.offline,
                 warnings: argv.warnings,
             };
-            return Commands.invoke(argv.template, argv.contract, argv.sample, argv.data, argv.clauseName, argv.params, argv.state, argv.currentTime, argv.utcOffset, options)
+            return Commands.invoke(argv.template, argv.contract, argv.sample, argv.data, argv.clauseName, argv.params, argv.state, argv.party, argv.currentTime, argv.utcOffset, options)
                 .then((result) => {
                     if(result) {Logger.info(JSON.stringify(result));}
                 })
@@ -417,6 +425,10 @@ require('yargs')
             describe: 'path to the parameters',
             type: 'string'
         });
+        yargs.option('party', {
+            describe: 'party which initializes the contract',
+            type: 'string'
+        });
         yargs.option('currentTime', {
             describe: 'initialize with this current time',
             type: 'string',
@@ -445,7 +457,7 @@ require('yargs')
                 offline: argv.offline,
                 warnings: argv.warnings,
             };
-            return Commands.initialize(argv.template, argv.contract, argv.sample, argv.data, argv.params, argv.currentTime, argv.utcOffset, options)
+            return Commands.initialize(argv.template, argv.contract, argv.sample, argv.data, argv.params, argv.party, argv.currentTime, argv.utcOffset, options)
                 .then((result) => {
                     if(result) {Logger.info(JSON.stringify(result));}
                 })
@@ -531,6 +543,10 @@ require('yargs')
             type: 'string',
             default: 'ergo'
         });
+        yargs.option('instantiator', {
+            describe: 'name of the instantiator',
+            type: 'string'
+        });
         yargs.option('output', {
             describe: 'file name for new archive',
             type: 'string',
@@ -551,7 +567,7 @@ require('yargs')
             const options = {
                 warnings: argv.warnings,
             };
-            return Commands.instantiate(argv.template, argv.data, argv.target, argv.output, options)
+            return Commands.instantiate(argv.template, argv.data, argv.target, argv.output, argv.instantiator, options)
                 .catch((err) => {
                     Logger.error(err.message);
                 });
@@ -618,9 +634,8 @@ require('yargs')
             default: null
         });
         yargs.option('signatory', {
-            describe: 'name of the signatory',
-            type: 'string',
-            default: null
+            describe: 'name of the party/signatory signing the contract',
+            type: 'string'
         });
         yargs.option('output', {
             describe: 'file name for new archive',
@@ -686,6 +701,10 @@ require('yargs')
             describe: 'path to a smart legal contract',
             type: 'string'
         });
+        yargs.option('party', {
+            describe: 'party which exports the contract',
+            type: 'string'
+        });
         yargs.option('output', {
             describe: 'path to the output file',
             type: 'string'
@@ -723,7 +742,7 @@ require('yargs')
                 warnings: argv.warnings,
                 format: argv.format,
             };
-            return Commands.export(argv.contract, argv.output, argv.currentTime, argv.utcOffset, options)
+            return Commands.export(argv.contract, argv.party, argv.output, argv.currentTime, argv.utcOffset, options)
                 .then((result) => {
                 })
                 .catch((err) => {