Commit graph

302 commits

Author SHA1 Message Date
Yukihiko
9e0eed19a4 [FAB-15104] Remove scripts/bootstrap.sh
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 5be56d3f77)
2019-07-19 19:12:40 +00:00
James Taylor
cf5855dd5d [FAB-15993] use new annotations
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>
2019-07-17 16:53:35 +01:00
David Enyeart
3429e22a9e Merge "[FAB-15723] Fix script and instruction with ccenv" into release-1.4 2019-07-12 21:21:59 +00:00
Surya Lanka
d50fbc4f69 [FAB-15803] Upgrade to v1.4.2
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
2019-07-12 17:57:48 +00:00
Tatsuya Sato
015fc15dc2 [FAB-15723] Fix script and instruction with ccenv
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 1774a25de8)
2019-07-12 17:10:28 +00: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
BigManing
3da5f8a450 Fix doc link
Change-Id: I24cae31cc3df080b8906812b81f63b15795dc6e5
Signed-off-by: BigManing <lingshui2008@qq.com>
(cherry picked from commit a8a55395af)
2019-06-03 11:07:35 +02:00
Arnaud J Le Hors
ad87f324b9 Merge "[FAB-9033] TypeScript sample uses latest type defs" into release-1.4 2019-05-17 07:25:02 +00:00
James Taylor
334a66f17e [FAB-15287] Remove Commercial Paper metadata
This reverts the metadata added in commit 6c28eca339.

Change-Id: Id38c819a19477562bdc98a272c4fb39fb1a79112
Signed-off-by: James Taylor <jamest@uk.ibm.com>
2019-05-02 11:43:41 +01:00
Taku Shimosawa
3d53f79be3 [FAB-9033] TypeScript sample uses latest type defs
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>
2019-04-30 17:15:18 -07:00
Simon Stone
f59e563d27 Merge "Fix balance-transfer script" into release-1.4 2019-04-29 09:24:32 +00: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
Simon Stone
8271a472f8 [FAB-14486] Extend BYFN to opt skip chaincode deploy
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>
2019-04-25 14:49:08 +01:00
Simon Stone
3a1d29ce93 [FAB-14485] Extend BYFN to opt inc cert authorities
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 0c4141f2a1)
2019-04-25 13:06:24 +00:00
Matthew White
5d0bfb9989 Merge "[FAB-14330] Add connection profiles for BYFN and EYFN" into release-1.4 2019-04-25 13:04:13 +00: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
Simon Stone
ec9eb7fa73 Merge "[FAB-13823] Commercial Paper fixes" into release-1.4 2019-04-24 18:01:05 +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
preminem
6be46eed05 Fix balance-transfer script
Change-Id: I610d9cd3b91b3be83fa62ea126c7b326e092239d
Signed-off-by: preminem <preminem@ruc.edu.cn>
2019-03-26 11:48:08 +00:00
Yoav Tock
72edb7e3bb FAB-14531 BYFN Raft with 5 nodes
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>
2019-03-24 14:19:20 +02:00
Yoav Tock
83fe6c32df FAB-12762 Add etcd/raft consensus option to BYFN
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>
2019-03-24 13:46:47 +02:00
Matthew B. White
6c28eca339 [FAB-13823] Commercial Paper fixes
Change-Id: I35e3e02fe9672ea79bd96e4d49926c900dfa627d
Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>
2019-03-06 13:30:38 +00:00
Simon Stone
349d88d184 [FAB-14330] Add connection profiles for BYFN and EYFN
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>
2019-02-25 11:38:06 +00:00
Gari Singh
026aa9ec01 Merge "[FAB-14268] Make BYFN/EYFN ports match external ports" into release-1.4 2019-02-23 20:52:34 +00:00
David Enyeart
4ed3933a8d Merge "FAB-13489 fabric-samples add error msg" into release-1.4 2019-02-22 19:45:32 +00:00
Simon Stone
e5dc89e61d [FAB-14268] Make BYFN/EYFN ports match external ports
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 f942010fa6)
2019-02-22 19:43:15 +00: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
Sambhav Nidamarty
881ba56c8e FAB-13575 Update Jenkins files for release-1.4
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>
2019-01-10 17:18:48 +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
8a458b5cdc [FAB-12056] Private marbles cc use transient data
The marbles02_private example needs to be updated to pass all
attributes as transient data instead of arguments.
This will prevent identifiable information being sent to the orderer.

