[FAB-14487] Make FabCar use BYFN, not basic-network

Update FabCar to use BYFN. As a result, the sample client applications need to change so that they use the correct connection profile paths, and so that they use service discovery. Change-Id: If02b7fb4ad308c6a7d1e1aa9f953e1bc4e942719 Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
hyperledger · May 3, 2019 · f2d0fa0 · f2d0fa0
1 parent 25d7de4
commit f2d0fa0
Show file tree

Hide file tree

Showing 9 changed files with 143 additions and 64 deletions.
diff --git a/fabcar/javascript/enrollAdmin.js b/fabcar/javascript/enrollAdmin.js
@@ -9,16 +9,18 @@ const { FileSystemWallet, X509WalletMixin } = require('fabric-network');
 const fs = require('fs');
 const path = require('path');
 
-const ccpPath = path.resolve(__dirname, '..', '..', 'basic-network', 'connection.json');
+const ccpPath = path.resolve(__dirname, '..', '..', 'first-network', 'connection-org1.json');
 const ccpJSON = fs.readFileSync(ccpPath, 'utf8');
 const ccp = JSON.parse(ccpJSON);
 
 async function main() {
     try {
 
         // Create a new CA client for interacting with the CA.
-        const caURL = ccp.certificateAuthorities['ca.example.com'].url;
-        const ca = new FabricCAServices(caURL);
+        const caInfo = ccp.certificateAuthorities['ca.org1.example.com'];
+        const caTLSCACertsPath = path.resolve(__dirname, '..', '..', 'first-network', caInfo.tlsCACerts.path);
+        const caTLSCACerts = fs.readFileSync(caTLSCACertsPath);
+        const ca = new FabricCAServices(caInfo.url, { trustedRoots: caTLSCACerts, verify: false }, caInfo.caName);
 
         // Create a new file system based wallet for managing identities.
         const walletPath = path.join(process.cwd(), 'wallet');

diff --git a/fabcar/javascript/invoke.js b/fabcar/javascript/invoke.js
@@ -5,12 +5,9 @@
 'use strict';
 
 const { FileSystemWallet, Gateway } = require('fabric-network');
-const fs = require('fs');
 const path = require('path');
 
-const ccpPath = path.resolve(__dirname, '..', '..', 'basic-network', 'connection.json');
-const ccpJSON = fs.readFileSync(ccpPath, 'utf8');
-const ccp = JSON.parse(ccpJSON);
+const ccpPath = path.resolve(__dirname, '..', '..', 'first-network', 'connection-org1.json');
 
 async function main() {
     try {
@@ -30,7 +27,7 @@ async function main() {
 
         // Create a new gateway for connecting to our peer node.
         const gateway = new Gateway();
-        await gateway.connect(ccp, { wallet, identity: 'user1', discovery: { enabled: false } });
+        await gateway.connect(ccpPath, { wallet, identity: 'user1', discovery: { enabled: true, asLocalhost: true } });
 
         // Get the network (channel) our contract is deployed to.
         const network = await gateway.getNetwork('mychannel');

diff --git a/fabcar/javascript/query.js b/fabcar/javascript/query.js
@@ -5,12 +5,9 @@
 'use strict';
 
 const { FileSystemWallet, Gateway } = require('fabric-network');
-const fs = require('fs');
 const path = require('path');
 
-const ccpPath = path.resolve(__dirname, '..', '..', 'basic-network', 'connection.json');
-const ccpJSON = fs.readFileSync(ccpPath, 'utf8');
-const ccp = JSON.parse(ccpJSON);
+const ccpPath = path.resolve(__dirname, '..', '..', 'first-network', 'connection-org1.json');
 
 async function main() {
     try {
@@ -30,7 +27,7 @@ async function main() {
 
         // Create a new gateway for connecting to our peer node.
         const gateway = new Gateway();
-        await gateway.connect(ccp, { wallet, identity: 'user1', discovery: { enabled: false } });
+        await gateway.connect(ccpPath, { wallet, identity: 'user1', discovery: { enabled: true, asLocalhost: true } });
 
         // Get the network (channel) our contract is deployed to.
         const network = await gateway.getNetwork('mychannel');

diff --git a/fabcar/javascript/registerUser.js b/fabcar/javascript/registerUser.js
@@ -5,12 +5,9 @@
 'use strict';
 
 const { FileSystemWallet, Gateway, X509WalletMixin } = require('fabric-network');
-const fs = require('fs');
 const path = require('path');
 
-const ccpPath = path.resolve(__dirname, '..', '..', 'basic-network', 'connection.json');
-const ccpJSON = fs.readFileSync(ccpPath, 'utf8');
-const ccp = JSON.parse(ccpJSON);
+const ccpPath = path.resolve(__dirname, '..', '..', 'first-network', 'connection-org1.json');
 
 async function main() {
     try {
@@ -37,7 +34,7 @@ async function main() {
 
         // Create a new gateway for connecting to our peer node.
         const gateway = new Gateway();
-        await gateway.connect(ccp, { wallet, identity: 'admin', discovery: { enabled: false } });
+        await gateway.connect(ccpPath, { wallet, identity: 'admin', discovery: { enabled: true, asLocalhost: true } });
 
         // Get the CA client object from the gateway for interacting with the CA.
         const ca = gateway.getClient().getCertificateAuthority();

diff --git a/fabcar/startFabric.sh b/fabcar/startFabric.sh
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 # Exit on first error
-set -e
+set -ex
 
 # don't rewrite paths for Windows Git Bash users
 export MSYS_NO_PATHCONV=1
@@ -14,13 +14,13 @@ CC_SRC_LANGUAGE=${1:-"go"}
 CC_SRC_LANGUAGE=`echo "$CC_SRC_LANGUAGE" | tr [:upper:] [:lower:]`
 if [ "$CC_SRC_LANGUAGE" = "go" -o "$CC_SRC_LANGUAGE" = "golang"  ]; then
 	CC_RUNTIME_LANGUAGE=golang
-	CC_SRC_PATH=github.com/fabcar/go
+	CC_SRC_PATH=github.com/hyperledger/fabric-samples/chaincode/fabcar/go
 elif [ "$CC_SRC_LANGUAGE" = "javascript" ]; then
 	CC_RUNTIME_LANGUAGE=node # chaincode runtime language is node.js
-	CC_SRC_PATH=/opt/gopath/src/github.com/fabcar/javascript
+	CC_SRC_PATH=/opt/gopath/src/github.com/hyperledger/fabric-samples/chaincode/fabcar/javascript
 elif [ "$CC_SRC_LANGUAGE" = "typescript" ]; then
 	CC_RUNTIME_LANGUAGE=node # chaincode runtime language is node.js
-	CC_SRC_PATH=/opt/gopath/src/github.com/fabcar/typescript
+	CC_SRC_PATH=/opt/gopath/src/github.com/hyperledger/fabric-samples/chaincode/fabcar/typescript
 	echo Compiling TypeScript code into JavaScript ...
 	pushd ../chaincode/fabcar/typescript
 	npm install
@@ -38,30 +38,123 @@ fi
 rm -rf ./hfc-key-store
 
 # launch network; create channel and join peer to channel
-cd ../basic-network
-./start.sh
-
-# Now launch the CLI container in order to install, instantiate chaincode
-# and prime the ledger with our 10 cars
-docker-compose -f ./docker-compose.yml up -d cli
-docker ps -a
-
-docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli \
-    peer lifecycle chaincode package fabcar.tar.gz --path "$CC_SRC_PATH" --lang "$CC_RUNTIME_LANGUAGE" --label fabcarv1
-docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli \
-    peer lifecycle chaincode install fabcar.tar.gz
-docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli \
-    /bin/bash -c "peer lifecycle chaincode queryinstalled > log"
-PACKAGE_ID=`docker exec cli sed -nr '/Label: fabcarv1/s/Package ID: (.*), Label: fabcarv1/\1/p;' log`
-docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli \
-    peer lifecycle chaincode approveformyorg -o orderer.example.com:7050 --channelID mychannel --name fabcar --version 1.0 --init-required --signature-policy "OR ('Org1MSP.member','Org2MSP.member')" --sequence 1 --waitForEvent --package-id $PACKAGE_ID
-docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli \
-    peer lifecycle chaincode commit -o orderer.example.com:7050 --channelID mychannel --name fabcar --version 1.0 --init-required --signature-policy "OR ('Org1MSP.member','Org2MSP.member')" --sequence 1 --waitForEvent
-docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli \
-    peer chaincode invoke -o orderer.example.com:7050 -C mychannel -n fabcar --isInit -c '{"Args":[]}'
-sleep 10
-docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp" cli \
-    peer chaincode invoke -o orderer.example.com:7050 -C mychannel -n fabcar -c '{"function":"initLedger","Args":[]}'
+pushd ../first-network
+echo y | ./byfn.sh down
+echo y | ./byfn.sh up -a -n -s couchdb
+popd
+
+CONFIG_ROOT=/opt/gopath/src/github.com/hyperledger/fabric/peer
+ORG1_MSPCONFIGPATH=${CONFIG_ROOT}/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp
+ORG1_TLS_ROOTCERT_FILE=${CONFIG_ROOT}/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt
+ORG2_MSPCONFIGPATH=${CONFIG_ROOT}/crypto/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp
+ORG2_TLS_ROOTCERT_FILE=${CONFIG_ROOT}/crypto/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt
+ORDERER_TLS_ROOTCERT_FILE=${CONFIG_ROOT}/crypto/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem
+
+PEER_ORG1="docker exec
+-e CORE_PEER_LOCALMSPID=Org1MSP
+-e CORE_PEER_ADDRESS=peer0.org1.example.com:7051
+-e CORE_PEER_MSPCONFIGPATH=${ORG1_MSPCONFIGPATH}
+-e CORE_PEER_TLS_ROOTCERT_FILE=${ORG1_TLS_ROOTCERT_FILE}
+cli
+peer
+--tls=true
+--cafile=${ORDERER_TLS_ROOTCERT_FILE}
+--orderer=orderer.example.com:7050"
+
+PEER_ORG2="docker exec
+-e CORE_PEER_LOCALMSPID=Org2MSP
+-e CORE_PEER_ADDRESS=peer0.org2.example.com:9051
+-e CORE_PEER_MSPCONFIGPATH=${ORG2_MSPCONFIGPATH}
+-e CORE_PEER_TLS_ROOTCERT_FILE=${ORG2_TLS_ROOTCERT_FILE}
+cli
+peer
+--tls=true
+--cafile=${ORDERER_TLS_ROOTCERT_FILE}
+--orderer=orderer.example.com:7050"
+
+echo "Packaging smart contract on peer0.org1.example.com"
+${PEER_ORG1} lifecycle chaincode package \
+  fabcar.tar.gz \
+  --path "$CC_SRC_PATH" \
+  --lang "$CC_RUNTIME_LANGUAGE" \
+  --label fabcarv1
+
+echo "Installing smart contract on peer0.org1.example.com"
+${PEER_ORG1} lifecycle chaincode install \
+  fabcar.tar.gz
+
+echo "Determining package ID for smart contract on peer0.org1.example.com"
+REGEX='Package ID: (.*), Label: fabcarv1'
+if [[ `${PEER_ORG1} lifecycle chaincode queryinstalled` =~ $REGEX ]]; then 
+  PACKAGE_ID_ORG1=${BASH_REMATCH[1]}
+else
+  echo Could not find package ID for fabcarv1 chaincode on peer0.org1.example.com
+  exit 1
+fi
+
+echo "Approving smart contract for org1"
+${PEER_ORG1} lifecycle chaincode approveformyorg \
+  --package-id ${PACKAGE_ID_ORG1} \
+  --channelID mychannel \
+  --name fabcar \
+  --version 1.0 \
+  --signature-policy "AND('Org1MSP.member','Org2MSP.member')" \
+  --sequence 1 \
+  --waitForEvent
+
+echo "Packaging smart contract on peer0.org2.example.com"
+${PEER_ORG2} lifecycle chaincode package \
+  fabcar.tar.gz \
+  --path "$CC_SRC_PATH" \
+  --lang "$CC_RUNTIME_LANGUAGE" \
+  --label fabcarv1
+
+echo "Installing smart contract on peer0.org2.example.com"
+${PEER_ORG2} lifecycle chaincode install fabcar.tar.gz
+
+echo "Determining package ID for smart contract on peer0.org2.example.com"
+REGEX='Package ID: (.*), Label: fabcarv1'
+if [[ `${PEER_ORG2} lifecycle chaincode queryinstalled` =~ $REGEX ]]; then 
+  PACKAGE_ID_ORG2=${BASH_REMATCH[1]}
+else
+  echo Could not find package ID for fabcarv1 chaincode on peer0.org2.example.com
+  exit 1
+fi
+
+echo "Approving smart contract for org2"
+${PEER_ORG2} lifecycle chaincode approveformyorg \
+  --package-id ${PACKAGE_ID_ORG2} \
+  --channelID mychannel \
+  --name fabcar \
+  --version 1.0 \
+  --signature-policy "AND('Org1MSP.member','Org2MSP.member')" \
+  --sequence 1 \
+  --waitForEvent
+
+echo "Committing smart contract"
+${PEER_ORG1} lifecycle chaincode commit \
+  --channelID mychannel \
+  --name fabcar \
+  --version 1.0 \
+  --signature-policy "AND('Org1MSP.member','Org2MSP.member')" \
+  --sequence 1 \
+  --waitForEvent \
+  --peerAddresses peer0.org1.example.com:7051 \
+  --peerAddresses peer0.org2.example.com:9051 \
+  --tlsRootCertFiles ${ORG1_TLS_ROOTCERT_FILE} \
+  --tlsRootCertFiles ${ORG2_TLS_ROOTCERT_FILE}
+
+echo "Submitting initLedger transaction to smart contract on mychannel"
+${PEER_ORG1} chaincode invoke \
+  -C mychannel \
+  -n fabcar \
+  -c '{"function":"initLedger","Args":[]}' \
+  --waitForEvent \
+  --waitForEventTimeout 300s \
+  --peerAddresses peer0.org1.example.com:7051 \
+  --peerAddresses peer0.org2.example.com:9051 \
+  --tlsRootCertFiles ${ORG1_TLS_ROOTCERT_FILE} \
+  --tlsRootCertFiles ${ORG2_TLS_ROOTCERT_FILE}
 
 cat <<EOF
 

diff --git a/fabcar/typescript/src/enrollAdmin.ts b/fabcar/typescript/src/enrollAdmin.ts
@@ -7,16 +7,18 @@ import { FileSystemWallet, X509WalletMixin } from 'fabric-network';
 import * as fs from 'fs';
 import * as path from 'path';
 
-const ccpPath = path.resolve(__dirname, '..', '..', '..', 'basic-network', 'connection.json');
+const ccpPath = path.resolve(__dirname, '..', '..', '..', 'first-network', 'connection-org1.json');
 const ccpJSON = fs.readFileSync(ccpPath, 'utf8');
 const ccp = JSON.parse(ccpJSON);
 
 async function main() {
     try {
 
         // Create a new CA client for interacting with the CA.
-        const caURL = ccp.certificateAuthorities['ca.example.com'].url;
-        const ca = new FabricCAServices(caURL);
+        const caInfo = ccp.certificateAuthorities['ca.org1.example.com'];
+        const caTLSCACertsPath = path.resolve(__dirname, '..', '..', '..', 'first-network', caInfo.tlsCACerts.path);
+        const caTLSCACerts = fs.readFileSync(caTLSCACertsPath);
+        const ca = new FabricCAServices(caInfo.url, { trustedRoots: caTLSCACerts, verify: false }, caInfo.caName);
 
         // Create a new file system based wallet for managing identities.
         const walletPath = path.join(process.cwd(), 'wallet');

diff --git a/fabcar/typescript/src/invoke.ts b/fabcar/typescript/src/invoke.ts
@@ -3,12 +3,9 @@
  */
 
 import { FileSystemWallet, Gateway } from 'fabric-network';
-import * as fs from 'fs';
 import * as path from 'path';
 
-const ccpPath = path.resolve(__dirname, '..', '..', '..', 'basic-network', 'connection.json');
-const ccpJSON = fs.readFileSync(ccpPath, 'utf8');
-const ccp = JSON.parse(ccpJSON);
+const ccpPath = path.resolve(__dirname, '..', '..', '..', 'first-network', 'connection-org1.json');
 
 async function main() {
     try {
@@ -28,7 +25,7 @@ async function main() {
 
         // Create a new gateway for connecting to our peer node.
         const gateway = new Gateway();
-        await gateway.connect(ccp, { wallet, identity: 'user1', discovery: { enabled: false } });
+        await gateway.connect(ccpPath, { wallet, identity: 'user1', discovery: { enabled: true, asLocalhost: true } });
 
         // Get the network (channel) our contract is deployed to.
         const network = await gateway.getNetwork('mychannel');

diff --git a/fabcar/typescript/src/query.ts b/fabcar/typescript/src/query.ts
@@ -3,12 +3,9 @@
  */
 
 import { FileSystemWallet, Gateway } from 'fabric-network';
-import * as fs from 'fs';
 import * as path from 'path';
 
-const ccpPath = path.resolve(__dirname, '..', '..', '..', 'basic-network', 'connection.json');
-const ccpJSON = fs.readFileSync(ccpPath, 'utf8');
-const ccp = JSON.parse(ccpJSON);
+const ccpPath = path.resolve(__dirname, '..', '..', '..', 'first-network', 'connection-org1.json');
 
 async function main() {
     try {
@@ -28,7 +25,7 @@ async function main() {
 
         // Create a new gateway for connecting to our peer node.
         const gateway = new Gateway();
-        await gateway.connect(ccp, { wallet, identity: 'user1', discovery: { enabled: false } });
+        await gateway.connect(ccpPath, { wallet, identity: 'user1', discovery: { enabled: true, asLocalhost: true } });
 
         // Get the network (channel) our contract is deployed to.
         const network = await gateway.getNetwork('mychannel');

diff --git a/fabcar/typescript/src/registerUser.ts b/fabcar/typescript/src/registerUser.ts
@@ -3,12 +3,9 @@
  */
 
 import { FileSystemWallet, Gateway, X509WalletMixin } from 'fabric-network';
-import * as fs from 'fs';
 import * as path from 'path';
 
-const ccpPath = path.resolve(__dirname, '..', '..', '..', 'basic-network', 'connection.json');
-const ccpJSON = fs.readFileSync(ccpPath, 'utf8');
-const ccp = JSON.parse(ccpJSON);
+const ccpPath = path.resolve(__dirname, '..', '..', '..', 'first-network', 'connection-org1.json');
 
 async function main() {
     try {
@@ -35,7 +32,7 @@ async function main() {
 
         // Create a new gateway for connecting to our peer node.
         const gateway = new Gateway();
-        await gateway.connect(ccp, { wallet, identity: 'admin', discovery: { enabled: false } });
+        await gateway.connect(ccpPath, { wallet, identity: 'admin', discovery: { enabled: true, asLocalhost: true } });
 
         // Get the CA client object from the gateway for interacting with the CA.
         const ca = gateway.getClient().getCertificateAuthority();