Skip to content

Commit fac2d2e

Browse files
committed
doc edits - preview & starter kit
clean up video format change Fabric to fabric starter kit typos and edits [ci skip] Change-Id: I029a79ab4bc27179f251bc88d33d08ae358b384d Signed-off-by: Nick Gaski <[email protected]>
1 parent 5b0a7f0 commit fac2d2e

File tree

2 files changed

+32
-30
lines changed

2 files changed

+32
-30
lines changed

docs/abstract_v1.md

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# HYPERLEDGER FABRIC v1.0
22

3-
Hyperledger Fabric is a platform that enables the delivery of a secure, robust, permissioned blockchain for the enterprise that incorporates a byzantine fault tolerant consensus. We have learned much as we progressed through the v0.6-preview release. In particular, that in order to provide for the scalability and confidentiality needs of many use cases, a refactoring of the architecture was needed. The v0.6-preview release will be the final (barring any bug fixes) release based upon the original architecture.
3+
Hyperledger fabric is a platform that enables the delivery of a secure, robust, permissioned blockchain for the enterprise that incorporates a byzantine fault tolerant consensus. We have learned much as we progressed through the v0.6-preview release. In particular, that in order to provide for the scalability and confidentiality needs of many use cases, a refactoring of the architecture was needed. The v0.6-preview release will be the final (barring any bug fixes) release based upon the original architecture.
44

55
Hyperledger fabric's v1.0 architecture has been designed to address two vital enterprise-grade requirements – **security** and **scalability**. Businesses and organizations can leverage this new architecture to execute confidential transactions on networks with shared or common assets – e.g. supply chain, FOREX market, healthcare, etc. The progression to v1.0 will be incremental, with myriad windows for community members to contribute code and start curating the fabric to fit specific business needs.
66

@@ -14,16 +14,19 @@ The new architecture introduces a clear functional separation of peer roles, and
1414

1515
The consensus process (i.e. algorithmic computation) is entirely abstracted from the peer. This modularity not only provides a powerful security layer – the consenting nodes are agnostic to the transaction logic – but it also generates a framework where consensus can become pluggable and scalability can truly occur. There is no longer a parallel relationship between the number of peers in a network and the number of consenters. Now networks can grow dynamically (i.e. add endorsers and committers) without having to add corresponding consenters, and exist in a modular infrastructure designed to support high transaction throughput. Moreover, networks now have the capability to completely liberate themselves from the computational and legal burden of consensus by tapping into a pre-existing consensus cloud.
1616

