Commit graph

1142 commits

Author SHA1 Message Date
Jim Zhang
bb842993d2 Merge "[FAB-5155]Fix README.md in "balance-transfer" example" 2017-08-09 19:17:43 +00:00
Yacov Manevich
9cd3f5425d Merge "[FAB-5303] Further balance-transfer code optimization" 2017-08-09 19:13:07 +00:00
rameshbabu
7f1c2f4225 FAB-5056 enable couchdb test in byfn e2e script
update byfn.sh script to enable couchdb tests. Follow the
below steps from first-network dir

./byfn.sh -m generate -c ibmblockchain
./byfn.sh -m up -c ibmblockchain -s couchdb
./byfn.sh -m down

Change-Id: If84e744b35a96fa1ed314dff0abf845ab363fcbb
Signed-off-by: rameshbabu <rameshbabu.thoomu@gmail.com>
2017-08-08 09:21:35 -04:00
Artem Barger
6e096791ef Merge "[FAB-5603] fixed missing f option on switch" 2017-08-07 10:26:01 +00:00
Artem Barger
2571c960a8
[FAB-56431]: Add dependency for couchdb into peer.
Currently peer and couchdb containers started simulateously, while
clearly peer depends on availability of the state db, therfore this
commit add dependency declaration into docker-compose.yaml file to make
sure to start couchdb before peer container.

Change-Id: Id2302a32fba9234d04ef3f4e6bd24ac92a766995
Signed-off-by: Artem Barger <bartem@il.ibm.com>
2017-08-06 12:56:30 +03:00
Gari Singh
cb3e7f69a3 Merge "[FAB-5130] Invalid syntax in docker compose files" 2017-08-05 11:34:58 +00:00
dsanchezseco
be773d2015 [FAB-5603] fixed missing f option on switch
fixed the unrecognized option on byfn.sh script when
providing the docker-compose file to start the network

Fix Issue # FAB-5603

Change-Id: I74234c53d8f82cbf2678f80aa3a898c3ec51c422
Signed-off-by: dsanchezseco <d.seco@protonmail.com>
2017-08-03 20:17:11 +02:00
dsanchezseco
592114010e [FAB-5576] -f flag to choose docker-compose on byfn.sh
Using the -f flag is possible to specify the docker-compose file to use on the
byfn.sh script to have a standar way to test the different configurations for
the samples project. The defautl is 'docker-compose-cli.yaml'

-h output updated as well.

Fix Issue # FAB-5576.

Change-Id: I8766ab930f05d9c4934b149872b9de3a299ff345
Signed-off-by: dsanchezseco <d.seco@protonmail.com>
2017-08-03 13:59:21 +02:00
Christopher Ferris
6b99925773 Merge "[FAB-5394] Introduce Delay as configurable variable" 2017-08-02 18:03:18 +00:00
Jim Zhang
79cb041124 [FAB-5303] Further balance-transfer code optimization
- Made it possible to deploy the app (both the client and fabric
  backend) to a location other than localhost
- Made it possible to work with a backend over grpc instead of always
  assuming grpcs
- Made the list of target peers for instantiate and invoke calls
  to be optional
- Enabled target networks to be controlled by an env variable

Change-Id: Ie394cf7e8f6ed47d970d4be992f2f6a0394fff7f
Signed-off-by: Jim Zhang <jzhang@us.ibm.com>
2017-07-26 18:00:05 +00:00
Chris Elder
92348cb4dd [FAB-5453] Enable CouchDB passwords in Fabric Samples
CouchDB usernames and passwords can be enabled by adding
additional environment variables to docker compose files.

The environment variables are added without values.
This will create peer and couchdb containers without
CouchDB passwords enabled.

Initializing the variables will create a CouchDB container
with and admin username and password.  The peer will also be
created with the CouchDB username in the ledger config.

Change-Id: I56c93111b0a4bd29c714df5a50af82517641bb3b
Signed-off-by: Chris Elder <chris.elder@us.ibm.com>
2017-07-25 10:57:08 -04:00
Nao Nishijima
2f4e9b851c [FAB-5130] Invalid syntax in docker compose files
This patch set deletes unused docker-compose environment variables.
Now CouchDB section in docker-compose file uses DB_URL env variables.
But the variables are not used in CouchDB container.

Change-Id: I8e84255e1ea00498b787bdd4042cdb909a96667c
Signed-off-by: Nao Nishijima <nao.nishijima@hal.hitachi.com>
2017-07-24 14:57:48 -07:00
Krishna Harsha Voora
7778837ebb [FAB-5394] Introduce Delay as configurable variable
Introduce delay as configurable variable for byfn.sh

Change-Id: I8ab05f44c68b36bd95f175c9b5f5091d11fa7083
Signed-off-by: Krishna Harsha Voora <krishvoor@in.ibm.com>
2017-07-24 09:47:26 +00:00
Christopher Ferris
134549af22 FAB-5412 add fabric-preload.sh script
Add a script to allow users to preload the Fabric docker
images without having to run the curl command in the RTD.

