Updated to latest Composer/Fabric

.eslintignore

@@ -3,4 +3,5 @@ dist
 go
 lib
 node_modules
+angular-app
 out

.eslintrc.yml

@@ -8,9 +8,6 @@ parserOptions:
     sourceType:
         - script
 rules:
-    indent:
-        - error
-        - 4
     linebreak-style:
         - error
         - unix
@@ -27,11 +24,9 @@ rules:
     curly: error
     eqeqeq: error
     no-throw-literal: error
-    strict: error
     no-var: error
     dot-notation: error
     no-tabs: error
-    no-trailing-spaces: error
     no-use-before-define: error
     no-useless-call: error
     no-with: error

README.md

@@ -7,7 +7,7 @@ In this developer journey, we will create such a Blockchain application using Hy
 # Architecture Flow
 
 <p align="center">
-  <img width="650" height="200" src="arch.png">
+  <img width="650" height="200" src="images/arch.png">
 </p>
 
 1. The administrator interacts with Decentralized Energy UI comprising of Angular framework
@@ -97,7 +97,7 @@ Now, we are ready to deploy the BNA file to Hyperledger Fabric:
 
 ```
 cd dist
-composer network deploy -a decentralized-energy-network.bna -p hlfv1 -i PeerAdmin -s randomString
+composer network deploy -a decentralized-energy-network.bna -p hlfv1 -i PeerAdmin -s randomString -A admin -S
 ```
 
 You can verify that the network has been deployed by typing:
@@ -124,7 +124,7 @@ The application should now be running at:
 `http://localhost:4200`
 
 <div style='border: 2px solid #f00;'>
-  <img width="800" src="app_scrnshot.png">
+  <img width="800" src="images/app_scrnshot.png">
 </div>
 </br>
 
@@ -156,3 +156,9 @@ This application demonstrates a basic idea of a decentralized energy network usi
 * Adding specific permissions and participant access
 * Setting up real time transactions among participants
 * Integrating with IoT to read from power meter and distribute energy
