[FAB-15022] Basic-network support for new lifecycle

This change set upgrades config files, scripts and fixtures for the
basic-network sample.

Changes are as follows:
 - configtx.yaml was amended adding capabilities and policies required
   to bootstrap a 2.0 channel
 - crypto-config.yaml was amended adding support for node OUs (so that
   policies involving peers, admins and clients can be evaluated)
 - generate.sh was amended adding the name of the orderer system channel
 - generate.sh is executed, producing fixtures in the crypto-config and 
   config directories
 - docker-compose.yml is changed specifying the correct SKI after
   crypto material has been regenerated
 - finally, startFabric.sh has been upgraded to use the new lifecycle

Change-Id: I201a98e3bf4d9717741539f572719aa687f4bb63
Signed-off-by: Alessandro Sorniotti <ale.linux@sopit.net>

basic-network/configtx.yaml

@@ -27,6 +27,20 @@ Organizations:
  # MSPDir is the filesystem path which contains the MSP configuration
  MSPDir: crypto-config/ordererOrganizations/example.com/msp
 
+ # Policies defines the set of policies at this level of the config tree
+ # For organization policies, their canonical path is usually
+ # /Channel/<Application|Orderer>/<OrgName>/<PolicyName>
+ Policies:
+ Readers:
+ Type: Signature
+ Rule: "OR('OrdererMSP.member')"
+ Writers:
+ Type: Signature
+ Rule: "OR('OrdererMSP.member')"
+ Admins:
+ Type: Signature
+ Rule: "OR('OrdererMSP.admin')"
+
  - &Org1
  # DefaultOrg defines the organization which is used in the sampleconfig
  # of the fabric.git development environment
@@ -37,13 +51,94 @@ Organizations:
 
  MSPDir: crypto-config/peerOrganizations/org1.example.com/msp
 
+ # Policies defines the set of policies at this level of the config tree
+ # For organization policies, their canonical path is usually
+ # /Channel/<Application|Orderer>/<OrgName>/<PolicyName>
+ Policies:
+ Readers:
+ Type: Signature
+ Rule: "OR('Org1MSP.admin', 'Org1MSP.peer', 'Org1MSP.client')"
+ Writers:
+ Type: Signature
+ Rule: "OR('Org1MSP.admin', 'Org1MSP.client')"
+ Admins:
+ Type: Signature
+ Rule: "OR('Org1MSP.admin')"
+ Endorsement:
+ Type: Signature
+ Rule: "OR('Org1MSP.peer')"
+
+ # leave this flag set to true.
  AnchorPeers:
  # AnchorPeers defines the location of peers which can be used
  # for cross org gossip communication. Note, this value is only
  # encoded in the genesis block in the Application section context
  - Host: peer0.org1.example.com
  Port: 7051
 