Change-Id: I3b6c682c3e2ab1f230f7af8c3ce0b95bbb8fd024
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2017-07-22 16:58:14 -04:00
Gari Singh
a7e83fc235 FAB-5392 Fix path issue for Git Bash users
Git Bash is a prereq for Windows users
required to run the various sample
scripts.  Git Bash by default will
convert paths and this causes the
issue identified by FAB-5392.

Luckily Git Bash provides supports an
environment variable to override this
behavior.

Change-Id: I66e52eb2953c0dcc9f04903a1fd1fd94d19b75ce
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2017-07-20 08:24:26 -04:00
Yuki Kondo
6cce07c440 [FAB-5155]Fix README.md in "balance-transfer" example
The README in "balance-transfer" should be fixed in the section:
https://github.com/hyperledger/fabric-samples/tree/master/
balance-transfer#running-the-sample-program

1. Broken link
There is a link to "Sample REST APIs Requests" which is broken.
This is linked to non-existent path on fabric-sdk-node repository.
I believe the intended link is to
https://github.com/hyperledger/fabric-samples/tree/master/
balance-transfer#sample-rest-apis-requests

2. Instruction to start node application.
There is no instruction to start node application.
If we execute the REST APIs according to the current README,
we can't get any responses since node application is not working.
We need to execute the following steps before calling REST APIs.

 - npm install
 - PORT=4000 node app

fix repo names

Change-Id: I9ec0ec18bb36addd6c8371481dc8cfe645053ec6
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2017-07-19 12:00:51 -04:00
Christopher Ferris
1153988540 Merge "[FAB-5311] Fix spelling error" 2017-07-19 14:14:51 +00:00
Christopher Ferris
d9e2d5cc8c Merge "[FAB-5287] NodeSDK - fix sample" 2017-07-17 20:05:34 +00:00
Christopher Ferris
0611471e4b Merge "[FAB-5197]Check all prop-responses in balance-transfer" 2017-07-17 20:03:26 +00:00
GeorgeLindsell
6422fc36ce [FAB-5311] Fix spelling error
Fix spelling error in instantiate-chaincode.js

Fix Issue # 5311.

Change-Id: Ib8654e2d12a6e3d138406d0bb8738e37ebee90d1
Signed-off-by: GeorgeLindsell <lindsellgeorge@gmail.com>
2017-07-14 15:44:41 +01:00
Bret Harrison
e0db341af9 [FAB-5287] NodeSDK - fix sample
Sample should use 'fcn' not 'functionName'
in the sample curl calls and sample app.

Change-Id: I4be92a0394fdf579195e9566d049aac0862d5888
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2017-07-13 17:04:32 -04:00
Jim Zhang
ca8fad3151 [FAB-5260] Update samples to v1.0.0
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 <chrisfer@us.ibm.com>
Signed-off-by: Nick Gaski <ngaski@us.ibm.com>
Signed-off-by: Jim Zhang <jzhang@us.ibm.com>
2017-07-12 09:07:39 -04:00
Jim Zhang
8f01c7f0e2 [FAB-5260] Update balance-transfer sample to v1.0.0
Change-Id: Ie6738415d8cca650c609fe72bb6195b36751b3d6
Signed-off-by: Jim Zhang <jzhang@us.ibm.com>
2017-07-11 14:06:44 -04:00
Nao Nishijima
6899719cbb [FAB-5195] byfn.sh help text is incorrect
The descriptions for "down" and "restart" are the same as "up".
This patch set changes the descriptions.

Change-Id: I0ee03e5d81faa4ad6a3c43354e8a44648288df90
Signed-off-by: Nao Nishijima <nao.nishijima@hal.hitachi.com>
2017-07-06 11:21:21 -07:00
Yuki Kondo
70bff28f8a [FAB-5197]Check all prop-responses in balance-transfer
"balance-transfer" app doesn't check all of the proposal responses.

An app sends a transaction proposal to multiple peers and get
multiple responses. However, the only first response
"proposalResponses[0]" is checked repeatedly in the loop.

This patch fixes the code to check all of the array value of
proposalResponses correctly.

Change-Id: Id61e691eb4d1c3a6c4a7a390584dfd74f1fc6196
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
2017-07-06 08:08:52 -07:00
Gari Singh
f9c29542d7 [FAB-5038] Generate artifacts if they don't exist
If you run ./byfn -m up prior to running
./byfn -m generate, things will fail - which
would normally be OK except in the case where
you are running the Docker daemon as root -
which is the default on Linux systems.  The issue
is that the Docker daemon will automatically
generate host paths for volumes if they don't exist
and they will be owned by whoever is running the
Docker process resulting in the error reported
in FAB-5038.

To fix this, simply check for the existence of
the crypto-config folder and if it does not
exist run the equivalent commands as the
generate option

