From 66e0e87a900bad351576e165919d4817b3669aa3 Mon Sep 17 00:00:00 2001 From: jansony1 Date: Mon, 12 Dec 2016 20:44:49 +0800 Subject: [PATCH 1/4] Updated ibm-blockchain-js Due to upgrade of fabric from v0.5.3 - v6.1, so there is a need to upgrade corresponding APi --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2d9d4bf..8a3afb3 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "debug": "0.7.4", "express": "4.0.0", "express-session": "1.2.1", - "ibm-blockchain-js": "1.2.*", + "ibm-blockchain-js": "1.3.2", "jade": "1.3.1", "morgan": "1.1.1", "serve-static": "1.9.2", @@ -41,4 +41,4 @@ "name": "IBM GSC FSS" }, "license": "Apache-2.0" -} \ No newline at end of file +} From b464608ce084f4b9c93f879c6318d564ce3b650e Mon Sep 17 00:00:00 2001 From: jansony1 Date: Mon, 12 Dec 2016 21:08:30 +0800 Subject: [PATCH 2/4] Update README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d397898..4c410b4 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,9 @@ You may be asked to login again. After login, you will land on the Bluemix Da 1. Click on the 'Deploy to Bluemix' button below. -             [![Deploy to Bluemix](https://bluemix.net/deploy/button.png)](https://bluemix.net/deploy?repository=https://github.com/apiBlockchain/GscLabBlockchainApp.git) +             [![Deploy to Bluemix](https://bluemix.net/deploy/button.png)](https://bluemix.net/deploy?repository=https://github.com/jansony1/GscLabBlockchainApp.git&branch=patch-1) + + 2. Log in with your Bluemix account. From 646caefa9b58e3ed6c75e5eefea66828e07249b6 Mon Sep 17 00:00:00 2001 From: jansony1 Date: Mon, 12 Dec 2016 21:34:48 +0800 Subject: [PATCH 3/4] Update README.md --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4c410b4..2e7375a 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,11 @@ You may be asked to login again. After login, you will land on the Bluemix Da             ![](readme_images/services2.PNG) - * The 'Cloud Foundry Apps' tile shows the memory you have available for apps. You will require at least 512 MB of free space to deploy an app during the lab. If you do not have 256MB of free space, then delete some existing apps (visible in your dashboard) before proceeding to the next step. + * The 'Cloud Foundry Apps' tile shows the memory you have available for apps. You will require at least 512 MB of free space to + + + + an app during the lab. If you do not have 256MB of free space, then delete some existing apps (visible in your dashboard) before proceeding to the next step.             ![](readme_images/services1.PNG) @@ -89,9 +93,7 @@ You may be asked to login again. After login, you will land on the Bluemix Da 1. Click on the 'Deploy to Bluemix' button below. -             [![Deploy to Bluemix](https://bluemix.net/deploy/button.png)](https://bluemix.net/deploy?repository=https://github.com/jansony1/GscLabBlockchainApp.git&branch=patch-1) - - +             [![Deploy to Bluemix](https://bluemix.net/deploy/button.png)](https://bluemix.net/deploy?repository=https://github.com/jansony1/GscLabBlockchainApp.git) 2. Log in with your Bluemix account. From 60da688e6b45b3bd04e640c6ef542a7dda0b9048 Mon Sep 17 00:00:00 2001 From: jansony1 Date: Tue, 13 Dec 2016 15:26:15 +0800 Subject: [PATCH 4/4] Update app.js --- app.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app.js b/app.js index c27232a..827f1ee 100644 --- a/app.js +++ b/app.js @@ -314,11 +314,11 @@ try { //var manual = JSON.parse(fs.readFileSync('mycreds_BlockchainAug22.json','utf8')); //var manual = JSON.parse(fs.readFileSync('my_credsgsclabtest3.json','utf8')); var manual = JSON.parse(fs.readFileSync('my_credsgsclabtest3.json','utf8')); - peers = manual.credentials.peers; + peers = manual.peers; users = null; // users are only found if security is on - if (manual.credentials.users) - users = manual.credentials.users; + if (manual.users) + users = manual.users; console.log('loading hardcoded users'); } catch (e) {