17-
As v1.0 manifests, we will see the foundation for interoperable blockchain networks that have the ability to scale and transact in a manner adherent with regulatory and industry standards. Watch how Fabric v1.0 and the Hyperledger Project are building a true blockchain for business - [![HYPERLEDGERv1.0_ANIMATION](http://img.youtube.com/vi/EKa5Gh9whgU/0.jpg)](http://www.youtube.com/watch?v=EKa5Gh9whgU)
17+
As v1.0 manifests, we will see the foundation for interoperable blockchain networks that have the ability to scale and transact in a manner adherent with regulatory and industry standards. Watch how fabric v1.0 and the Hyperledger Project are building a true blockchain for business -
18+
19+
[![HYPERLEDGERv1.0_ANIMATION](http://img.youtube.com/vi/EKa5Gh9whgU/0.jpg)](http://www.youtube.com/watch?v=EKa5Gh9whgU)
1820

1921
## HOW TO CONTRIBUTE
2022

2123
Use the following links to explore upcoming additions to fabric's codebase that will spawn the capabilities in v1.0:
22-
1. Familiarize yourself with the [guidelines for code contributions](CONTRIBUTING.md) to this project. **Note**: In order to participate in the development of the Hyperledger Fabric project, you will need an [LF account](Gerrit/lf-account.md). This will give you single
24+
25+
* Familiarize yourself with the [guidelines for code contributions](CONTRIBUTING.md) to this project. **Note**: In order to participate in the development of the Hyperledger fabric project, you will need an [LF account](Gerrit/lf-account.md). This will give you single
2326
sign-on to JIRA and Gerrit.
24-
1. Explore the design document for the new [architecture](https://github.com/hyperledger-archives/fabric/wiki/Next-Consensus-Architecture-Proposal)
25-
1. Explore [JIRA](https://jira.hyperledger.org/projects/FAB/issues/) for open Hyperledger Fabric issues.
26-
1. Explore the [JIRA](https://jira.hyperledger.org/projects/FAB/issues/) backlog for upcoming Hyperledger Fabric issues.
27-
1. Explore [JIRA](https://jira.hyperledger.org/issues/?filter=10147) for Hyperledger Fabric issues tagged with "help wanted."
28-
1. Explore the [source code](https://github.com/hyperledger/fabric)
29-
1. Explore the [documentation](http://hyperledger-fabric.readthedocs.io/en/latest/)
27+
* Explore the design document for the new [architecture](https://github.com/hyperledger-archives/fabric/wiki/Next-Consensus-Architecture-Proposal)
28+
* Explore [JIRA](https://jira.hyperledger.org/projects/FAB/issues/) for open Hyperledger fabric issues.
29+
* Explore the [JIRA](https://jira.hyperledger.org/projects/FAB/issues/) backlog for upcoming Hyperledger fabric issues.
30+
* Explore [JIRA](https://jira.hyperledger.org/issues/?filter=10147) for Hyperledger fabric issues tagged with "help wanted."
31+
* Explore the [source code](https://github.com/hyperledger/fabric)
32+
* Explore the [documentation](http://hyperledger-fabric.readthedocs.io/en/latest/)

docs/starter/fabric-starter-kit.md

+20-21
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Fabric Starter Kit
22

3-
This section describes how to set up a self contained environment for
4-
application development with the Hyperledger Fabric. The setup
3+
This section describes how to set up a self-contained environment for
4+
application development with the Hyperledger fabric. The setup
55
uses **Docker** to provide a controlled environment with all the necessary
66
Hyperledger fabric components to support a Node.js application built with
77
the fabric's Node.js SDK, and chaincode written in Go.
88

99
There are three Docker images that, when run, will provide a basic
1010
network environment. There is an image to run a single `peer`, one to run
11-
the `membersrvc` and one to run both your Node.js application and the your
11+
the `membersrvc`, and one to run both your Node.js application and your
1212
chaincode. See [Application Developer's Overview](../nodeSDK/app-overview.md) on how the
1313
components running within the containers will communicate.
1414

@@ -18,7 +18,7 @@ In this mode, the chaincode is built and started prior to the application
1818
making a call to deploy it.
1919

2020
**Note:** The deployment of chaincode in network mode requires that the
21-
Hyperledger Fabric Node.js SDK has access to the chaincode source code and all
21+
Hyperledger fabric Node.js SDK has access to the chaincode source code and all
2222
of its dependencies, in order to properly build a deploy request. It also
2323
requires that the `peer` have access to the Docker daemon to be able to build
2424
and deploy the new Docker image that will run the chaincode. *This is a more
@@ -45,10 +45,9 @@ If you wish, there are a number of chaincode examples near by.
4545
```
4646
curl -o docker-compose.yml https://raw.githubusercontent.com/hyperledger/fabric/master/examples/sdk/node/docker-compose.yml
4747
```
48-
The docker compose environment uses three docker images. Two are published to
49-
DockerHub. However, the third, we provide you the source to build your own,
50-
so that you can customize to inject your application code for development,
51-
the following [Dockerfile](https://raw.githubusercontent.com/hyperledger/fabric/master/examples/sdk/node/Dockerfile)
48+
The docker-compose environment uses three Docker images. Two are published to
49+
DockerHub. However, with the third, we provide you the source to build your own,
50+
so that you can customize it to inject your application code for development. The following [Dockerfile](https://raw.githubusercontent.com/hyperledger/fabric/master/examples/sdk/node/Dockerfile)
5251
is used to build the base **fabric-starter-kit** image and may be used as
5352
a starting point for your own customizations.
5453

@@ -76,15 +75,15 @@ is located, execute one of following `docker-compose` commands.
7675
docker-compose up
7776
```
7877

79-
Both commands will start three docker containers, to view the container
80-
status try `docker ps` command. The first time this is run the Docker
78+
Both commands will start three Docker containers. To view the container
79+
status use the `docker ps` command. The first time this is run, the Docker
8180
images will be downloaded. This may take 10 minutes or more depending on the
8281
network connections of the system running the command.
8382

8483
```
8584
docker ps
8685
```
87-
You should see something like the following:
86+
You should see something similar to the following:
8887

8988
```
9089
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
@@ -98,34 +97,34 @@ Node.js application is located.
9897

9998
**note:** Be sure to wait 20 seconds after starting the network using the
10099
`docker-compose up` command before executing the following command to allow
101-
the network to initialize.
100+
the network to initialize:
102101

103102
```
104103
docker exec -it starter /bin/bash
105104
```
106105

107106
* From the terminal session in the **starter** container execute the standalone
108-
Node.js application. The docker terminal session should be in the working
107+
Node.js application. The Docker terminal session should be in the working
109108
directory of the sample application called **app.js** (*/opt/gopath/src/github.com/hyperledger/fabric/examples/sdk/node*). Execute
110-
the following Node.js command to run the application.
109+
the following Node.js command to run the application:
111110

112111
```
113112
node app
114113
```
115114
In another terminal session on the host you can view the logs for the peer
116115
by executing the following command (not in the docker shell above, in a new
117-
terminal session of the real system)
116+
terminal session of the real system):
118117

119118
```
120119
docker logs peer
121120
```
122121

123-
* If you wish to run your own Node.js application using the pre build docker
122+
* If you wish to run your own Node.js application using the pre-built Docker
124123
images:
125124
* use the directories in the `volumes` tag under **starter** in the
126125
`docker-compose.yml` file as a place to store your programs from the host
127126
system into the docker container. The first path is the top level system
128-
(host system) and the second is created in the docker container. If you wish
127+
(host system) and the second is created in the Docker container. If you wish
129128
to use a host location that is not under the `/Users` directory (`~` is
130129
under `/Users') then you must add that to the Docker file sharing
131130
under Docker preferences.
@@ -136,18 +135,18 @@ images:
136135
```
137136
* copy or create and edit your application in the `~/mytest` directory as
138137
stated in the `docker-compose.yml` `volumes` tag under **starter** container.
139-
* run npm to install Hyperledger Fabric Node.js SDK in the `mytest` directory
138+
* run npm to install Hyperledger fabric Node.js SDK in the `mytest` directory:
140139

141140
```
142141
npm install /opt/gopath/src/github.com/hyperledger/fabric/sdk/node
143142
```
144143
* run the application from within the **starter** Docker container using the
145-
commands
144+
following commands:
146145
147146
```
148147
docker exec -it starter /bin/bash
149148
```
150-
once in the shell, and assuming your Node.js application is called `app.js`
149+
once in the shell, and assuming your Node.js application is called `app.js`:
151150
152151
```
153152
cd /user/mytest
@@ -164,7 +163,7 @@ the containers from Docker:
164163
docker-compose down
165164
```
166165
or if you wish to keep your changes and just stop the containers, which will
167-
be restarted on the next `up` command
166+
be restarted on the next `up` command:
168167
169168
```
170169
docker-compose kill

0 commit comments

Comments
 (0)