latest files

vineshtk · Mar 26, 2024 · d5f7462 · d5f7462
1 parent 9e4115a
commit d5f7462
Show file tree

Hide file tree

Showing 3 changed files with 135 additions and 69 deletions.
diff --git a/pkg/configs/generated/config/configtx.yaml b/pkg/configs/generated/config/configtx.yaml
@@ -45,7 +45,7 @@ channel:
             V2_0: true
 orderer:
     Addresses:
-        - orderer.fh:7050
+        - orderer.v.con:7050
     BatchTimeout: 2s
     BatchSize:
         maxmessagecount: 10
@@ -68,7 +68,7 @@ orderer:
 organizations:
     - Name: OrdererOrg
       ID: OrdererMSP
-      MSPDir: ../organizations/ordererOrganizations/fh/msp
+      MSPDir: ../organizations/ordererOrganizations/v.con/msp
       Policies:
         Readers:
             Type: Signature
@@ -80,23 +80,23 @@ organizations:
             Type: Signature
             Rule: OR('OrdererMSP.member')
       OrdererEndpoints:
-        - orderer.fh:7050
-    - Name: FeMSP
-      ID: FeMSP
-      MSPDir: ../organizations/peerOrganizations/fe.fh/msp
+        - orderer.v.con:7050
+    - Name: DfMSP
+      ID: DfMSP
+      MSPDir: ../organizations/peerOrganizations/df.v.con/msp
       Policies:
         Readers:
             Type: Signature
-            Rule: OR('FeMSP.admin', 'FeMSP.peer', 'FeMSP.client')
+            Rule: OR('DfMSP.admin', 'DfMSP.peer', 'DfMSP.client')
         Writers:
             Type: Signature
-            Rule: OR('FeMSP.admin','FeMSP.client')
+            Rule: OR('DfMSP.admin','DfMSP.client')
         Admins:
             Type: Signature
-            Rule: OR('FeMSP.admin')
+            Rule: OR('DfMSP.admin')
         Endorsement:
             Type: Signature
-            Rule: OR('FeMSP.peer')
+            Rule: OR('DfMSP.peer')
 profiles:
     ThreeOrgsChannel:
         <<:
@@ -116,26 +116,92 @@ profiles:
             Capabilities:
                 <<:
                     V2_0: true
-    orderer:
-        <<:
-            Addresses:
-                - orderer.fh:7050
-            BatchTimeout: 2s
-            BatchSize:
-                maxmessagecount: 10
-                absolutemaxbytes: 99 MB
-                preferredmaxbytes: 512 KB
-            Organizations: ""
-            Policies:
-                Readers:
-                    Type: ImplicitMeta
-                    Rule: ANY Readers
-                Writers:
-                    Type: ImplicitMeta
-                    Rule: ANY Writers
-                Admins:
-                    Type: ImplicitMeta
-                    Rule: MAJORITY Admins
-                BlockValidation:
-                    Type: ImplicitMeta
-                    Rule: ANY Writers
+        Application:
+            <<:
+                Organization: ""
+                Policies:
+                    Readers:
+                        Type: ImplicitMeta
+                        Rule: ANY Readers
+                    Writers:
+                        Type: ImplicitMeta
+                        Rule: ANY Writers
+                    Admins:
+                        Type: ImplicitMeta
+                        Rule: MAJORITY Admins
+                    LifecycleEndorsement:
+                        Type: ImplicitMeta
+                        Rule: MAJORITY Endorsement
+                    Endorsement:
+                        Type: ImplicitMeta
+                        Rule: MAJORITY Endorsement
+                Capabilities:
+                    <<:
+                        V2_5: true
+            Capabilities:
+                V2_5: true
+            Organizations:
+                - Name: DfMSP
+                  ID: DfMSP
+                  MSPDir: ../organizations/peerOrganizations/df.v.con/msp
+                  Policies:
+                    Readers:
+                        Type: Signature
+                        Rule: OR('DfMSP.admin', 'DfMSP.peer', 'DfMSP.client')
+                    Writers:
+                        Type: Signature
+                        Rule: OR('DfMSP.admin','DfMSP.client')
+                    Admins:
+                        Type: Signature
+                        Rule: OR('DfMSP.admin')
+                    Endorsement:
+                        Type: Signature
+                        Rule: OR('DfMSP.peer')
+        orderer:
+            <<:
+                Addresses:
+                    - orderer.v.con:7050
+                BatchTimeout: 2s
+                BatchSize:
+                    maxmessagecount: 10
+                    absolutemaxbytes: 99 MB
+                    preferredmaxbytes: 512 KB
+                Organizations: ""
+                Policies:
+                    Readers:
+                        Type: ImplicitMeta
+                        Rule: ANY Readers
+                    Writers:
+                        Type: ImplicitMeta
+                        Rule: ANY Writers
+                    Admins:
+                        Type: ImplicitMeta
+                        Rule: MAJORITY Admins
+                    BlockValidation:
+                        Type: ImplicitMeta
+                        Rule: ANY Writers
+            Capabilities:
+                V2_0: true
+            EtcdRaft:
+                Consenters:
+                    - Host: orderer.auto.com
+                      Port: "7050"
+                      ClientTLSCert: ../organizations/ordererOrganizations/auto.com/orderers/orderer.auto.com/tls/server.crt
+                      ServerTLSCert: ../organizations/ordererOrganizations/auto.com/orderers/orderer.auto.com/tls/server.crt
+            OrdererType: etcdraft
+            Organizations:
+                Name: OrdererOrg
+                ID: OrdererMSP
+                MSPDir: ../organizations/ordererOrganizations/v.con/msp
+                Policies:
+                    Readers:
+                        Type: Signature
+                        Rule: OR('OrdererMSP.member')
+                    Writers:
+                        Type: Signature
+                        Rule: OR('OrdererMSP.member')
+                    Admins:
+                        Type: Signature
+                        Rule: OR('OrdererMSP.member')
+                OrdererEndpoints:
+                    - orderer.v.con:7050
diff --git a/pkg/configs/generated/docker/docker-compose-ca.yaml b/pkg/configs/generated/docker/docker-compose-ca.yaml
@@ -2,12 +2,12 @@ networks:
     test:
         name: fabric_test
 services:
-    ca_fe:
+    ca_df:
         command: sh -c 'fabric-ca-server start -b admin:adminpw -d'
-        container_name: ca_fe
+        container_name: ca_df
         environment:
             - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server
-            - FABRIC_CA_SERVER_CA_NAME=ca-fe
+            - FABRIC_CA_SERVER_CA_NAME=ca-df
             - FABRIC_CA_SERVER_TLS_ENABLED=true
             - FABRIC_CA_SERVER_PORT=8054
             - FABRIC_CA_SERVER_OPERATIONS_LISTENADDRESS=0.0.0.0:18054
@@ -20,7 +20,7 @@ services:
             - 8054:8054
             - 18054:18054
         volumes:
-            - ../organizations/fabric-ca/fe:/etc/hyperledger/fabric-ca-server
+            - ../organizations/fabric-ca/df:/etc/hyperledger/fabric-ca-server
     ca_orderer:
         command: sh -c 'fabric-ca-server start -b admin:adminpw -d'
         container_name: ca_orderer

diff --git a/pkg/configs/generated/docker/docker-compose-orgs.yaml b/pkg/configs/generated/docker/docker-compose-orgs.yaml
@@ -6,7 +6,7 @@ services:
         command: /bin/bash
         container_name: cli
         depends_on:
-            - peer0.fe.fh
+            - peer0.df.v.con
         environment:
             - GOPATH=/opt/gopath
             - FABRIC_LOGGING_SPEC=INFO
@@ -22,8 +22,8 @@ services:
             - /var/run/docker.sock:/host/var/run/docker.sock
             - ../organizations:/opt/gopath/src/github.com/hyperledger/fabric/peer/organizations
         working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer
-    fepeer0db:
-        container_name: fepeer0db
+    dfpeer0db:
+        container_name: dfpeer0db
         environment:
             - COUCHDB_USER=admin
             - COUCHDB_PASSWORD=adminpw
@@ -34,9 +34,9 @@ services:
             - test
         ports:
             - 5984:5984
-    orderer.fh:
+    orderer.v.con:
         command: orderer
-        container_name: orderer.fh
+        container_name: orderer.v.con
         environment:
             - FABRIC_LOGGING_SPEC=INFO
             - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0
@@ -58,8 +58,8 @@ services:
             - ORDERER_ADMIN_TLS_ROOTCAS=[/var/hyperledger/orderer/tls/ca.crt]
             - ORDERER_ADMIN_TLS_CLIENTROOTCAS=[/var/hyperledger/orderer/tls/ca.crt]
             - ORDERER_ADMIN_LISTENADDRESS=0.0.0.0:7053
-            - ORDERER_OPERATIONS_LISTENADDRESS=orderer.fh:9443
-            - ORDERER_OPERATIONS_LISTENADDRESS=orderer.fh:9443
+            - ORDERER_OPERATIONS_LISTENADDRESS=orderer.v.con:9443
+            - ORDERER_OPERATIONS_LISTENADDRESS=orderer.v.con:9443
             - ORDERER_METRICS_PROVIDER=prometheus
         image: hyperledger/fabric-orderer:2.5.4
         labels:
@@ -71,15 +71,15 @@ services:
             - 7053:7053
             - 9443:9443
         volumes:
-            - ../organizations/ordererOrganizations/fh/orderers/orderer.fh/msp:/var/hyperledger/orderer/msp
-            - ../organizations/ordererOrganizations/fh/orderers/orderer.fh/tls/:/var/hyperledger/orderer/tls
-            - orderer.fh:/var/hyperledger/production/orderer
+            - ../organizations/ordererOrganizations/v.con/orderers/orderer.v.con/msp:/var/hyperledger/orderer/msp
+            - ../organizations/ordererOrganizations/v.con/orderers/orderer.v.con/tls/:/var/hyperledger/orderer/tls
+            - orderer.v.con:/var/hyperledger/production/orderer
         working_dir: /root
-    peer0.fe.fh:
+    peer0.df.v.con:
         command: peer node start
-        container_name: services:peer0.fe.fh
+        container_name: services:peer0.df.v.con
         depends_on:
-            - fepeer0db
+            - dfpeer0db
         environment:
             - FABRIC_LOGGING_SPEC=INFO
             - '#- FABRIC_LOGGING_SPEC=DEBUG'
@@ -91,25 +91,25 @@ services:
             - CORE_PEER_TLS_KEY_FILE=/etc/hyperledger/fabric/tls/server.key
             - CORE_PEER_TLS_ROOTCERT_FILE=/etc/hyperledger/fabric/tls/ca.crt
             - '# Peer specific variables'
-            - CORE_PEER_ID=peer0.fe.fh
-            - CORE_PEER_ADDRESS=peer0.fe.fh:7051
+            - CORE_PEER_ID=peer0.df.v.con
+            - CORE_PEER_ADDRESS=peer0.df.v.con:7051
             - CORE_PEER_LISTENADDRESS=0.0.0.0:7051
-            - CORE_PEER_CHAINCODEADDRESS=peer0.fe.fh:7052
-            - CORE_PEER_CHAINCODEADDRESS=peer0.fe.fh:7052
+            - CORE_PEER_CHAINCODEADDRESS=peer0.df.v.con:7052
+            - CORE_PEER_CHAINCODEADDRESS=peer0.df.v.con:7052
             - CORE_PEER_CHAINCODELISTENADDRESS=0.0.0.0:7052
-            - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.fe.fh:7051
-            - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.fe.fh:7051
-            - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.fe.fh:7051
-            - CORE_PEER_LOCALMSPID=FeMSP
+            - CORE_PEER_GOSSIP_BOOTSTRAP=peer0.df.v.con:7051
+            - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.df.v.con:7051
+            - CORE_PEER_GOSSIP_EXTERNALENDPOINT=peer0.df.v.con:7051
+            - CORE_PEER_LOCALMSPID=DfMSP
             - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/fabric/msp
-            - CORE_OPERATIONS_LISTENADDRESS=peer0.fe.fh:9444
-            - CORE_OPERATIONS_LISTENADDRESS=peer0.fe.fh:9444
+            - CORE_OPERATIONS_LISTENADDRESS=peer0.df.v.con:9444
+            - CORE_OPERATIONS_LISTENADDRESS=peer0.df.v.con:9444
             - CORE_METRICS_PROVIDER=prometheus
-            - CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG={'peername':'peer0fe'}
+            - CHAINCODE_AS_A_SERVICE_BUILDER_CONFIG={'peername':'peer0df'}
             - CORE_CHAINCODE_EXECUTETIMEOUT=300s
             - CORE_LEDGER_STATE_STATEDATABASE=CouchDB
-            - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=fepeer0db:5984
-            - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=fepeer0db:5984
+            - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=dfpeer0db:5984
+            - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=dfpeer0db:5984
             - CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME=admin
             - CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD=adminpw
         image: hyperledger/fabric-peer:2.5.4
@@ -123,12 +123,12 @@ services:
             - 9444:9444
         volumes:
             - /var/run/docker.sock:/host/var/run/docker.sock
-            - ../organizations/peerOrganizations/fe.fh/peers/peer0.fe.fh:/etc/hyperledger/fabric
-            - peer0.fe.fh:/var/hyperledger/production
-            - ../organizations/peerOrganizations/fe.fh/peers/peer0.fe.fh:/etc/hyperledger/fabric
-            - peer0.fe.fh:/var/hyperledger/production
+            - ../organizations/peerOrganizations/df.v.con/peers/peer0.df.v.con:/etc/hyperledger/fabric
+            - peer0.df.v.con:/var/hyperledger/production
+            - ../organizations/peerOrganizations/df.v.con/peers/peer0.df.v.con:/etc/hyperledger/fabric
+            - peer0.df.v.con:/var/hyperledger/production
         working_dir: /root
 version: "3.7"
 volumes:
-    orderer.fh: ""
-    peer0.fe.fh: ""
+    orderer.v.con: ""
+    peer0.df.v.con: ""