Also removed transferMarblesBasedOnColor since range
queries and update is not supported in a transaction when
using private data, as different peers may have
different data in their local private state
databases.

Change-Id: I7c3cebcb49b6c59e4e8ea35f46a799ffdd1999e9
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2019-01-06 16:52:37 -05:00
Gari Singh
39e8ec4a8a Merge "FAB-13372 Fabric-Samples return error msg" 2019-01-04 19:23:15 +00:00
Gari Singh
461b6abcd6 FABC-781 Remove fabric-ca sample
This sample  uses images which are no
longer published and are not supported
by the community.

FABC-781 #done

Change-Id: I01865b433a1ef4345aaf47255b92c1f83275aa4f
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2019-01-04 09:38:39 -05:00
Bret Harrison
e9b9477a31 FAB-13372 Fabric-Samples return error msg
Update the Balance Transfer to return the fabric error.
The sample application was updated to both return the error
in the REST response and to post the error to the log.
The sample was updated with the 'channel.close()' so
that users will note how to shutdown a channel and not
hold connections open.

Change-Id: I49f20a50340adff52cf57db00a121ffd75eb1827
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2019-01-04 14:23:38 +00:00
Gari Singh
e6ce28c1e8 Merge "FAB-13305 Update scripts to pull latest artifacts" 2019-01-04 14:03:08 +00:00
Sambhav Nidamarty
e3da2208d7 FAB-13433 - Update Jenkinsfile configuration
This change is to update Jenkinsfile to fetch
the patchset for verify jobs and clone the latest
commit for merge jobs.

Change-Id: I20f9a322eb9f60b648b4b630df2d4565223be916
Signed-off-by: Sambhav Nidamarty <sambhavdutt@gmail.com>
2019-01-02 22:54:53 -05:00
Ry Jones
33db64e277 Configure Stale ProBot
Use GitHub's process to automatically comment
and close PRs, with a pointer to the contributing
guide.

Change-Id: Iea3d1391a4175c98f2d5eeb9a8047d09286d46b7
Signed-off-by: Ry Jones <ry@linux.com>
2018-12-30 02:02:14 -08:00
Matthias Neugschwandtner
5cd277fdc0 [FAB-11951] Interest-rate swap example for SBE
This is an example on how to represent and implement basic interest
rate swap handling using fabric. It demonstrates the
usage of state-based endorsement.

Change-Id: I04e631299d95262e54e1532489766aa20477064c
Signed-off-by: Matthias Neugschwandtner <eug@zurich.ibm.com>
Signed-off-by: Alessandro Sorniotti <ale.linux@sopit.net>
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-12-26 10:30:57 -05:00
David Enyeart
9567985d29 [FAB-13407] Align fabric-samples with 1.4.0-rc2 release
Change-Id: If784ead9b35c89b874078fe3e87e702fd3be5953
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-12-20 17:11:36 -05:00
Sambhav Nidamarty
c7572aad9b FAB-13305 Update scripts to pull latest artifacts
Update byfn/eyfn Jenkins script to get the latest
version binaries for fabric and fabric-ca

Change-Id: I0a310385285b1c086a6cfef0f7cb1c1906ed8351
Signed-off-by: Sambhav Nidamarty <sambhavdutt@gmail.com>
2018-12-17 14:40:10 -05:00
wenjian3
ab46e3548c [FAB-13283] Update sample code for commercial paper
- Update CORE_LOGGING_LEVEL to FABRIC_LOGGING_SPEC
- Add port as an argument in case default port is used

Change-Id: I29725a100a095b2b6f2ec6262e7b70730445385e
Signed-off-by: Wenjian Qiao <wenjianq@gmail.com>
2018-12-14 12:12:12 -05:00
Artem Barger
89fff6df43 Merge "FAB-13011 add kafka consensus type to byfn sample" 2018-12-13 09:14:35 +00:00
Yacov Manevich
a79d7cf3aa Merge "[FAB-13126] Align fabric-samples with 1.4.0-rc1 release" 2018-12-12 18:20:05 +00:00
Matthew Sykes
f67782113d [FAB-13232] fix peer node start command
The -o flag was a legacy option on `peer node start` and has been
removed.

Change-Id: Idf3cf57d39461b57c6f61b32e971e14031278e3f
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
2018-12-12 11:14:54 -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