Skip to content

Commit 52687f7

Browse files
Merge pull request #39 from npci/release/v1.2.0
Release/v1.2.0
2 parents 000eb6e + ad15f85 commit 52687f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+393
-373
lines changed

README.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Whether you're a blockchain enthusiast, developer, or enterprise seeking to harn
1313

1414
### Features
1515
- [x] CA Management (Root CA, TLS CA & Intermediate CAs)
16-
- [x] Peer Creation
17-
- [x] Orderer Creation
16+
- [x] Peer Creation, Cert renewal
17+
- [x] Orderer Creation, Addition, Cert renewal
1818
- [x] Channel Management
1919
- [x] Chaincode Lifecycle Management (Install, Approve, Commit and CC Upgrades)
2020
- [x] Cryptographic operations support and certification management
@@ -23,9 +23,10 @@ Whether you're a blockchain enthusiast, developer, or enterprise seeking to harn
2323
- [x] File Registry support for centralised config files
2424
- [x] Support for Hyperledger Fabric 2.3+
2525
- [x] Multi-zone, Multi-DC, Private Network (On-prem DCs) deployment support
26+
- [x] Multi-channel support
2627

2728
### Roadmap
28-
- [ ] Multi-channel support
29+
2930
- [ ] Automatic certificate renewal
3031
- [ ] GUI based deployment support
3132
- [ ] Optional Fabric Explorer
@@ -34,7 +35,8 @@ Whether you're a blockchain enthusiast, developer, or enterprise seeking to harn
3435
- [ ] Key Management using HSM / Vault
3536

