Update identities v2

.gitignore

@@ -61,4 +61,4 @@ packages/composer-runtime-hlfv1/vendor/gopkg.in/sourcemap.v1/
 packages/composer-website/installers/fabric-dev-servers.zip
 packages/composer-website/installers/hlfv*/fabric-dev-servers/
 
-packages/composer-playground/e2e/downloads/*
+packages/composer-playground/e2e/downloads/

.travis/before-install.sh

@@ -4,42 +4,16 @@
 set -ev
 set -o pipefail
 
-# Download specific version of docker-compose
-export DOCKER_COMPOSE_VERSION=1.11.2
-sudo rm /usr/local/bin/docker-compose
-curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-chmod +x docker-compose
-sudo mv docker-compose /usr/local/bin
-echo "Docker-compose version: "
-docker-compose --version
-
-# Update docker
-sudo apt-get update
-sudo apt-get remove docker docker-engine
-sudo apt-get install linux-image-extra-$(uname -r) linux-image-extra-virtual
-sudo apt-get install apt-transport-https ca-certificates curl software-properties-common
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-sudo apt-get update
-sudo apt-get install docker-ce
-echo "Docker version: "
-docker --version
-
 # Install using pip as apt-get pulls the wrong version on Travis' trusty image
 # python requests 2.9.2 is essential prereq for linkchecker
 
-sudo pip install linkchecker
-sudo pip install linkchecker --upgrade
-sudo pip install requests==2.9.2
+pip install linkchecker requests==2.9.2
 linkchecker --version
 
 # Grab the parent (root) directory.
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/.." && pwd )"
 
-npm install -g npm@4
-npm install -g @alrra/travis-scripts
-
-npm install -g asciify
+npm install -g npm@4 lerna@2 @alrra/travis-scripts asciify
 
 
 echo "ABORT_BUILD=false" > ${DIR}/build.cfg

.travis/install.sh

@@ -21,6 +21,6 @@ fi
   #exit 0;
 #fi
 
-
+# Use lerna bootstrap and not npm install; it's a lot faster in Travis.
 cd ${DIR}
-npm install 2>&1 | tee
+lerna bootstrap 2>&1 | tee

README.md

@@ -29,9 +29,8 @@ Suggested reading list is:
 
 - [Introduction](https://hyperledger.github.io/composer/introduction/introduction.html)
 - [Introduction Video](https://www.youtube.com/watch?v=fdFUsrsv5iw&t=23s)
-- [Quick Start](https://hyperledger.github.io/composer/installing/quickstart.html)
-- [Quick Start Video](https://www.youtube.com/watch?v=pEHBIfb_iqc&t=5s)
-- [Tutorials](https://hyperledger.github.io/composer/tutorials/tutorialindex.html)
+- [Quick Start](https://hyperledger.github.io/composer/installing/installing-index.html)
+- [Tutorials](https://hyperledger.github.io/composer/tutorials/tutorials.html)
 
 # Getting in touch
 

contrib-notes/release-process/runtime-validation.md

@@ -10,26 +10,34 @@ A fresh virtualised image should be used where possible, to ensure that the proc
 Cmd line Installation Verification  (Mac OS X and Ubuntu). These test should be run following the instructions in the web pages.
 _These should be run using the unstable releases of the code to validate what is going to be released is good_
 
-This short output shows how to install and update the package.json of the getting started application to use the unstable versions. It replaces the procedure outlined in https://hyperledger.github.io/composer/installing/quickstart.html
+This short output shows how to install and update the package.json of the getting started application to use the unstable versions and uses the Digital Property sample application as an indicative test of _unstable_. You 
 
 ```bash
 $ npm install -g composer-cli@unstable
 <output redacted>
 $ composer --version
-composer-cli                   v0.5.2-20170313111819
-composer-admin                 v0.5.2-20170313111819
-composer-client                v0.5.2-20170313111819
-composer-common                v0.5.2-20170313111819
-composer-runtime-hlf           v0.5.2-20170313111819
-composer-connector-hlf         v0.5.2-20170313111819
-
+composer-cli                   v0.10.0-20170720064757
+composer-admin                 v0.10.0-20170720064757
+composer-client                v0.10.0-20170720064757
+composer-common                v0.10.0-20170720064757
+composer-runtime-hlf           v0.10.0-20170720064757
+composer-connector-hlf         v0.10.0-20170720064757
+
+# Execute the following 4 steps, to stand up a runtime Fabric 
+$ mkdir fabric-tools && cd fabric-tools
+$ curl -O https://raw.githubusercontent.com/hyperledger/composer-tools/master/packages/fabric-dev-servers/fabric-dev-servers.zip
+$./startFabric.sh # will remove containers that exist previously including dev-* containers
+$./createComposerProfile.sh
+$ cd  # ie $HOME
+#
 $ git clone https://github.com/hyperledger/composer-sample-applications.git
 <output redacted>
-$ cd composer-sample-applications/packages/getting-started
+$ cd composer-sample-applications/packages/digitalproperty-app
 $ sed -i.ORIG 's/\("composer-.*".*\):.*"/\1:"unstable"/g' package.json
 $ npm install --tag=unstable
-$ npm test
-
+$ npm run deployNetwork  # will/should install a docker container suffixed with this 'unstable' composer release
+$ docker ps -a # check the container version after the business network name eg digitalproperty-network
+$ npm test # check the assets are bootstrapped / updated.
 ```
 
 ## New Feature Testing

lerna.json

@@ -1,5 +1,5 @@
 {
-  "lerna": "2.0.0-rc.4",
+  "lerna": "2.0.0",
   "packages": [
     "packages/*"
   ],

package.json

@@ -1,7 +1,7 @@
 {
   "devDependencies": {
     "colors": "^1.1.2",
-    "lerna": "^2.0.0-rc.4",
+    "lerna": "^2.0.0",
     "licensecheck": "^1.3.0",
     "moment": "^2.17.1",
     "semver": "^5.3.0",
@@ -32,4 +32,4 @@
   ],
   "author": "Hyperledger Composer",
   "license": "Apache-2.0"
-}
+}

packages/composer-admin/api.txt

@@ -6,9 +6,12 @@ class AdminConnection {
    + Promise getProfile(string) 
    + Promise getAllProfiles() 
    + Promise disconnect() 
+   + Promise install(BusinessNetworkIdentifier,Object) 
+   + Promise start(BusinessNetworkDefinition,Object) 
    + Promise deploy(BusinessNetworkDefinition,Object) 
    + Promise undeploy(string) 
    + Promise update(BusinessNetworkDefinition) 
+   + Promise upgrade(BusinessNetworkIdentifier) 
    + Promise ping() 
    + Promise setLogLevel(any) 
    + Promise getLogLevel() 

packages/composer-admin/changelog.txt

@@ -11,6 +11,12 @@
 #
 # Note that the latest public API is documented using JSDocs and is available in api.txt.
 #
+Version 0.10.1 {a29c92b5be618f000f0e75ffa6840e4b} 2017-07-21
+- added upgrade method.
+
+Version 0.10.0 {3af411e8da53bb013ab9718ed5980c20} 2017-07-17
+- added install and start method.
+
 Version 0.9.1 {8b6c392e59b8ad38ea271315231ca0e5} 2017-06-30
 - added getLogLevel & setLogLevel methods. added deployOptions to deploy method.
 

packages/composer-admin/lib/adminconnection.js

@@ -17,10 +17,13 @@
 const ComboConnectionProfileStore = require('composer-common').ComboConnectionProfileStore;
 const ConnectionProfileManager = require('composer-common').ConnectionProfileManager;
 const EnvConnectionProfileStore = require('composer-common').EnvConnectionProfileStore;
+const fs = require('fs');
 const FSConnectionProfileStore = require('composer-common').FSConnectionProfileStore;
+const Logger = require('composer-common').Logger;
 const Util = require('composer-common').Util;
+const uuid = require('uuid');
 
-const fs = require('fs');
+const LOG = Logger.getLog('AdminConnection');
 
 /**
  * This class creates an administration connection to a Hyperledger Composer runtime. The
@@ -89,7 +92,7 @@ class AdminConnection {
             .then((securityContext) => {
                 this.securityContext = securityContext;
                 if (businessNetworkIdentifier) {
-                    return this.connection.ping(this.securityContext);
+                    return this.ping(this.securityContext);
                 }
             });
     }
@@ -205,6 +208,58 @@ class AdminConnection {
             });
     }
 
+    /**
+     * Installs the Hyperledger Composer runtime to the Hyperledger Fabric in preparation
+     * for the business network to be started. The connection mustbe connected for this method to succeed.
+     * You must pass the name of the business network that is defined in your archive that this
+     * runtime will be started with.
+     * @example
+     * // Install the Hyperledger Composer runtime
+     * var adminConnection = new AdminConnection();
+     * var businessNetworkDefinition = BusinessNetworkDefinition.fromArchive(myArchive);
+     * return adminConnection.install(businessNetworkDefinition.getName())
+     * .then(function(){
+     *     // Business network definition installed
+     * })
+     * .catch(function(error){
+     *     // Add optional error handling here.
+     * });
+     * @param {BusinessNetworkIdentifier} businessNetworkIdentifier - The name of business network which will be used to start this runtime.
+     * @param {Object} installOptions connector specific install options
+     * @return {Promise} A promise that will be fufilled when the business network has been
+     * deployed.
+     */
+    install(businessNetworkIdentifier, installOptions) {
+        Util.securityCheck(this.securityContext);
+        return this.connection.install(this.securityContext, businessNetworkIdentifier, installOptions);
+    }
+
+    /**
+     * Starts a business network within the runtime previously installed to the Hyperledger Fabric with
+     * the same name as the business network to be started. The connection must be connected for this
+     * method to succeed.
+     * @example
+     * // Start a Business Network Definition
+     * var adminConnection = new AdminConnection();
+     * var businessNetworkDefinition = BusinessNetworkDefinition.fromArchive(myArchive);
+     * return adminConnection.start(businessNetworkDefinition)
+     * .then(function(){
+     *     // Business network definition is started
+     * })
+     * .catch(function(error){
+     *     // Add optional error handling here.
+     * });
+     * @param {BusinessNetworkDefinition} businessNetworkDefinition - The business network to start
+     * @param {Object} startOptions connector specific start options
+     * @return {Promise} A promise that will be fufilled when the business network has been
+     * deployed.
+     */
+    start(businessNetworkDefinition, startOptions) {
+        Util.securityCheck(this.securityContext);
+        return this.connection.start(this.securityContext, businessNetworkDefinition, startOptions);
+    }
+
+
     /**
      * Deploys a new BusinessNetworkDefinition to the Hyperledger Fabric. The connection must
      * be connected for this method to succeed.
@@ -274,6 +329,31 @@ class AdminConnection {
         return this.connection.update(this.securityContext, businessNetworkDefinition);
     }
 
+    /**
+     * Upgrades an existing business network's composer runtime to a later level.
+     * The connection must be connected for this method to succeed.
+     * @param {BusinessNetworkIdentifier} businessNetworkIdentifier - The name of business network whose runtime is to be upgraded.
+     * @return {Promise} A promise that will be fufilled when the composer runtime has been upgraded,
+     * or rejected otherwise.
+     * @example
+     * // Upgrade the Hyperledger Composer runtime
+     * var adminConnection = new AdminConnection();
+     * var businessNetworkDefinition = BusinessNetworkDefinition.fromArchive(myArchive);
+     * return adminConnection.upgrade(businessNetworkDefinition.getName())
+     * .then(function(){
+     *     // Business network definition installed
+     * })
+     * .catch(function(error){
+     *     // Add optional error handling here.
+     * });
+
+     * @memberof AdminConnection
+     */
+    upgrade(businessNetworkIdentifier) {
+        Util.securityCheck(this.securityContext);
+        return this.connection.upgrade(this.securityContext, businessNetworkIdentifier);
+    }
+
     /**
      * Test the connection to the runtime and verify that the version of the
      * runtime is compatible with this level of the node.js module.
@@ -291,8 +371,61 @@ class AdminConnection {
      * been tested. The promise will be rejected if the version is incompatible.
      */
     ping() {
+        const method = 'ping';
+        LOG.entry(method);
+        return this.pingInner()
+            .catch((error) => {
+                if (error.message.match(/ACTIVATION_REQUIRED/)) {
+                    LOG.debug(method, 'Activation required, activating ...');
+                    return this.activate()
+                        .then(() => {
+                            return this.pingInner();
+                        });
+                }
+                throw error;
+            })
+            .then((result) => {
+                LOG.exit(method, result);
+                return result;
+            });
+    }
+
+    /**
+     * Test the connection to the runtime and verify that the version of the
+     * runtime is compatible with this level of the client node.js module.
+     * @private
+     * @return {Promise} A promise that will be fufilled when the connection has
+     * been tested. The promise will be rejected if the version is incompatible.
+     */
+    pingInner() {
+        const method = 'pingInner';
+        LOG.entry(method);
         Util.securityCheck(this.securityContext);
-        return this.connection.ping(this.securityContext);
+        return this.connection.ping(this.securityContext)
+            .then((result) => {
+                LOG.exit(method, result);
+                return result;
+            });
+    }
+
+    /**
+     * Activate the current identity on the currently connected business network.
+     * @private
+     * @return {Promise} A promise that will be fufilled when the connection has
+     * been tested. The promise will be rejected if the version is incompatible.
+     */
+    activate() {
+        const method = 'activate';
+        LOG.entry(method);
+        const json = {
+            $class: 'org.hyperledger.composer.system.ActivateCurrentIdentity',
+            transactionId: uuid.v4(),
+            timestamp: new Date().toISOString()
+        };
+        return Util.invokeChainCode(this.securityContext, 'submitTransaction', ['default', JSON.stringify(json)])
+            .then(() => {
+                LOG.exit(method);
+            });
     }
 
     /**
@@ -373,7 +506,7 @@ class AdminConnection {
     * @example
      * // Import an identity into a profiles' wallet
      * var adminConnection = new AdminConnection();
-     * return adminConnection.import('hlfv1', 'PeerAdmin', publicKey, privateKey)
+     * return adminConnection.importIdentity('hlfv1', 'PeerAdmin', publicKey, privateKey)
      * .then(() => {
      *     // Identity imported
      *     console.log('identity imported successfully');
@@ -398,7 +531,7 @@ class AdminConnection {
                 return this.getProfile(connectionProfile);
             })
             .then((profileData) => {
-                return savedConnectionManager.importIdentity(profileData, id, publicKey, privateKey);
+                return savedConnectionManager.importIdentity(connectionProfile, profileData, id, publicKey, privateKey);
             })
             .catch((error) => {
                 throw new Error('failed to import identity. ' + error.message);

packages/composer-admin/package.json

@@ -16,7 +16,7 @@
     "postlint": "npm run licchk",
     "licchk": "license-check",
     "postlicchk": "npm run doc",
-    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf"
+    "doc": "jsdoc --pedantic --recurse -c jsdoc.json"
   },
   "repository": {
     "type": "git",
@@ -36,15 +36,14 @@
     "eslint": "^3.17.1",
     "jsdoc": "^3.4.3",
     "license-check": "^1.1.5",
-    "mocha": "^3.2.0",
-    "nyc": "^10.1.2",
-    "sinon": "^1.17.7",
-    "sinon-as-promised": "^4.0.2"
+    "mocha": "^3.4.2",
+    "nyc": "^11.1.0",
+    "sinon": "^2.3.8"
   },
   "dependencies": {
-    "composer-common": "^0.10.1",
-    "composer-connector-hlf": "^0.10.1",
-    "composer-connector-hlfv1": "^0.10.1"
+    "composer-common": "0.10.1",
+    "composer-connector-hlf": "0.10.1",
+    "composer-connector-hlfv1": "0.10.1"
   },
   "license-check-config": {
     "src": [