-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
basic-network: - moved "crypto-config" to top-level and removed "network" folder - added generate.sh to re-gen crypto materials - docker-compose.yaml to ref v1.0.0 images - add CLI to docker-compose - start.sh to only start CA, orderer, peer and couch - startFabric.sh to run start.sh, then launch CLI for create channel, install, instantiate, invoke fabcar: - moved chaincode to central chaincode folder - moved "creds" to top-level and removed "network" folder - changed to use the basic-network as the target and removed docker-compose.yaml and crypto-config - updated package.json to require v1.0.0 modules - added missing license headers - restructured to use a central chaincode subdirectory Change-Id: Ic784d1cf55ea51da5155624f3c38275883de1dca Signed-off-by: Christopher Ferris <[email protected]> Signed-off-by: Nick Gaski <[email protected]> Signed-off-by: Jim Zhang <[email protected]>
- Loading branch information
1 parent
8f01c7f
commit ca8fad3
Showing
171 changed files
with
379 additions
and
1,020 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
## Basic Network Config | ||
|
||
Note that this basic configuration uses pre-generated certificates and | ||
key material, and also has predefined transactions to initialize a | ||
channel named "mychannel". | ||
|
||
To regenerate this material, simply run ``generate.sh``. | ||
|
||
To start the network, run ``start.sh``. | ||
To stop it, run ``stop.sh`` | ||
To completely remove all incriminating evidence of the network | ||
on your system, run ``teardown.sh``. | ||
|
||
<a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a> |
File renamed without changes.
5 changes: 0 additions & 5 deletions
5
...etwork/config/creds/9022d671ceedbb24af3ea69b5a8136cc64203df6b9920e26f48123fcfcb1d2e9-priv
This file was deleted.
Oops, something went wrong.
4 changes: 0 additions & 4 deletions
4
...network/config/creds/9022d671ceedbb24af3ea69b5a8136cc64203df6b9920e26f48123fcfcb1d2e9-pub
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
File renamed without changes.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,130 @@ | ||
# Copyright IBM Corp. All Rights Reserved. | ||
# | ||
# SPDX-License-Identifier: Apache-2.0 | ||
# | ||
|
||
--- | ||
################################################################################ | ||
# | ||
# Profile | ||
# | ||
# - Different configuration profiles may be encoded here to be specified | ||
# as parameters to the configtxgen tool | ||
# | ||
################################################################################ | ||
Profiles: | ||
|
||
OneOrgOrdererGenesis: | ||
Orderer: | ||
<<: *OrdererDefaults | ||
Organizations: | ||
- *OrdererOrg | ||
Consortiums: | ||
SampleConsortium: | ||
Organizations: | ||
- *Org1 | ||
OneOrgChannel: | ||
Consortium: SampleConsortium | ||
Application: | ||
<<: *ApplicationDefaults | ||
Organizations: | ||
- *Org1 | ||
|
||
################################################################################ | ||
# | ||
# Section: Organizations | ||
# | ||
# - This section defines the different organizational identities which will | ||
# be referenced later in the configuration. | ||
# | ||
################################################################################ | ||
Organizations: | ||
|
||
# SampleOrg defines an MSP using the sampleconfig. It should never be used | ||
# in production but may be used as a template for other definitions | ||
- &OrdererOrg | ||
# DefaultOrg defines the organization which is used in the sampleconfig | ||
# of the fabric.git development environment | ||
Name: OrdererOrg | ||
|
||
# ID to load the MSP definition as | ||
ID: OrdererMSP | ||
|
||
# MSPDir is the filesystem path which contains the MSP configuration | ||
MSPDir: crypto-config/ordererOrganizations/example.com/msp | ||
|
||
- &Org1 | ||
# DefaultOrg defines the organization which is used in the sampleconfig | ||
# of the fabric.git development environment | ||
Name: Org1MSP | ||
|
||
# ID to load the MSP definition as | ||
ID: Org1MSP | ||
|
||
MSPDir: crypto-config/peerOrganizations/org1.example.com/msp | ||
|
||
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: Orderer | ||
# | ||
# - This section defines the values to encode into a config transaction or | ||
# genesis block for orderer related parameters | ||
# | ||
################################################################################ | ||
Orderer: &OrdererDefaults | ||
|
||
# Orderer Type: The orderer implementation to start | ||
# Available types are "solo" and "kafka" | ||
OrdererType: solo | ||
|
||
Addresses: | ||
- orderer.example.com:7050 | ||
|
||
# Batch Timeout: The amount of time to wait before creating a batch | ||
BatchTimeout: 2s | ||
|
||
# Batch Size: Controls the number of messages batched into a block | ||
BatchSize: | ||
|
||
# Max Message Count: The maximum number of messages to permit in a batch | ||
MaxMessageCount: 10 | ||
|
||
# Absolute Max Bytes: The absolute maximum number of bytes allowed for | ||
# the serialized messages in a batch. | ||
AbsoluteMaxBytes: 99 MB | ||
|
||
# Preferred Max Bytes: The preferred maximum number of bytes allowed for | ||
# the serialized messages in a batch. A message larger than the preferred | ||
# max bytes will result in a batch larger than preferred max bytes. | ||
PreferredMaxBytes: 512 KB | ||
|
||
Kafka: | ||
# Brokers: A list of Kafka brokers to which the orderer connects | ||
# NOTE: Use IP:port notation | ||
Brokers: | ||
- 127.0.0.1:9092 | ||
|
||
# Organizations is the list of orgs which are defined as participants on | ||
# the orderer side of the network | ||
Organizations: | ||
|
||
################################################################################ | ||
# | ||
# SECTION: Application | ||
# | ||
# - This section defines the values to encode into a config transaction or | ||
# genesis block for application related parameters | ||
# | ||
################################################################################ | ||
Application: &ApplicationDefaults | ||
|
||
# Organizations is the list of orgs which are defined as participants on | ||
# the application side of the network | ||
Organizations: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
# Copyright IBM Corp. All Rights Reserved. | ||
# | ||
# SPDX-License-Identifier: Apache-2.0 | ||
# | ||
|
||
# --------------------------------------------------------------------------- | ||
# "OrdererOrgs" - Definition of organizations managing orderer nodes | ||
# --------------------------------------------------------------------------- | ||
OrdererOrgs: | ||
# --------------------------------------------------------------------------- | ||
# Orderer | ||
# --------------------------------------------------------------------------- | ||
- Name: Orderer | ||
Domain: example.com | ||
# --------------------------------------------------------------------------- | ||
# "Specs" - See PeerOrgs below for complete description | ||
# --------------------------------------------------------------------------- | ||
Specs: | ||
- Hostname: orderer | ||
# --------------------------------------------------------------------------- | ||
# "PeerOrgs" - Definition of organizations managing peer nodes | ||
# --------------------------------------------------------------------------- | ||
PeerOrgs: | ||
# --------------------------------------------------------------------------- | ||
# Org1 | ||
# --------------------------------------------------------------------------- | ||
- Name: Org1 | ||
Domain: org1.example.com | ||
# --------------------------------------------------------------------------- | ||
# "Specs" | ||
# --------------------------------------------------------------------------- | ||
# Uncomment this section to enable the explicit definition of hosts in your | ||
# configuration. Most users will want to use Template, below | ||
# | ||
# Specs is an array of Spec entries. Each Spec entry consists of two fields: | ||
# - Hostname: (Required) The desired hostname, sans the domain. | ||
# - CommonName: (Optional) Specifies the template or explicit override for | ||
# the CN. By default, this is the template: | ||
# | ||
# "{{.Hostname}}.{{.Domain}}" | ||
# | ||
# which obtains its values from the Spec.Hostname and | ||
# Org.Domain, respectively. | ||
# --------------------------------------------------------------------------- | ||
# Specs: | ||
# - Hostname: foo # implicitly "foo.org1.example.com" | ||
# CommonName: foo27.org5.example.com # overrides Hostname-based FQDN set above | ||
# - Hostname: bar | ||
# - Hostname: baz | ||
# --------------------------------------------------------------------------- | ||
# "Template" | ||
# --------------------------------------------------------------------------- | ||
# Allows for the definition of 1 or more hosts that are created sequentially | ||
# from a template. By default, this looks like "peer%d" from 0 to Count-1. | ||
# You may override the number of nodes (Count), the starting index (Start) | ||
# or the template used to construct the name (Hostname). | ||
# | ||
# Note: Template and Specs are not mutually exclusive. You may define both | ||
# sections and the aggregate nodes will be created for you. Take care with | ||
# name collisions | ||
# --------------------------------------------------------------------------- | ||
Template: | ||
Count: 1 | ||
# Start: 5 | ||
# Hostname: {{.Prefix}}{{.Index}} # default | ||
# --------------------------------------------------------------------------- | ||
# "Users" | ||
# --------------------------------------------------------------------------- | ||
# Count: The number of user accounts _in addition_ to Admin | ||
# --------------------------------------------------------------------------- | ||
Users: | ||
Count: 1 |
File renamed without changes.
File renamed without changes.
5 changes: 0 additions & 5 deletions
5
...ations/example.com/ca/eaade59087c6d97fcf350e94f37ad9f2c692bb66f182148ce58940de70ade9ce_sk
This file was deleted.
Oops, something went wrong.
14 changes: 0 additions & 14 deletions
14
basic-network/crypto-config/ordererOrganizations/example.com/ca/example.com-cert.pem
This file was deleted.
Oops, something went wrong.
21 changes: 10 additions & 11 deletions
21
.../crypto-config/ordererOrganizations/example.com/msp/admincerts/[email protected]
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,13 @@ | ||
-----BEGIN CERTIFICATE----- | ||
MIICHDCCAcOgAwIBAgIRAOVchZuZsk52YC0d82t2qj0wCgYIKoZIzj0EAwIwZjEL | ||
MIICCjCCAbGgAwIBAgIRANPhTyHWZkTenKfX4eBv0ZUwCgYIKoZIzj0EAwIwaTEL | ||
MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG | ||
cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRQwEgYDVQQDEwtleGFtcGxl | ||
LmNvbTAeFw0xNzA0MjIxMjAyNTZaFw0yNzA0MjAxMjAyNTZaMFYxCzAJBgNVBAYT | ||
AlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNpc2Nv | ||
MRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqGSM49 | ||
AwEHA0IABKR5qsiBaQSx0sy1K/7EFpBJDeVPC6cLbfqIjjtosuMfNNjDrVR9X8s+ | ||
dPLeWbUP5qJmWnE1kZ/J0WyTnqRbKA2jYjBgMA4GA1UdDwEB/wQEAwIFoDATBgNV | ||
HSUEDDAKBggrBgEFBQcDATAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIOqt5ZCH | ||
xtl/zzUOlPN62fLGkrtm8YIUjOWJQN5wrenOMAoGCCqGSM49BAMCA0cAMEQCIEkj | ||
Aoe3iCG+7t2BYDRmZgF/6jUZVDjHrNaRsabLzvXTAiA6PM/0GLppYtIcGQDA7qeJ | ||
VfRO4IGE/M3rSnpBrQCodA== | ||
cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt | ||
cGxlLmNvbTAeFw0xNzA2MjMxMjMzMTlaFw0yNzA2MjExMjMzMTlaMFYxCzAJBgNV | ||
BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp | ||
c2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqG | ||
SM49AwEHA0IABKAyu7N4S2ZPQSzsAVF/mwwCewuu++MtfcMmUdeoIPFRBj1JMCnf | ||
f88M0wj13gQSJQ6GfnUrT76G/L5fGxCUifWjTTBLMA4GA1UdDwEB/wQEAwIHgDAM | ||
BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIA1GzPDpQ2wbw7biv4DNsgLElDYE+Vxy | ||
7g/4OdPsMAcZMAoGCCqGSM49BAMCA0cAMEQCIEdiGFLzeGMvVNubuZ3iuvRp/Pp6 | ||
im3FmABwIbnMarabAiBIHWzz8Yxh9K5ZNkVNZX3fLZ4LlzsKBinbWH9J2wblDg== | ||
-----END CERTIFICATE----- |
File renamed without changes.
14 changes: 0 additions & 14 deletions
14
...c-network/crypto-config/ordererOrganizations/example.com/msp/cacerts/example.com-cert.pem
This file was deleted.
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
10
...twork/crypto-config/ordererOrganizations/example.com/msp/cacerts/example.com-tls-cert.pem
This file was deleted.
Oops, something went wrong.
15 changes: 0 additions & 15 deletions
15
...work/crypto-config/ordererOrganizations/example.com/msp/cacerts/org1.example.com-cert.pem
This file was deleted.
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
10
.../crypto-config/ordererOrganizations/example.com/msp/cacerts/org1.example.com-tls-cert.pem
This file was deleted.
Oops, something went wrong.
15 changes: 0 additions & 15 deletions
15
...work/crypto-config/ordererOrganizations/example.com/msp/cacerts/org2.example.com-cert.pem
This file was deleted.
Oops, something went wrong.
10 changes: 0 additions & 10 deletions
10
.../crypto-config/ordererOrganizations/example.com/msp/cacerts/org2.example.com-tls-cert.pem
This file was deleted.
Oops, something went wrong.
14 changes: 0 additions & 14 deletions
14
...network/crypto-config/ordererOrganizations/example.com/msp/signcerts/example.com-cert.pem
This file was deleted.
Oops, something went wrong.
File renamed without changes.
14 changes: 0 additions & 14 deletions
14
...anizations/example.com/orderers/orderer.example.com/admincerts/[email protected]
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.