Change-Id: Ic0291f07e2aba519bcd05238d002eecd5ec43891
Signed-off-by: David Enyeart <enyeart@us.ibm.com>

Update the Jenkins scripts for the fabric-samples
tests in the release-1.4 branch.

Change-Id: I5f9c3d555898da354ecc62bd355f52e650c9eac1
Signed-off-by: Sambhav Nidamarty <sambhavdutt@gmail.com>

Add error messages and update console logging.

Change-Id: Ic4ffd73ffa098121d7af03f8d2e5383b79f832c0
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>

Update both BYFN and EYFN so that the peer request and
chaincode ports match the externally mapped ports. This
enables applications both inside and outside the Docker
network to use service discovery to interact with these
networks (see the JIRA for more details).

Change-Id: I73c36dfdb269ec4225376fb04b1e7a087363e4cc
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
(cherry picked from commit f942010)

…lease-1.4

Add connection profiles as part of the BYFN and EYFN
samples. The connection profiles can be used by client
applications using the Fabric SDKs to connect to those
networks.

Each organisation needs its own connection profile
that contains the set of peers that organisation
should  use to connect to the network. Orderers and
channels are not needed, as they can be determined
by using service discovery.

Connection profiles can be specified in either JSON
or YAML, so provide both.

Change-Id: Ie8e3d2aef6475b324e5be8ebdada4c594c2235ae
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>

Change-Id: I35e3e02fe9672ea79bd96e4d49926c900dfa627d
Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>

Augment the fabric-samples first-network sample to include an option
to choose etcd/raft as consensus-type.

Extend the -o flag so that it allows users to choose between the
solo, kafka, or etcdraft consensus-type for the ordering service.

Use three orderer nodes.

Change-Id: Ibc4c3564220466aef0a87baee4a2d594e5554a62
Signed-off-by: Yoav Tock <tock@il.ibm.com>

Extend the 3-node etcd/raft cluster in BYFN to 5 nodes, in
order to better support the documentation effort. This will
allow users to experiment creating channels with less then
5 nodes, but avoid the pitfalls of a 2-node cluster.

Change-Id: I5ba1d6039b4bb4864b2b97271de81fbfe91b4fb5
Signed-off-by: Yoav Tock <tock@il.ibm.com>

Change-Id: I610d9cd3b91b3be83fa62ea126c7b326e092239d
Signed-off-by: preminem <preminem@ruc.edu.cn>

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>

Awaiting of wallet importing in fabcar

Change-Id: Ib4a43f75850728794b90b58add7956de113cac80
Signed-off-by: NickLatkovich <nicklatkovich@gmail.com>
(cherry picked from commit d63047c)

…lease-1.4

Add a new "-a" option to byfn.sh that optionally deploys
certificate authorities (in Docker containers) for
organisation 1 and 2.

Change-Id: Ib58c46941aa6e8e58bac01aa3349e97d1f93b930
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
(cherry picked from commit 0c4141f)

Add a new "-n" option to byfn.sh that optionally skips
the deployment of the abstore chaincode. When BYFN is
used as a network for other samples, we don't really
want the default chaincode deployed.

Change-Id: I6b4043a5c0bcedbeec431cc4a860a3b12da8d8f6
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>

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>

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>

This patchset removes the type defintions for the TypeScript
version of balance-transfer, and makes it use the definitions
in the npm repository.

Change-Id: I711d438354101f48240dfec115d747d65448ee2a
Signed-off-by: Taku Shimosawa <taku.shimosawa@hal.hitachi.com>

This reverts the metadata added in commit 6c28eca.

Change-Id: Id38c819a19477562bdc98a272c4fb39fb1a79112
Signed-off-by: James Taylor <jamest@uk.ibm.com>

…se-1.4

Change-Id: I24cae31cc3df080b8906812b81f63b15795dc6e5
Signed-off-by: BigManing <lingshui2008@qq.com>
(cherry picked from commit a8a5539)

Change-Id: Ie15dd31f0e889df6042238a1e64067fcf32c4ec7
Signed-off-by: James Taylor <jamest@uk.ibm.com>

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

This patch fixes the script and instruction with the ccenv container.

Running chaincode dev-mode fails because bash was removed from the
ccenv by FAB-15670.
This patch changes the command from /bin/bash to /bin/sh.

FAB-15723 #done

Change-Id: Ibf31ce9170e606988302bf46d8dac98b62e2043e
Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
(cherry picked from commit 1774a25)

Upgrading to v1.4.2 from v1.4.1 and enabling
v1_4_2 capabilities on orderer system channel
and applicaiton channel for channel and orderer groups

Signed-off-by: Surya Lanka <suryalnvs@gmail.com>
Change-Id: I41e575ba8b56122a55fe148b65972884aaf49627

…e-1.4

Contracts now need to use new Fabric annotations instead of swagger info annotations

Change-Id: I038ba39025db27c5298390cd9ef28413b5b8ef31
Signed-off-by: James Taylor <jamest@uk.ibm.com>

Removed scripts/bootstrap.sh file and updated the README.md
with steps to download bootstrap.sh from Fabric repository.

Remove versions from fabric-samples readme so that
it doesn't need to be maintained for each release.
Also clarify the bootstrap.sh download instructions.

Signed-off-by: Yukihiko <hirayanagi@jp.fujitsu.com>
Change-Id: I50357c702c8b357fedaf8ccd1ec97ef6c4429371
(cherry picked from commit 5be56d3)