+
+
+# Journey links
+
+[Decentralized energy with Hyperledger Composer journey](https://developer.ibm.com/code/journey/decentralized-energy-hyperledger-composer/)<br />
+[Blockchain journeys](https://developer.ibm.com/code/journey/category/blockchain/)

angular-app/src/app/AllTransactions/AllTransactions.component.html

@@ -28,23 +28,23 @@ <h4>Performed Transactions</h4>
           </th>
           <th>
             Transaction ID
-          </th>         
+          </th>
         </tr>
       </thead>
       <tbody>
-        <tr *ngFor="let transaction of performedTransactions">           
+        <tr *ngFor="let transaction of performedTransactions">
           <td>
-            {{transaction.$class}}
+            {{transaction.transactionType}}
           </td>
           <td>
             {{transaction.transactionId}}
           </td>
-          
+
 
         </tr>
       </tbody>
     </table>
-        
+
   </div>
 
   <div class="row">
@@ -63,30 +63,30 @@ <h4>System Transactions</h4>
           </th>
           <th>
             Transaction ID
-          </th>         
+          </th>
         </tr>
       </thead>
       <tbody>
-        <tr *ngFor="let transaction of systemTransactions"> 
+        <tr *ngFor="let transaction of systemTransactions">
           <td>
-            {{transaction.$class}}
+            {{transaction.transactionType}}
           </td>
           <td>
             {{transaction.transactionId}}
           </td>
-          
+
 
         </tr>
       </tbody>
     </table>
-    
-    <!-- p *ngFor="let transaction of allTransactions">{{transaction.transactionId}}</p-->    
+
+    <!-- p *ngFor="let transaction of allTransactions">{{transaction.transactionId}}</p-->
   </div>
-  
+
   <div class="row">
     <br>
     <br>
   </div>
 
 
-</div>
+</div>

angular-app/src/app/AllTransactions/AllTransactions.component.ts

@@ -20,16 +20,16 @@ export class AllTransactionsComponent {
   private performedTransactions = [];
 
   constructor(private serviceTransaction:AllTransactionsService, fb: FormBuilder) {
-  
+
   };
 
 
   ngOnInit(): void {
-    
+
     this.loadAllTransactions();
-    
+
   }
-  
+
   //sort the objects on key
   sortByKey(array, key): Object[] {
     return array.sort(function(a, b) {
@@ -40,35 +40,31 @@ export class AllTransactionsComponent {
 
   //get all Residents
   loadAllTransactions(): Promise<any> {
-    
+
     let tempList = [];
     let systemList = [];
-    let performedList = [];    
+    let performedList = [];
 
     return this.serviceTransaction.getTransactions()
     .toPromise()
     .then((result) => {
-      result = this.sortByKey(result, 'timestamp');
+      result = this.sortByKey(result, 'transactionTimestamp');
 			this.errorMessage = null;
       result.forEach(transaction => {
         tempList.push(transaction);
 
         var importClass = transaction["$class"];
-        var importClassArray = importClass.split("."); 
+        var importClassArray = importClass.split(".");
 
         if(importClassArray[1] == 'hyperledger'){
-          //transaction["$class"] = importClassArray[importClassArray.length-1];
-          systemList.push(transaction);                    
+          systemList.push(transaction);
         }
         else {
-          //transaction["$class"] = importClassArray[importClassArray.length-1];
-          performedList.push(transaction);          
+          performedList.push(transaction);
         }
 
-
-
       });
-      
+
       this.systemTransactions = systemList;
       this.performedTransactions = performedList;
       this.allTransactions = tempList;
@@ -89,5 +85,5 @@ export class AllTransactionsComponent {
     });
   }
 
-          
+
 }

angular-app/src/app/data.service.ts

@@ -64,7 +64,8 @@ export class DataService<Type> {
     public transactions(): Observable<Type[]> {
         console.log('Get transactions ');
 
-        return this.http.get(this.actionUrl + 'system/transactions')        
+        //return this.http.get(this.actionUrl + 'system/transactions')
+        return this.http.get(this.actionUrl + 'system/historian')
         .map(this.extractData)
         .catch(this.handleError);
     }

fabric-tools/fabric-scripts/hlfv1/composer/docker-compose.yml

@@ -2,7 +2,7 @@ version: '2'
 
 services:
   ca.org1.example.com:
-    image: hyperledger/fabric-ca:x86_64-1.0.0
+    image: hyperledger/fabric-ca:$ARCH-1.0.1
     environment:
       - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
       - FABRIC_CA_SERVER_CA_NAME=ca.org1.example.com
@@ -18,7 +18,7 @@ services:
 
   orderer.example.com:
     container_name: orderer.example.com
-    image: hyperledger/fabric-orderer:x86_64-1.0.0
+    image: hyperledger/fabric-orderer:$ARCH-1.0.1
     environment:
       - ORDERER_GENERAL_LOGLEVEL=debug
       - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
@@ -36,7 +36,7 @@ services:
 
   peer0.org1.example.com:
     container_name: peer0.org1.example.com
-    image: hyperledger/fabric-peer:x86_64-1.0.0
+    image: hyperledger/fabric-peer:$ARCH-1.0.1
     environment:
       - CORE_LOGGING_PEER=debug
       - CORE_CHAINCODE_LOGGING_LEVEL=DEBUG
@@ -64,7 +64,7 @@ services:
 
   couchdb:
     container_name: couchdb
-    image: hyperledger/fabric-couchdb:x86_64-1.0.0
+    image: hyperledger/fabric-couchdb:$ARCH-1.0.1
     ports:
       - 5984:5984
     environment:

fabric-tools/fabric-scripts/hlfv1/downloadFabric.sh

@@ -3,12 +3,15 @@
 # Exit on first error, print all commands.
 set -ev
 
+# Set ARCH
+ARCH=`uname -m`
+
 # Grab the current directory.
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # Pull and tag the latest Hyperledger Fabric base image.
-docker pull hyperledger/fabric-peer:x86_64-1.0.0
-docker pull hyperledger/fabric-ca:x86_64-1.0.0
-docker pull hyperledger/fabric-ccenv:x86_64-1.0.0
-docker pull hyperledger/fabric-orderer:x86_64-1.0.0
-docker pull hyperledger/fabric-couchdb:x86_64-1.0.0
+docker pull hyperledger/fabric-peer:$ARCH-1.0.1
+docker pull hyperledger/fabric-ca:$ARCH-1.0.1
+docker pull hyperledger/fabric-ccenv:$ARCH-1.0.1
+docker pull hyperledger/fabric-orderer:$ARCH-1.0.1
+docker pull hyperledger/fabric-couchdb:$ARCH-1.0.1