From e48e8048287cfff8b47c9dfe01352d7c4ba43817 Mon Sep 17 00:00:00 2001 From: David Enyeart Date: Sun, 6 Oct 2019 16:21:22 -0400 Subject: [PATCH] [FAB-16776] Move BYFN up to V2_0 capabilities Using V2_0_0 capabilities will turn on identification of admins via node OU, and will fix the failing sample since cryptogen is now setup to generate admins via node OU. Change-Id: I30ff651a112bd88c93f6563f5e4414f8d2c6693e Signed-off-by: David Enyeart --- basic-network/configtx.yaml | 48 ++++++++++------------- first-network/configtx.yaml | 47 ++++++++++------------ interest_rate_swaps/network/configtx.yaml | 47 ++++++++++------------ 3 files changed, 60 insertions(+), 82 deletions(-) diff --git a/basic-network/configtx.yaml b/basic-network/configtx.yaml index e16209422b..c7554769e7 100644 --- a/basic-network/configtx.yaml +++ b/basic-network/configtx.yaml @@ -100,44 +100,37 @@ Capabilities: # 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 + # V2_0 capability ensures that orderers and peers behave according + # to v2.0 channel capabilities. Orderers and peers from + # prior releases would behave in an incompatible way, and are therefore + # not able to participate in channels at v2.0 capability. + # Prior to enabling V2.0 channel capabilities, ensure that all + # orderers and peers on a channel are at v2.0.0 or later. + V2_0: 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 + # V2_0 orderer capability ensures that orderers behave according + # to v2.0 orderer capabilities. Orderers from + # prior releases would behave in an incompatible way, and are therefore + # not able to participate in channels at v2.0 orderer capability. + # Prior to enabling V2.0 orderer capabilities, ensure that all + # orderers on channel are at v2.0.0 or later. + V2_0: 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 application capability ensures that peers behave according + # to v2.0 application capabilities. Peers from + # prior releases would behave in an incompatible way, and are therefore + # not able to participate in channels at v2.0 application capability. + # Prior to enabling V2.0 application capabilities, ensure that all + # peers on channel are at v2.0.0 or later. 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 ################################################################################ # @@ -302,4 +295,3 @@ Profiles: - *Org1 Capabilities: <<: *ApplicationCapabilities - diff --git a/first-network/configtx.yaml b/first-network/configtx.yaml index cedd7d14be..f760eb2ab2 100644 --- a/first-network/configtx.yaml +++ b/first-network/configtx.yaml @@ -134,44 +134,37 @@ Capabilities: # 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 + # V2_0 capability ensures that orderers and peers behave according + # to v2.0 channel capabilities. Orderers and peers from + # prior releases would behave in an incompatible way, and are therefore + # not able to participate in channels at v2.0 capability. + # Prior to enabling V2.0 channel capabilities, ensure that all + # orderers and peers on a channel are at v2.0.0 or later. + V2_0: 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 + # V2_0 orderer capability ensures that orderers behave according + # to v2.0 orderer capabilities. Orderers from + # prior releases would behave in an incompatible way, and are therefore + # not able to participate in channels at v2.0 orderer capability. + # Prior to enabling V2.0 orderer capabilities, ensure that all + # orderers on channel are at v2.0.0 or later. + V2_0: 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 application capability ensures that peers behave according + # to v2.0 application capabilities. Peers from + # prior releases would behave in an incompatible way, and are therefore + # not able to participate in channels at v2.0 application capability. + # Prior to enabling V2.0 application capabilities, ensure that all + # peers on channel are at v2.0.0 or later. 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 ################################################################################ # diff --git a/interest_rate_swaps/network/configtx.yaml b/interest_rate_swaps/network/configtx.yaml index f36620d4fa..75d9a02345 100644 --- a/interest_rate_swaps/network/configtx.yaml +++ b/interest_rate_swaps/network/configtx.yaml @@ -242,44 +242,37 @@ Capabilities: # 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 + # V2_0 capability ensures that orderers and peers behave according + # to v2.0 channel capabilities. Orderers and peers from + # prior releases would behave in an incompatible way, and are therefore + # not able to participate in channels at v2.0 capability. + # Prior to enabling V2.0 channel capabilities, ensure that all + # orderers and peers on a channel are at v2.0.0 or later. + V2_0: 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 + # V2_0 orderer capability ensures that orderers behave according + # to v2.0 orderer capabilities. Orderers from + # prior releases would behave in an incompatible way, and are therefore + # not able to participate in channels at v2.0 orderer capability. + # Prior to enabling V2.0 orderer capabilities, ensure that all + # orderers on channel are at v2.0.0 or later. + V2_0: 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 application capability ensures that peers behave according + # to v2.0 application capabilities. Peers from + # prior releases would behave in an incompatible way, and are therefore + # not able to participate in channels at v2.0 application capability. + # Prior to enabling V2.0 application capabilities, ensure that all + # peers on channel are at v2.0.0 or later. 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 ################################################################################ #