3637
### Releases
37-
- [v1.1.0](https://github.com/npci/falcon/releases/latest)
38+
- [v1.2.0](https://github.com/npci/falcon/releases/latest)
39+
- [v1.1.0](https://github.com/npci/falcon/releases/tag/v1.1.0)
3840
- [v1.0.2](https://github.com/npci/falcon/releases/tag/v1.0.2)
3941
- [v1.0.1](https://github.com/npci/falcon/releases/tag/v1.0.1)
4042
- [v1.0.0](https://github.com/npci/falcon/releases/tag/v1.0.0)

examples/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ helm install org1-ca-ops -n org1 helm-charts/fabric-ops/ -f examples/fabric-ops/
165165
```
166166
3. **Add Org1 to the network**
167167

168-
Once the `Org1` ICA started successfully, you would need to add this `Org1` to the network. For that, you need to run the following Job in `initialpeerorg`. Comment out the `org2` section from the `Values.organizatons` array in the values file [examples/fabric-ops/initialpeerorg/configure-org-channel.yaml](./fabric-ops/initialpeerorg/configure-org-channel.yaml) for now since we have not deployed the `Org2` yet.
168+
Once the `Org1` ICA started successfully, you would need to add this `Org1` to the network. For that, you need to run the following Job in `initialpeerorg`. Comment out the `org2` section from the `Values.organizations` array in the values file [examples/fabric-ops/initialpeerorg/configure-org-channel.yaml](./fabric-ops/initialpeerorg/configure-org-channel.yaml) for now since we have not deployed the `Org2` yet.
169169
```
170170
helm install configorgchannel -n initialpeerorg helm-charts/fabric-ops/ -f examples/fabric-ops/initialpeerorg/configure-org-channel.yaml
171171
```
@@ -196,7 +196,7 @@ helm install org2-ca-ops -n org2 helm-charts/fabric-ops/ -f examples/fabric-ops/
196196
```
197197
3. **Add Org2 to network**
198198

199-
Once the `Org2` ICA started successfully, you would need to add this `Org2` to the network. For that, you need to upgrade the following `configorgchannel` Job in `initialpeerorg`. This time, uncomment the `org2` section in the `Values.organizatons` array in the values file [examples/fabric-ops/initialpeerorg/configure-org-channel.yaml](./fabric-ops/initialpeerorg/configure-org-channel.yaml).
199+
Once the `Org2` ICA started successfully, you would need to add this `Org2` to the network. For that, you need to upgrade the following `configorgchannel` Job in `initialpeerorg`. This time, uncomment the `org2` section in the `Values.organizations` array in the values file [examples/fabric-ops/initialpeerorg/configure-org-channel.yaml](./fabric-ops/initialpeerorg/configure-org-channel.yaml).
200200
```
201201
helm upgrade configorgchannel -n initialpeerorg helm-charts/fabric-ops/ -f examples/fabric-ops/initialpeerorg/configure-org-channel.yaml
202202
```

examples/fabric-ops/initialpeerorg/approve-chaincode.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ filestore_ssl: false # Make it `true` if `filestore_endpoint` is over https.
3232
require_collection_config: "true"
3333
collection_config_file: "collection-config.json"
3434
collection_config_file_hash: "627dd1b8d679dc52475c148e502c576b109796df8495282ba602cc51ec173286"
35-
core_peer_address: peer0-initialpeerorg:30002
35+
core_peer_address: peer0-initialpeerorg:7051
3636

3737
cc_name: basic-chaincode
3838
cc_version: "1.0"

examples/fabric-ops/initialpeerorg/channel-create.yaml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,25 +19,35 @@ tlsca_endpoint: tls-ca.my-hlf-domain.com:30000
1919
orderer_endpoint: orderer0-orderer.my-hlf-domain.com:30000
2020
filestore_endpoint: http://filestore.my-hlf-domain.com:30001
2121
filestore_ssl: false # Make it `true` if `filestore_endpoint` is over https.
22-
config_transaction_filename: channel.tx
23-
channel_block_filename: mychannel.block
24-
2522

2623
hlf_domain: my-hlf-domain.com
27-
hlf_channel: mychannel
2824
fabric_actions:
2925
create_channel: true
30-
26+
27+
app_channels:
28+
- mychannel
29+
30+
admin_organizations:
31+
- org_type: consortium
32+
org_name: initialpeerorg
33+
ica_endpoint: ica-initialpeerorg.my-hlf-domain.com:30000
34+
cert_path: /root/initialpeerorg.pem
35+
admin_identity: admin
36+
admin_secret: initialpeerorgAdminSamplePassword
37+
require_msp_enrollment: true
38+
require_tls_enrollment: false
39+
anchor_peers:
40+
- host: peer0-initialpeerorg.my-hlf-domain.com
41+
port: "30000"
42+
3143
csr_names_cn: IN
3244
csr_names_st: Maharashtra
3345
csr_names_l: Mumbai
3446
csr_names_o: Your Company Name
3547

36-
admin_identity:
37-
- identity_name: admin
38-
identity_secret: initialpeerorgAdminSamplePassword
39-
require_msp_enrollment: true
40-
require_tls_enrollment: false
48+
configTxProfileType: ConsortiumProfile
49+
consortiumName: InitialConsortium
50+
core_peer_mspconfigpath_override: "" # Required only if admin_identity name is not "admin". You will have to add the complete path to the msp directory in this case.
4151

4252
serviceAccount:
4353
# Specifies whether a service account should be created

examples/fabric-ops/initialpeerorg/commit-chaincode.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ filestore_endpoint: http://filestore.my-hlf-domain.com:30001
3232
filestore_ssl: false # Make it `true` if `filestore_endpoint` is over https.
3333
collection_config_file: collection-config.json
3434
collection_config_file_hash: "627dd1b8d679dc52475c148e502c576b109796df8495282ba602cc51ec173286"
35-
core_peer_address: peer0-initialpeerorg:30002
35+
core_peer_address: peer0-initialpeerorg:7051
3636

3737
cc_name: basic-chaincode
3838
cc_version: "1.0"

examples/fabric-ops/initialpeerorg/configure-org-channel.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,17 @@ admin_identity:
3636
# core_peer_mspconfigpath_override: /opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/users/admin-initialpeerorg/msp
3737

3838
# Organizations to be added
39-
organizatons:
39+
organizations:
4040
- name: org1
4141
ica_endpoint: ica-org1.my-hlf-domain.com:30000
42-
identity_name: admin
43-
identity_secret: org1AdminSamplePassword
4442
anchor_peer: peer0-org1.my-hlf-domain.com
4543
anchor_peer_port: 30000
44+
status: active # Set to `disabled` to remove an org from the network.
4645
- name: org2
4746
ica_endpoint: ica-org2.my-hlf-domain.com:30000
48-
identity_name: admin
49-
identity_secret: org2AdminSamplePassword
5047
anchor_peer: peer0-org2.my-hlf-domain.com
5148
anchor_peer_port: 30000
49+
status: active
5250

5351
csr_names_cn: IN
5452
csr_names_st: Maharashtra

examples/fabric-ops/orderer/orderer-addition.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ csr_names_st: Maharashtra
2121
csr_names_l: Mumbai
2222
csr_names_o: Your Company Name
2323

24-
#MspIdOverride: ordererorg
24+
#MspIdOverride: MyOrdererOrg, by default it is `orderer`
2525
orderer_endpoint: orderer0-orderer.my-hlf-domain.com:30000
2626
filestore_endpoint: http://filestore.my-hlf-domain.com:30001
2727
filestore_ssl: false # Make it `true` if `filestore_endpoint` is over https.

examples/fabric-ops/orderer/orderer-cryptogen.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ imagePullSecrets: []
1818

1919
## These organizations are the list of initial organizations required to generate the genesis.block file.
2020

21-
organizations:
21+
admin_organizations:
2222
- org_type: orderer
2323
org_name: orderer
2424
ica_endpoint: ica-orderer.my-hlf-domain.com:30000
@@ -35,7 +35,7 @@ organizations:
3535
- identity_name: orderer2-orderer
3636
identity_secret: orderer2ordererSamplePassword
3737
port: "30000"
38-
- org_type: peerorg
38+
- org_type: consortium
3939
org_name: initialpeerorg
4040
ica_endpoint: ica-initialpeerorg.my-hlf-domain.com:30000
4141
cert_path: /root/peerorg.pem
@@ -45,16 +45,13 @@ organizations:
4545
- host: peer0-initialpeerorg.my-hlf-domain.com
4646
port: "30000"
4747

48-
channel_artifact_dir: /scripts/channel-artifacts
49-
base_dir: /scripts/crypto-config
5048
hlf_domain: my-hlf-domain.com
5149
orderer_system_channel: "orderer-sys-channel"
52-
hlf_channel: "mychannel"
5350
block_file: genesis.block
54-
config_transaction_filename: channel.tx
51+
configTxProfileType: OrdererEtcdRaftProfile
52+
consortiumName: InitialConsortium
5553

5654
tlsca_endpoint: tls-ca.my-hlf-domain.com:30000
57-
5855
filestore_endpoint: http://filestore.my-hlf-domain.com:30001
5956
filestore_ssl: false # Make it `true` if `filestore_endpoint` is over https.
6057

examples/fabric-ops/org1/approve-chaincode.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ filestore_ssl: false # Make it `true` if `filestore_endpoint` is over https.
3232
require_collection_config: "true"
3333
collection_config_file: "collection-config.json"
3434
collection_config_file_hash: "627dd1b8d679dc52475c148e502c576b109796df8495282ba602cc51ec173286"
35-
core_peer_address: peer0-org1:30002
35+
core_peer_address: peer0-org1:7051
3636

3737
cc_name: basic-chaincode
3838
cc_version: "1.0"

examples/fabric-ops/org2/approve-chaincode.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ filestore_ssl: false # Make it `true` if `filestore_endpoint` is over https.
3232
require_collection_config: "true"
3333
collection_config_file: "collection-config.json"
3434
collection_config_file_hash: "627dd1b8d679dc52475c148e502c576b109796df8495282ba602cc51ec173286"
35-
core_peer_address: peer0-org2:30002
35+
core_peer_address: peer0-org2:7051
3636

3737
cc_name: basic-chaincode
3838
cc_version: "1.0"

0 commit comments

Comments
 (0)