From 2a283d32758166344190345dd4bfe7f01e3a30e9 Mon Sep 17 00:00:00 2001 From: Danny Cao Date: Mon, 13 Jan 2020 16:27:44 -0500 Subject: [PATCH] [FAB-17303] Update sample configtx.yamls with new PrivateDataImplicitCollection field Signed-off-by: Danny Cao Change-Id: I5d2c23b882c83f7a4ab529336145bb7567c6b296 --- basic-network/configtx.yaml | 9 +++++ first-network/configtx.yaml | 18 +++++++++ first-network/org3-artifacts/configtx.yaml | 24 ++++++------ interest_rate_swaps/network/configtx.yaml | 43 ++++++++++++++++++++++ test-network/addOrg3/configtx.yaml | 9 +++++ test-network/configtx/configtx.yaml | 18 +++++++++ 6 files changed, 108 insertions(+), 13 deletions(-) diff --git a/basic-network/configtx.yaml b/basic-network/configtx.yaml index c7554769..a8d8d9cf 100644 --- a/basic-network/configtx.yaml +++ b/basic-network/configtx.yaml @@ -76,6 +76,15 @@ Organizations: - Host: peer0.org1.example.com Port: 7051 + # PrivateDataImplicitCollection stores the configuration for this org's implicit + # collection. + PrivateDataImplicitCollection: + RequiredPeerCount: 0 + MaxPeerCount: 1 + BlockToLive: 0 + MemberOnlyRead: true + MemberOnlyWrite: true + ################################################################################ # # SECTION: Capabilities diff --git a/first-network/configtx.yaml b/first-network/configtx.yaml index f760eb2a..cc0f700b 100644 --- a/first-network/configtx.yaml +++ b/first-network/configtx.yaml @@ -76,6 +76,15 @@ Organizations: - Host: peer0.org1.example.com Port: 7051 + # PrivateDataImplicitCollection stores the configuration for this org's implicit + # collection. + PrivateDataImplicitCollection: + RequiredPeerCount: 0 + MaxPeerCount: 1 + BlockToLive: 0 + MemberOnlyRead: true + MemberOnlyWrite: true + - &Org2 # DefaultOrg defines the organization which is used in the sampleconfig # of the fabric.git development environment @@ -110,6 +119,15 @@ Organizations: - Host: peer0.org2.example.com Port: 9051 + # PrivateDataImplicitCollection stores the configuration for this org's implicit + # collection. + PrivateDataImplicitCollection: + RequiredPeerCount: 0 + MaxPeerCount: 1 + BlockToLive: 0 + MemberOnlyRead: true + MemberOnlyWrite: true + ################################################################################ # # SECTION: Capabilities diff --git a/first-network/org3-artifacts/configtx.yaml b/first-network/org3-artifacts/configtx.yaml index 8cd744c7..eb0c2b5c 100644 --- a/first-network/org3-artifacts/configtx.yaml +++ b/first-network/org3-artifacts/configtx.yaml @@ -36,6 +36,9 @@ Organizations: Admins: Type: Signature Rule: "OR('Org3MSP.admin')" + Endorsement: + Type: Signature + Rule: "OR('Org3MSP.peer')" AnchorPeers: # AnchorPeers defines the location of peers which can be used @@ -44,16 +47,11 @@ Organizations: - Host: peer0.org3.example.com Port: 11051 - Policies: - Readers: - Type: Signature - Rule: "OR('Org3MSP.admin', 'Org3MSP.peer', 'Org3MSP.client')" - Writers: - Type: Signature - Rule: "OR('Org3MSP.admin', 'Org3MSP.client')" - Admins: - Type: Signature - Rule: "OR('Org3MSP.admin')" - Endorsement: - Type: Signature - Rule: "OR('Org3MSP.peer')" + # PrivateDataImplicitCollection stores the configuration for this org's implicit + # collection. + PrivateDataImplicitCollection: + RequiredPeerCount: 0 + MaxPeerCount: 1 + BlockToLive: 0 + MemberOnlyRead: true + MemberOnlyWrite: true diff --git a/interest_rate_swaps/network/configtx.yaml b/interest_rate_swaps/network/configtx.yaml index 75d9a023..445c2454 100644 --- a/interest_rate_swaps/network/configtx.yaml +++ b/interest_rate_swaps/network/configtx.yaml @@ -76,6 +76,15 @@ Organizations: - Host: irs-partya Port: 7051 + # PrivateDataImplicitCollection stores the configuration for this org's implicit + # collection. + PrivateDataImplicitCollection: + RequiredPeerCount: 0 + MaxPeerCount: 1 + BlockToLive: 0 + MemberOnlyRead: true + MemberOnlyWrite: true + - &partyb # DefaultOrg defines the organization which is used in the sampleconfig # of the fabric.git development environment @@ -111,6 +120,15 @@ Organizations: - Host: irs-partyb Port: 7051 + # PrivateDataImplicitCollection stores the configuration for this org's implicit + # collection. + PrivateDataImplicitCollection: + RequiredPeerCount: 0 + MaxPeerCount: 1 + BlockToLive: 0 + MemberOnlyRead: true + MemberOnlyWrite: true + - &partyc # DefaultOrg defines the organization which is used in the sampleconfig # of the fabric.git development environment @@ -146,6 +164,14 @@ Organizations: - Host: irs-partyc Port: 7051 + # PrivateDataImplicitCollection stores the configuration for this org's implicit + # collection. + PrivateDataImplicitCollection: + RequiredPeerCount: 0 + MaxPeerCount: 1 + BlockToLive: 0 + MemberOnlyRead: true + MemberOnlyWrite: true - &auditor # DefaultOrg defines the organization which is used in the sampleconfig @@ -182,6 +208,15 @@ Organizations: - Host: irs-auditor Port: 7051 + # PrivateDataImplicitCollection stores the configuration for this org's implicit + # collection. + PrivateDataImplicitCollection: + RequiredPeerCount: 0 + MaxPeerCount: 1 + BlockToLive: 0 + MemberOnlyRead: true + MemberOnlyWrite: true + - &rrprovider # DefaultOrg defines the organization which is used in the sampleconfig # of the fabric.git development environment @@ -217,6 +252,14 @@ Organizations: - Host: irs-rrprovider Port: 7051 + # PrivateDataImplicitCollection stores the configuration for this org's implicit + # collection. + PrivateDataImplicitCollection: + RequiredPeerCount: 0 + MaxPeerCount: 1 + BlockToLive: 0 + MemberOnlyRead: true + MemberOnlyWrite: true ################################################################################ # diff --git a/test-network/addOrg3/configtx.yaml b/test-network/addOrg3/configtx.yaml index ea2e815d..d4119b2c 100644 --- a/test-network/addOrg3/configtx.yaml +++ b/test-network/addOrg3/configtx.yaml @@ -40,3 +40,12 @@ Organizations: # encoded in the genesis block in the Application section context - Host: peer0.org3.example.com Port: 11051 + + # PrivateDataImplicitCollection stores the configuration for this org's implicit + # collection. + PrivateDataImplicitCollection: + RequiredPeerCount: 0 + MaxPeerCount: 1 + BlockToLive: 0 + MemberOnlyRead: true + MemberOnlyWrite: true diff --git a/test-network/configtx/configtx.yaml b/test-network/configtx/configtx.yaml index 9580184a..1c5eab60 100644 --- a/test-network/configtx/configtx.yaml +++ b/test-network/configtx/configtx.yaml @@ -76,6 +76,15 @@ Organizations: - Host: peer0.org1.example.com Port: 7051 + # PrivateDataImplicitCollection stores the configuration for this org's implicit + # collection. + PrivateDataImplicitCollection: + RequiredPeerCount: 0 + MaxPeerCount: 1 + BlockToLive: 0 + MemberOnlyRead: true + MemberOnlyWrite: true + - &Org2 # DefaultOrg defines the organization which is used in the sampleconfig # of the fabric.git development environment @@ -110,6 +119,15 @@ Organizations: - Host: peer0.org2.example.com Port: 9051 + # PrivateDataImplicitCollection stores the configuration for this org's implicit + # collection. + PrivateDataImplicitCollection: + RequiredPeerCount: 0 + MaxPeerCount: 1 + BlockToLive: 0 + MemberOnlyRead: true + MemberOnlyWrite: true + ################################################################################ # # SECTION: Capabilities