Commit graph

44 commits

Author SHA1 Message Date
Matthew B White
599d397d8a
Move to use the 1.4.5 rather than snapshot versions (#483)
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2021-09-02 12:46:34 +02:00
Ry Jones
99657d19c7
Merge branch 'release-1.4' into release-1.4 2019-10-27 09:04:54 -07:00
Simon Stone
b92ff73374 [FAB-16849] Various updates for Java version of FabCar
- Update .gitignore
- Use builds on Sonatype, not Nexus
- Enable new discovery as localhost flag

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: Ia0904cedf953b5ecbf6aaf859245a9bb431d3f76
(cherry picked from commit 81aabf4c0b)
2019-10-17 11:01:22 +00:00
Daniel Ruthardt
0fce873325 Added license header and "signed-off-by".
Signed-off-by: Daniel Ruthardt <druthardt@contractor.linuxfoundation.org>
2019-09-26 20:57:57 +02:00
Daniel Ruthardt
877baa597c Added stop script to remove fabcar chaincode containers and images.
Signed-off-by: Daniel Ruthardt <druthardt@contractor.linuxfoundation.org>
2019-09-26 20:57:57 +02:00
David Enyeart
78fe781a67 [FAB-16402] Fabcar only needs two endorsements
Fabcar test currently invokes on 4 peers. Only need endorsement on 2 peers.
This will help the CLI invokes to finish sooner, and eliminate some CI failures.

Change-Id: Iec6bb7c9032ea6344c1d1917ffa3188c3b05c1e0
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2019-08-24 09:13:57 -04:00
Simon Stone
dc8e60b4e3 [FGJ-4] CI tests for FabCar Java sample
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I2b28c69a2f3ec0e3d87252ef4a585b4a46fddcbd
2019-07-31 09:24:31 +01:00
andrew-coleman
8c057e951b FGJ-4 add license header to fabcar java sample
Change-Id: Ic658fe3bdece9875ca3ceaf28d94c5fb48879083
Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>
2019-07-25 13:32:39 +01:00
andrew-coleman
f1c46f033c FGJ-4 split java fabcar into separate classes
Incorporate review comments from previous CR
Split enroll/register/transactions into separate classes

Change-Id: I384cec59c7f53a37864bfc28be11e785a61421f3
Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>
2019-07-25 11:42:16 +01:00
Simon Stone
8f92861104 Merge "FGJ-4 Fabcar sample" into release-1.4 2019-07-24 09:10:02 +00:00
andrew-coleman
abb7207e24 FGJ-4 Fabcar sample
Implementation of Fabcar client for Java Gateway SDK
Changes to first-network to generate the CCP files with
embedded PEM certificates rather than paths to files on disk

Change-Id: Iff15425e96ce28c6f96079cee474c35868fab554
Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>
2019-07-23 15:50:25 +01:00
Simon Stone
36ef140439 [FAB-15649]Fix Fabcar to install Chaincode on all peers
CI Fabcar javascript test fails because a query proposal is
sent to a peer which does not have Chaincode. The query handler
in fabric-network does not consider if Chaincode is installed on
target peers.

As a workaround, this CR adds steps installing Chaincode
on all peers during the setup.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I771e3bae0abd2d6a3b3b7d295efdf6417c3c1c21
2019-07-12 17:33:04 +01:00
James Taylor
62fa4f8bc0 [FAB-15213] Add Java FabCar sample contract
Change-Id: Ie15dd31f0e889df6042238a1e64067fcf32c4ec7
Signed-off-by: James Taylor <jamest@uk.ibm.com>
2019-07-10 13:53:15 +01:00
Simon Stone
0bc0a69793 [FAB-14532] Make LL FabCar use BYFN, not basic-network
Update low level FabCar to use BYFN. As a result, the
sample client applications need to change so that they
use the correct TLS certificates and URLs, and so that
they use service discovery.

Change-Id: I2805a00fd745416e6b006af7b87147551e511922
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2019-04-25 17:02:35 +01:00
Simon Stone
2a5a59b60a [FAB-14487] Make FabCar use BYFN, not basic-network
Update FabCar to use BYFN. As a result, the sample
client applications need to change so that they use
the correct connection profile paths, and so that
they use service discovery.

Change-Id: If02b7fb4ad308c6a7d1e1aa9f953e1bc4e942719
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2019-04-25 17:02:35 +01:00
NickLatkovich
a1a648f12a FAB-14444
Awaiting of wallet importing in fabcar

Change-Id: Ib4a43f75850728794b90b58add7956de113cac80
Signed-off-by: NickLatkovich <nicklatkovich@gmail.com>
(cherry picked from commit d63047cac9)
2019-04-24 21:46:55 +00:00
rameshthoomu
6c0203a9b0 FABCI-284 Update CI Pipeline script
This patch updates CI pipeline scripts which utilizes global shared
library reusable functions. It also creates ci.properties file with
all the parameters required to test the fabric-samples patch.

Change-Id: Ib2fd948eae9f2e37535144489279773836400358
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2019-03-29 11:05:06 -04:00
Bret Harrison
463d2ecaff FAB-13489 fabric-samples add error msg
Add error messages and update console logging.

Change-Id: Ic4ffd73ffa098121d7af03f8d2e5383b79f832c0
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2019-01-14 19:37:10 +00:00
David Enyeart
bb39b6ed09 [FAB-13570] Align fabric-samples with 1.4.0 release
Change-Id: Ic0291f07e2aba519bcd05238d002eecd5ec43891
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2019-01-09 15:36:16 -05:00
David Enyeart
6a7472e72e [FAB-13126] Align fabric-samples with 1.4.0-rc1 release
Change-Id: I2ff248e93cbac8747c322672f7a831ece597e116
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-12-12 07:55:08 -05:00
Simon Stone
445ccbc25a [FAB-12880] Move old prog model samples for FabCar
Move the old programming model samples for FabCar,
including the "node" (JavaScript!) chaincode sample
and the JavaScript application in the top level into
new subdirectories called "javascript-low-level".

We still want to keep these samples around for comparision
purposes, but most new developers should be using the new
samples built using the new programming model.

At the same time, update the startFabric.sh script
to output correct help information on how to run
the applications built using the new programming model
after starting the Fabric network and deploying the chaincode.

Change-Id: I1e3701737f105cba67f661bf893771ac8a3a0373
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-12-10 21:39:30 +00:00
Christopher Ferris
527024833b Merge "[FAB-13206] Remove dependencies on fabric-client" 2018-12-10 15:56:46 +00:00
Simon Stone
5be62b5200 [FAB-13207] Remove incorrect discovery options
The TypeScript version of the FabCar app uses a dodgy
"as any" cast to get around a bug that has been fixed;
turns out the wrong name was being used (should have
been asLocalhost, not useLocalhost).

Note, because basic-network does not use TLS, we cannot
use service discovery. We can enable service discovery
when we migrate FabCar to BYFN instead.

Change-Id: I36dad1c8cc7380ca1123805ae3e74fe1e7665b40
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-12-10 13:13:11 +00:00
Simon Stone
fdbd92d65f [FAB-13206] Remove dependencies on fabric-client
The new FabCar apps currently have a dependency on
the fabric-client (old programming model) module,
but now the dependencies of the fabric-network module
have been corrected, this dependency can be removed.

The fabric-ca-client dependency is staying because the
FabCar apps explicitly require this module to perform
CA interactions.

Change-Id: Iee40f7a560d5ac0a0f8202fc6d751aa45467829e
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-12-10 12:03:03 +00:00
Simon Stone
eff00466f3 [FAB-12877] Add fabcar app using new prog model (JS)
Add a new version of the FabCar applications using the new
programming model (fabric-network), written in JavaScript.

Change-Id: I0fcc2e8a10291805d5389c7fc8d1e529debd600a
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-12-07 22:18:50 +00:00
Simon Stone
c18419644d [FAB-12878] Add fabcar app using new prog model (TS)
Add a new version of the FabCar applications using the new
programming model (fabric-network), written in TypeScript.

The new programming model requires a connection profile, so
I have added connection profiles (JSON and YAML) versions to
the basic-network sample. When we switch FabCar to use first-network,
we will have to add connection profiles into that as well.

Change-Id: I81bae907fc64a1cde0234325f37b53e5cd7964e5
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-12-07 22:18:37 +00:00
Simon Stone
928b72b60a [FAB-12875] Add automated tests for fabcar sample
Introduce automated tests for the fabcar sample, that deploy
the new sample contracts and submit the initLedger transaction
using the "peer" CLI.

Additional changes will follow to drive the new sample apps
to ensure that they work as well (but the apps aren't there
yet!).

Change-Id: Ie42d139eb1dc1cf0f7c16f41f54bb5f40309921c
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-11-30 09:52:25 +00:00
Simon Stone
3748983dd9 [FAB-12879] Update fabcar script for new contracts
This CR updates the startFabric.sh script in the fabcar
sample to deploy the new fabcar contracts written with
the new programming model, in either JavaScript or
TypeScript.

Because both JavaScript and TypeScript use the chaincode
language of "node", we need to separate "source" language
from "runtime" language. Also taking the chance to rename
the option "golang" to "go" to match the directory.

Change-Id: Ib42661223925b1d8df8fd73cf8c1aac9d8a29e59
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-11-21 14:44:35 +00:00
Bret Harrison
a4a15cb379 FAB-11220 Samples - remove EventHub
Removed the use of the old EventHub from both
FabCar and BalanceTransfer.

Change-Id: Ia4a0bb443f95c462efde9b054058986ae8bd80fd
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2018-07-19 12:50:28 -04:00
Gari Singh
c3979b5716 Merge "[FAB-8265] Fixed spelling error in registerUser" 2018-05-11 08:34:20 +00:00
Qiang Yiting
98561e0919 FAB-9552 Fix access of an un-declared variable
Change-Id: Ia518b5733e69a999a304d251390999fa1291b4eb
Signed-off-by: Qiang Yiting <suntoe@189.cn>
2018-05-03 20:24:14 +00:00
Robert P. J. Day
9d518fb795 [FAB-9330] Refactor top-level .gitignore into subdirs
Rather than cram most .gitignore content into the top-level .gitignore
file, partition it into lower-level .gitignore files, as is already done
with a couple subdirectories, just to be consistent.

I'm sure these files could be even tidier but this seems sufficient for
a first pass.

Change-Id: I0cc8cb2a9d7fa82c4f6de1aef9f82107c8cc7a6a
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
2018-04-04 06:26:20 -04:00
David Seybold
fcf62adf57 [FAB-8265] Fixed spelling error in registerUser
I have fixed a spelling error in registerUser.js, changing
"intreact" to "interact".

Change-Id: Ib07af36923a5fe652be01e1c83e316d4495d4a46
Signed-off-by: David Seybold <daseybold@gmail.com>
2018-03-20 21:57:57 -04:00
Abdul Rauf
25f6091b86 FAB-7836 Fix "No identity type provided" Error
Fix the following error:
[[{"code":0,"message":"No identity type provided. Please provide identity type"}]]

Change-Id: I5a0b04aadbf87d1661f9605f0eb4ec9b2dbab62a
Signed-off-by: Abdul Rauf <abdulraufmujahid@gmail.com>
2018-01-21 14:15:18 +05:00
luomin
24ef9da1c6 [FAB-6902] FAB-6904 correct the sample for FAB-6904
Maybe this sub-task is too stricky and tiny. 
To make the source easier to be read together as explained in the WYFA doc.

Change-Id: Icc0dc56c3e25ca7b8d4828935addd5ec7229e51c
Signed-off-by: Min Luo <luomin_tokyotech@hotmail.com>
2017-11-08 00:29:35 +00:00
ratnakar
1961835674 [FAB-6870] Update node modules versions
fabcar uses 1.0.2 node modules changing it to unstable so that
latest node modules can be used on master branch

Change-Id: Ia9dc866931763760dd3cd7dbc5c7fd9a5de099be
Signed-off-by: ratnakar <asara.ratnakar@gmail.com>
2017-11-02 11:19:57 -04:00
Bret Harrison
6b2799e620 [FAB-6568] Fabric-Samples - update fabcar
Update the fabcar sample with an easier flow
Remove hardcoded fields in the invoke program

Change-Id: I9a06cdd317c2afec80720ac7d728d38fc62c6f63
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
Signed-off-by: Nick Gaski <ngaski@us.ibm.com>
2017-10-30 12:08:06 -04:00
ratnakar
44c204d8b6 [FAB-5898] porting samples to node.js chaincode
Fabric 1.1 supports javascript chaincode. This changeset
addresses porting of the golang chaincode to node.js
chiancode and the corresponding README files

Change-Id: Iae24e713f16ab3508fe0cc18ee062ffa412b8ba6
Signed-off-by: ratnakar <asara.ratnakar@gmail.com>
2017-10-15 21:12:11 -04:00
Gari Singh
ba0a098ca6 FAB-5995 Update samples to work with v1.0.2
basic network:
- update docker-compose.yaml to use v1.0.2
- regenerate artifacts

fabcar:
- update creds

chaincode-docker-devmode:
- renegerate channel tx and genesis block

balance-transfer:
- update docker-compose.yaml
- update readme to use download link
- regenerate channel artifacts

Change-Id: I7d52f1afce51ea9e1b115fa287d281af95d9ad85
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2017-09-03 08:08:53 -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
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
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
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