+################################################################################
+#
+# SECTION: Capabilities
+#
+# - This section defines the capabilities of fabric network. This is a new
+# concept as of v1.1.0 and should not be utilized in mixed networks with
+# v1.0.x peers and orderers. Capabilities define features which must be
+# present in a fabric binary for that binary to safely participate in the
+# fabric network. For instance, if a new MSP type is added, newer binaries
+# might recognize and validate the signatures from this type, while older
+# binaries without this support would be unable to validate those
+# transactions. This could lead to different versions of the fabric binaries
+# having different world states. Instead, defining a capability for a channel
+# informs those binaries without this capability that they must cease
+# processing transactions until they have been upgraded. For v1.0.x if any
+# capabilities are defined (including a map with all capabilities turned off)
+# then the v1.0.x peer will deliberately crash.
+#
+################################################################################
+Capabilities:
+ # Channel capabilities apply to both the orderers and the peers and must be
+ # supported by both.
+ # Set the value of the capability to true to require it.
+ Channel: &ChannelCapabilities
+ # V1.3 for Channel is a catchall flag for behavior which has been
+ # determined to be desired for all orderers and peers running at the v1.3.x
+ # level, but which would be incompatible with orderers and peers from
+ # prior releases.
+ # Prior to enabling V1.3 channel capabilities, ensure that all
+ # orderers and peers on a channel are at v1.3.0 or later.
+ V1_3: true
+
+ # Orderer capabilities apply only to the orderers, and may be safely
+ # used with prior release peers.
+ # Set the value of the capability to true to require it.
+ Orderer: &OrdererCapabilities
+ # V1.1 for Orderer is a catchall flag for behavior which has been
+ # determined to be desired for all orderers running at the v1.1.x
+ # level, but which would be incompatible with orderers from prior releases.
+ # Prior to enabling V1.1 orderer capabilities, ensure that all
+ # orderers on a channel are at v1.1.0 or later.
+ V1_1: true
+
+ # Application capabilities apply only to the peer network, and may be safely
+ # used with prior release orderers.
+ # Set the value of the capability to true to require it.
+ Application: &ApplicationCapabilities
+ # V2.0 for Application enables the new non-backwards compatible
+ # features and fixes of fabric v2.0.
+ V2_0: true
+ # V1.3 for Application enables the new non-backwards compatible
+ # features and fixes of fabric v1.3 (note, this need not be set if
+ # later version capabilities are set)
+ V1_3: false
+ # V1.2 for Application enables the new non-backwards compatible
+ # features and fixes of fabric v1.2 (note, this need not be set if
+ # later version capabilities are set)
+ V1_2: false
+ # V1.1 for Application enables the new non-backwards compatible
+ # features and fixes of fabric v1.1 (note, this need not be set if
+ # later version capabilities are set).
+ V1_1: false
+
 ################################################################################
 #
 # SECTION: Application
@@ -58,6 +153,28 @@ Application: &ApplicationDefaults
  # the application side of the network
  Organizations:
 
+ # Policies defines the set of policies at this level of the config tree
+ # For Application policies, their canonical path is
+ # /Channel/Application/<PolicyName>
+ 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:
+ <<: *ApplicationCapabilities
 ################################################################################
 #
 # SECTION: Orderer
@@ -103,6 +220,57 @@ Orderer: &OrdererDefaults
  # the orderer side of the network
  Organizations:
 
+ # Policies defines the set of policies at this level of the config tree
+ # For Orderer policies, their canonical path is
+ # /Channel/Orderer/<PolicyName>
+ Policies:
+ Readers:
+ Type: ImplicitMeta
+ Rule: "ANY Readers"
+ Writers:
+ Type: ImplicitMeta
+ Rule: "ANY Writers"
+ Admins:
+ Type: ImplicitMeta
+ Rule: "MAJORITY Admins"
+ # BlockValidation specifies what signatures must be included in the block
+ # from the orderer for the peer to validate it.
+ BlockValidation:
+ Type: ImplicitMeta
+ Rule: "ANY Writers"
+
+################################################################################
+#
+# CHANNEL
+#
+# This section defines the values to encode into a config transaction or
+# genesis block for channel related parameters.
+#
+################################################################################
+Channel: &ChannelDefaults
+ # Policies defines the set of policies at this level of the config tree
+ # For Channel policies, their canonical path is
+ # /Channel/<PolicyName>
+ Policies:
+ # Who may invoke the 'Deliver' API
+ Readers:
+ Type: ImplicitMeta
+ Rule: "ANY Readers"
+ # Who may invoke the 'Broadcast' API
+ Writers:
+ Type: ImplicitMeta
+ Rule: "ANY Writers"
+ # By default, who may modify elements at this config level
+ Admins:
+ Type: ImplicitMeta
+ Rule: "MAJORITY Admins"
+
+ # Capabilities describes the channel level capabilities, see the
+ # dedicated Capabilities section elsewhere in this file for a full
+ # description
+ Capabilities:
+ <<: *ChannelCapabilities
+
 ################################################################################
 #
 # Profile