This CR add a space in parameter expansion to get a transation id.
testAPI.sh tries to get a transaction id using parameter expansion from
MESSAGE variable and accesses a URL incluse the transaction id. However
the transaction id includes a space at the beginning and the access will
be failed.
By ridding of the space, the access will successes.

Signed-off-by: Nao Nishijima <nao.nishijima.xt@hitachi.com>
Reported-by: YAMAUCHI，KAITO <kaito.yamauchi.kk@hitachi-solutions.com>
Change-Id: I0c52418044deb3b7d8c30cb64a5908e32462bd09

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>

commercial paper sample for Java Gateway SDK (client app)

Change-Id: I80c6b9dbc36631004903244a20e6a492138c7751
Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>

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>

Change-Id: Ic658fe3bdece9875ca3ceaf28d94c5fb48879083
Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>

Update with Java Contract

Change-Id: I1a70473f038576d741c8c9ac83e527b5e51e88ca
Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>

[FAB-15213] Update Commercial Paper for Java

Change-Id: Ie116962a6c3952e52269323492f5f292e9b65e95
Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>

Collect logs from all existing Docker containers instead
of just limiting it to a predefined (and incorrect) set.

Also clean up the directory structure for the logs, and
remove any networks/volumes after each test run.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: Ifcf88baeb9ba4d42f757f7cd23ab2a178ab39b41

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I2b28c69a2f3ec0e3d87252ef4a585b4a46fddcbd

Add in makefile to call the compilation and liniting
Only the applications and contracts currently
Testing needs to follow

Change-Id: I5604a71ea025cd01a1f27968122ea119697db7a5
Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>

Add a channel event handler sample based on block events.

Scope:

create a block event handler
write events received to the console
write events received to a log file
write events to an off chain couchdb database
demonstrate a basic map reduce view for aggregation

Change-Id: I5420ddc7070dbee785218ce5960f7604ac799f90
Signed-off-by: Chris Elder <chris.elder@us.ibm.com>

…se-1.4

…se-1.4

backporting fixes from master to v1.4 for
interest rate sample

Change-Id: If7648c91c53dff737103de178bd8a09556765951
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Update fabric-samples to V1_4_3 channel capability to
enable the new NodeOU support.

Change-Id: I63b2a70e612c2fd72c58272543f68b1b8687bdbb
Signed-off-by: David Enyeart <enyeart@us.ibm.com>

FABCI-402 #done

Signed-off-by: vijaypunugubati <vijaypunugubati@gmail.com>
Change-Id: Ie4ee8c1eecc63d959b2a8d188d737c5b03face67

Signed-off-by: bharadwajambati1 <bharadwaj.ambati1@ibm.com>
Change-Id: Icd4eb98e7953288cc51577a7952b5680997934c7

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>

Signed-off-by: Varun Agarwal <varunagarwal315@gmail.com>
Change-Id: Idb6c57e047bba9a176b312f86d05c2ee21aeb175

Signed-off-by: Ry Jones <ry@linux.com>
Change-Id: I69233df8716f0bc081b67c771fb7eeaac6fc9d52
(cherry picked from commit a6ce915)

adding chaincode excution comments

Signed-off-by: jaehyun <jaehyun@lgcns.com>
Change-Id: I61ce32561f68fb8db8e0dc3f0d18b0564aaafb70
(cherry picked from commit 48082cf)

Update ci.prop file to bring 1.4.4-stables images from
nexus on verify and merge jobs.

Signed-off-by: vijaypunugubati <vijaypunugubati@gmail.com>
Change-Id: I25a1ed222aae5bbf7fad79002b18ea59b19c0d89

This is fix #FAB-16592

Signed-off-by: bjzhang03 <bjzhang03@foxmail.com>
Change-Id: If246f455c65403de2edcdc58ff35cde04279950d

This fixes #FAB-16619

Change-Id: I251d10bc9dc9baf4f7e7d20cc11a34703baffc52
Signed-off-by: bjzhang03 <bjzhang03@foxmail.com>

Signed-off-by: rthatcher <robert.thatcher@uk.ibm.com>
Change-Id: Ib8780cb2a4cbae8c5a55708682490b9c8230b519

Signed-off-by: Daniel Ruthardt <druthardt@contractor.linuxfoundation.org>

Signed-off-by: Daniel Ruthardt <druthardt@contractor.linuxfoundation.org>

this file must exist on the default branch

Signed-off-by: Ry Jones <ry@linux.com>
Change-Id: Ie805816e929f4449689214c74964b71eac56e31d
(cherry picked from commit 7b65a25)

- remove images that match dev-*
- correcting a dependency

Change-Id: I603dc822260be827ca36677e5c05aa5f196858ae
Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>

- 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 81aabf4)

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I3821a329ec5eb439ce0f27cfbc71b28e6b0b8a09

Signed-off-by: Brett Logan <Brett.T.Logan@ibm.com>

Cherrypick stalebot settings from master

Signed-off-by: Ry Jones <ry@linux.com>

Signed-off-by: danipisca07 <danielepiscaglia@libero.it>

Added stop script to remove `fabcar` chaincode containers and images.
I note that the test build failed but it clearly has nothing to do with this change. Fabcar java doesn't seem to be working. This will need to be addressed independently.

Fix port numbers for peers in high-throughput.
The test build failed for some unrelated reason that needs to be investigated independently.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>

This change updates build.gradle to fabric 1.4.4.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>