Change-Id: Ic5b48682a527951ac6eab5b5cf2d0fc6dbdaad56
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2017-06-30 12:53:56 -04:00
Adnan Choudhury
957a1ff17f [FAB-5062] Correct Gossip bootstrap setup in byfn
Corrects the Gossip bootsrap options for the 2 peers of org2 in the byfn
setup.  Peer1 should point to Peer0, and peer0 should not point to
itself.

Change-Id: I23074b7d5abe6ade4a57493808c3092c66086f62
Signed-off-by: Adnan Choudhury <adnan.choudhury@itpeoplecorp.com>
2017-06-28 16:13:18 -04:00
Jason Yellick
d58af569b7 [FAB-5031] Fix e2e template typo
There is a rogue network section which is indented at the top level of
the docker-compose-e2e-template.yaml file.  This has been reported by
users to cause errors when they attempt to tweak the byfn setup.

As best as I can tell, this network section is intended to be defined at
the top level and appears to have no adverse affect on the byfn.

Change-Id: I40b937d1f352af079754a84860bce025ec61594e
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
2017-06-27 09:40:29 -04:00
Bret Harrison
04c9eff110 [FAB-4996] NodeSDK - move sample to fabric-samples
Move the Balance Transfer sample application from
fabric-sdk-node to fabric-samples. This cr will
add the files to the fabric-samples. There will
another one to remove the files from fabric-sdk-node.

Change-Id: I2344ee00bcd47793ae07f203070af93bc2ee69d6
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2017-06-27 05:59:53 -04:00
Gari Singh
6610584c19 [FAB-4994] Fix formatting of js files
The tab/spaces were inconsistent for the
js files.

Change-Id: I38d57dfc3fe59fa601e304b61d122c05ab1f183e
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2017-06-24 17:57:12 -04:00
ratnakar
e265cac69c [FAB-4988] Update certs generated using rc1 binary
fabcar sample is broken due to the recent change FAB-4904
With this fix generated the certs using rc1 based cryptogen binary
, also updated the paths in docker-compose and the scripts

Change-Id: I63457c7ab3e13ae34ff729bcc8f95ea1532b0737
Signed-off-by: ratnakar <asara.ratnakar@gmail.com>
2017-06-24 09:12:28 -04:00
Christopher Ferris
d4fb451ed1 Merge "[FAB-4430] - WYFA scripts and node code" 2017-06-23 17:26:06 +00:00
Nick Gaski
ba777f3bcb [FAB-4371] - Chaincode Dev Mode
Adds a docker environment for running peer in dev mode
pre-baked crypto and orderer/channel artifacts
README still needs an updated curl command to bundle
these scripts.
simplified some of the paths
add sacc from write your first chaincode
remove binary

Change-Id: Ic1537987c819f0350ae6dbf740fd00e1571045e5
Signed-off-by: Nick Gaski <ngaski@us.ibm.com>
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2017-06-23 13:00:49 -04:00
Srinivasan Muralidharan
ec254d983c Merge "FAB-4916 add marbles02 chaincode" 2017-06-23 11:54:14 +00:00
Christopher Ferris
ca0b5d2882 FAB-4916 add marbles02 chaincode
couchdb mode requires marbles02 chaincode

Change-Id: I0c329e8d42fd72f656e292815d1ba5790f4b709c
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2017-06-23 04:16:14 +00:00
Gari Singh
b4beeffd32 [FAB-4927] Modify TLS config
Last part of FAB-4626- need to
update the script to use the right
root CA for communciating with the
orderer.

Change-Id: I89e1468be6970b48c416f7058dd38c24b0eec506
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2017-06-22 22:06:00 -04:00
Nick Gaski
803da719a1 [FAB-4430] - WYFA scripts and node code
Hard code rc1 tag to docker-compose

Change-Id: I72c04a8c03df6179f69197a87f27c18a668b186d
Signed-off-by: Nick Gaski <ngaski@us.ibm.com>
2017-06-21 22:33:51 -04:00
Christopher Ferris
241d08ee3c FAB-4910 fix incorrect network spec
and fix incorrect function name in byfn.sh
add *.tx and *.block files to .gitignore
add FABRIC_CFG_PATH setting

Change-Id: Id3457455354b1f2aea1a9661aa89dc677e05124b
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
Signed-off-by: Rameshbabu <rameshbabu.thoomu@gmail.com>
2017-06-22 09:09:53 +08:00
Christopher Ferris
fbc120f1fc FAB-4851 basic network sample
Change-Id: I751254bc4b2340c33444248050ddffcc8428ab36
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2017-06-21 05:46:02 +00:00
Christopher Ferris
3297865248 FAB-4073 build your first network sample
address review comments

Change-Id: Ia2382005d4503f9dc7ba845a2d04f36237316cde
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2017-06-21 05:42:36 +00:00
Christopher Ferris
54cae68bc4 FAB-4853 initial content
Change-Id: I54680c4c0518967a94f616ba0846dddd74f7914e
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2017-06-21 07:30:04 +08:00
Ry Jones
abb2b380c3 Initial empty repository 2017-06-20 00:15:23 +00:00