@@ -114,18 +282,24 @@ Orderer: &OrdererDefaults
 Profiles:
 
  OneOrgOrdererGenesis:
+ <<: *ChannelDefaults
  Orderer:
  <<: *OrdererDefaults
  Organizations:
  - *OrdererOrg
+ Capabilities:
+ <<: *OrdererCapabilities
  Consortiums:
  SampleConsortium:
  Organizations:
  - *Org1
  OneOrgChannel:
  Consortium: SampleConsortium
+ <<: *ChannelDefaults
  Application:
  <<: *ApplicationDefaults
  Organizations:
  - *Org1
+ Capabilities:
+ <<: *ApplicationCapabilities
 

basic-network/crypto-config.yaml

@@ -26,6 +26,7 @@ PeerOrgs:
  # ---------------------------------------------------------------------------
  - Name: Org1
  Domain: org1.example.com
+ EnableNodeOUs: true
  # ---------------------------------------------------------------------------
  # "Specs"
  # ---------------------------------------------------------------------------

basic-network/crypto-config/ordererOrganizations/example.com/ca/60a3a0436468d6505527325c123a9028332a846f05c5feef48f0e56cd74a6b1d_sk

@@ -0,0 +1,5 @@
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgl0Tpf6w6lq46Xy7M
+dwGcn9Dy7oJrm+idNhzsuPCXybChRANCAASnZ+ZV2YbfMPvQaGfqwVLZ0uho9Tio
+Tj5Pfj40QIyixko1llyrq9Dt9T3m4XvfKB2yk171IdUNAepmB1K52PnV
+-----END PRIVATE KEY-----

basic-network/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem

@@ -1,14 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICLjCCAdWgAwIBAgIQHuAANpa/kDL7CPyNttctRjAKBggqhkjOPQQDAjBpMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
-bGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowaTELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
-Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv
-bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIzTWKIWgOBOxN3budT5HXPthluo
-zghOXPXcyD5JBaxafbkgzr8jC3M2rlJJBm0nCmjv6C1LkiCAOftYkyLofLqjXzBd
-MA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMB
-Af8wKQYDVR0OBCIEIKBgakqGCh4xyQojeI2m87a3SSXtDSMGGvSJlAm6Rq5qMAoG
-CCqGSM49BAMCA0cAMEQCIGShwWIKXmf3oJY3Oow7pKA0SSe89UsRLy2HMxxNzgWx
-AiB097hBfmM2JEZsEZfMbEM2U7edQIDyCoPOgm5ha9wDNw==
+MIICPjCCAeSgAwIBAgIRAIvKUkOSe/nqaK1yUopBGiEwCgYIKoZIzj0EAwIwaTEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
+cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt
+cGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMGkxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp
+c2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEXMBUGA1UEAxMOY2EuZXhhbXBsZS5j
+b20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASnZ+ZV2YbfMPvQaGfqwVLZ0uho
+9TioTj5Pfj40QIyixko1llyrq9Dt9T3m4XvfKB2yk171IdUNAepmB1K52PnVo20w
+azAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIGCjoENkaNZQVScyXBI6kCgzKoRv
+BcX+70jw5WzXSmsdMAoGCCqGSM49BAMCA0gAMEUCIQDDuM0qeCmrJ7QvPQJrKtiT
+h3W0rPsxWG9reunkChLklwIgXjo90TxZQzmXvRYkQldGJ3fBQDyQbRlGl74oGS2i
+eEE=
 -----END CERTIFICATE-----

basic-network/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem

@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICCTCCAbCgAwIBAgIQVMXz1cejr3sGgDsXuIBK3zAKBggqhkjOPQQDAjBpMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
-bGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowVjELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
-Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI
-zj0DAQcDQgAEFufLmRXBZHc3d7HvYSU4jR4nJnzfmJlWN6Gm0Bm+NsO8lwb1TDa4
-cPzAOgnbIm1VFwhBd+sE3TIzIWsM2Kzv1aNNMEswDgYDVR0PAQH/BAQDAgeAMAwG
-A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgoGBqSoYKHjHJCiN4jabztrdJJe0NIwYa
-9ImUCbpGrmowCgYIKoZIzj0EAwIDRwAwRAIgId+xpuBHjfWvL8aAsDbmMjXAoOYy
-BgazcJh446kZaDACIDeyvsH5Xwes5w5Sksv7mb6/kr4ceCy00h1Vlt5bwPiu
+MIICCzCCAbGgAwIBAgIRAPEuMhjzbXslBwbekcOmD1AwCgYIKoZIzj0EAwIwaTEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
+cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt
+cGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMFYxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp
+c2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqG
+SM49AwEHA0IABKTFtF0SNhy/MW+TYUE9DuBjN9oxqWFUj4p7wdxSLZBRZf5KLX7g
+M1CnH7ur9DsJE70n1PX+/vPuMyIeB33V0Y6jTTBLMA4GA1UdDwEB/wQEAwIHgDAM
+BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIGCjoENkaNZQVScyXBI6kCgzKoRvBcX+
+70jw5WzXSmsdMAoGCCqGSM49BAMCA0gAMEUCIQDUkVhWPfOETm7kEb//GlDVEzAW
+cr+Y1P/WSng6cYqahQIgdM5jxkfLoR8s8zFctevNEQvQOsNbJlJ08v6yEc9J3tM=
 -----END CERTIFICATE-----

basic-network/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem

@@ -1,14 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICLjCCAdWgAwIBAgIQHuAANpa/kDL7CPyNttctRjAKBggqhkjOPQQDAjBpMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
-bGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowaTELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
-Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv
-bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIzTWKIWgOBOxN3budT5HXPthluo
-zghOXPXcyD5JBaxafbkgzr8jC3M2rlJJBm0nCmjv6C1LkiCAOftYkyLofLqjXzBd
-MA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB/wQFMAMB
-Af8wKQYDVR0OBCIEIKBgakqGCh4xyQojeI2m87a3SSXtDSMGGvSJlAm6Rq5qMAoG
-CCqGSM49BAMCA0cAMEQCIGShwWIKXmf3oJY3Oow7pKA0SSe89UsRLy2HMxxNzgWx
-AiB097hBfmM2JEZsEZfMbEM2U7edQIDyCoPOgm5ha9wDNw==
+MIICPjCCAeSgAwIBAgIRAIvKUkOSe/nqaK1yUopBGiEwCgYIKoZIzj0EAwIwaTEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
+cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt
+cGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMGkxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp
+c2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEXMBUGA1UEAxMOY2EuZXhhbXBsZS5j
+b20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASnZ+ZV2YbfMPvQaGfqwVLZ0uho
+9TioTj5Pfj40QIyixko1llyrq9Dt9T3m4XvfKB2yk171IdUNAepmB1K52PnVo20w
+azAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIGCjoENkaNZQVScyXBI6kCgzKoRv
+BcX+70jw5WzXSmsdMAoGCCqGSM49BAMCA0gAMEUCIQDDuM0qeCmrJ7QvPQJrKtiT
+h3W0rPsxWG9reunkChLklwIgXjo90TxZQzmXvRYkQldGJ3fBQDyQbRlGl74oGS2i
+eEE=
 -----END CERTIFICATE-----

basic-network/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem

@@ -1,14 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICNTCCAdugAwIBAgIQT0WLBisbcQ6AkirTJApb1TAKBggqhkjOPQQDAjBsMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4
-YW1wbGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowbDELMAkG
-A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu
-Y2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5leGFt
-cGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABGtRFSyePgHhit2JfQNn
-Gbda3X9Y+Eb5Ft/4L9uLsxc4zEMLt2TJZewEfO/Uoe9YH9VhFmGj/d9M0d/0HSAn
-K8WjXzBdMA4GA1UdDwEB/wQEAwIBpjAPBgNVHSUECDAGBgRVHSUAMA8GA1UdEwEB
-/wQFMAMBAf8wKQYDVR0OBCIEII0hhlVshdUV5zfQwNqNDXZyeFtoXLUDvLleU9zC
-efunMAoGCCqGSM49BAMCA0gAMEUCIQDxLfsMRqPJuoH77vahGkE6EYMqvzjVI2Ob
-aV1DZJfUdwIgHuHXPvKvcoYZgAo7Xc57Uqs6hSpMs0CjzcfLXYiwoVc=
+MIICRDCCAeqgAwIBAgIRAJDUJIOlNerIx+QFWaH83u0wCgYIKoZIzj0EAwIwbDEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
+cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l
+eGFtcGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMGwxCzAJ
+BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh
+bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh
+bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAAR3oVXOKK15Rh5C3LuT
++tpMhYM+/kD+mpcWui1JAO2S4SrCIZLkQAsv5bMfm0tN8bim9u5Z7BVCxpwUfPaV
+bAz7o20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
+AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEICcGVc9fS45n4PKefGbe
+gT/Z05MC29jcKgtVNbMWGdufMAoGCCqGSM49BAMCA0gAMEUCIQDHa9XqxJ1WPT0r
+uMe7oxuiV9wU6PenP8ayIRq9iuaEewIgVPTIqwVeIdFT8UJszIbATd1TpMX9xI1k
+ZOCqemwfc9A=
 -----END CERTIFICATE-----

basic-network/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem

@@ -1,13 +1,13 @@
 -----BEGIN CERTIFICATE-----
-MIICCTCCAbCgAwIBAgIQVMXz1cejr3sGgDsXuIBK3zAKBggqhkjOPQQDAjBpMQsw
-CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy
-YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w
-bGUuY29tMB4XDTE3MDgzMTA5MTQzMloXDTI3MDgyOTA5MTQzMlowVjELMAkGA1UE
-BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz
-Y28xGjAYBgNVBAMMEUFkbWluQGV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZI
-zj0DAQcDQgAEFufLmRXBZHc3d7HvYSU4jR4nJnzfmJlWN6Gm0Bm+NsO8lwb1TDa4
-cPzAOgnbIm1VFwhBd+sE3TIzIWsM2Kzv1aNNMEswDgYDVR0PAQH/BAQDAgeAMAwG
-A1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgoGBqSoYKHjHJCiN4jabztrdJJe0NIwYa
-9ImUCbpGrmowCgYIKoZIzj0EAwIDRwAwRAIgId+xpuBHjfWvL8aAsDbmMjXAoOYy
-BgazcJh446kZaDACIDeyvsH5Xwes5w5Sksv7mb6/kr4ceCy00h1Vlt5bwPiu
+MIICCzCCAbGgAwIBAgIRAPEuMhjzbXslBwbekcOmD1AwCgYIKoZIzj0EAwIwaTEL
+MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG
+cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt
+cGxlLmNvbTAeFw0xOTA0MDMwOTM2MDBaFw0yOTAzMzEwOTM2MDBaMFYxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp
+c2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqG
+SM49AwEHA0IABKTFtF0SNhy/MW+TYUE9DuBjN9oxqWFUj4p7wdxSLZBRZf5KLX7g
+M1CnH7ur9DsJE70n1PX+/vPuMyIeB33V0Y6jTTBLMA4GA1UdDwEB/wQEAwIHgDAM
+BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIGCjoENkaNZQVScyXBI6kCgzKoRvBcX+
+70jw5WzXSmsdMAoGCCqGSM49BAMCA0gAMEUCIQDUkVhWPfOETm7kEb//GlDVEzAW
+cr+Y1P/WSng6cYqahQIgdM5jxkfLoR8s8zFctevNEQvQOsNbJlJ08v6yEc9J3tM=
 -----END CERTIFICATE-----