Commit graph

536 commits

Author SHA1 Message Date
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
Nao Nishijima
1826dbfda7 [FAB-16036] Fix a error of get query in testAPI.sh
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
2019-07-22 06:17:32 +00:00
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
David Enyeart
dd8150abf3 [FAB-15104] Remove versions from fabric-samples readme
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.

Change-Id: I4ef80e048b0d8f27429059635e57e08a8c70c0fa
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2019-07-19 19:12:07 +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
kukgini
1387aa8319 [FAB-15927] Better expression for golang
Better for loop expression and veriable scope for golang

Signed-off-by: kukgini <kukgini@gmail.com>
Change-Id: I83a4ead246039b5b10334467f17c808465492725
2019-07-17 07:48:48 +00:00
Matthew Sykes
61c33d3fba [FAB-15973] use --output json on simulatecommit
Change-Id: Ic31b390898f1981a0138935990ff11a3902007ee
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
2019-07-16 12:24:11 -04:00
Matthew White
7a5f3398a9 Merge "[FAB-15717] fix Error Unexpected end of JSON input" 2019-07-15 09:43:14 +00: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
Jason Yellick
e8c0ca1b03 Merge "FAB-15782 Sample Go CC should include deps" 2019-07-11 20:00:09 +00: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
Gari Singh
a872358668 Merge "[FAB-15723] Fix script and instruction with ccenv" 2019-07-10 09:45:20 +00:00
Tatsuya Sato
8bbdd0faf0 [FAB-15716] Fix instructions for dev-mode
This patch fixes the instructions for dev-mode.

For the commands to start the chaincode to work properly,
this patch modifies the commands.
- Use peer.address flag (instead of the unused env var after FAB-14770)
- Add CORE_PEER_TLS_ENABLED=false (dev-mode is for non-TLS mode only)

FAB-15716 #done

Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
Change-Id: I160d22389bb611c5b96ee880497266f06d25abd7
2019-07-03 20:30:26 +00:00
Will Lahti
0254d67b37 QueryApprovalStatus -> SimulateCommitChaincodeDef
Update samples now that QueryApprovalStatus has been renamed
to SimulateCommitChaincodeDefinition.

FAB-15831 #done

Change-Id: I4e12ca2c8424bf8d6537e77e1a9de7fd3723636d
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
2019-07-02 13:37:20 -04:00
Arnaud J Le Hors
0acd3eb935 Merge "[FAB-15104] Remove scripts/bootstrap.sh" 2019-06-26 12:59:28 +00:00
Gari Singh
c57d67ce80 FAB-15782 Sample Go CC should include deps
The ccenv used to build Go chaincode is being
updated to no longer include the shim
dependency.  Go chaincode must now vendor
all of its dependencies prior to being
packaged and installed.

Go chaincodes have been updated to include
go.mod for versioned dependencies.

Change-Id: Ib971cd3f841d5c92a509450bd85f6e424cc60c6e
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2019-06-25 09:50:31 -04:00
Gari Singh
6ba5a19c2c Update to Go 1.12.5 in ci.properties
FAB-15809 #done

Change-Id: I2decb07cb97d7f655926d8606de26aba100fcd94
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2019-06-25 05:12:48 -04:00
Tatsuya Sato
1774a25de8 [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>
2019-06-18 17:42:24 +00:00
Cefold
6ae711cf7b [FAB-15717] fix Error Unexpected end of JSON input
Change-Id: If5700abbe8315ece19e488e2d1ee0e0a7f0b8f49
Signed-off-by: Huida Liu <cefold@gmail.com>
2019-06-18 14:56:18 +00:00
Yukihiko
5be56d3f77 [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.

Signed-off-by: Yukihiko <hirayanagi@jp.fujitsu.com>
Change-Id: I50357c702c8b357fedaf8ccd1ec97ef6c4429371
2019-06-14 14:39:32 +10:00
Yuki Kondo
779f8f3418 [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.

Change-Id: Iaff0c5bde8c54cef12a176b55e13d70173ee8108
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
2019-06-12 20:07:16 +00:00
NIKHIL E GUPTA
7c5f5d39c9 [FAB-15199] Update interest rate sample
Update interest rate sample for chaincode
lifecycle

Change-Id: I8e481dda11a757d5fe76105098307141a67dff60
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2019-06-12 17:43:22 +00:00
Simon Stone
f0dca20446 [FAB-14532] Remove LL FabCar sample
Remove the Fabric v2.0 version of the low-level FabCar sample. We
should not be advertising how to use the low-level APIs at this
point. The low-level samples are still available for Fabric v1.4
to show the difference between the low-level and high-level APIs.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I0faef40d4cfddc689e6d7184491fd3759a3558a1
2019-06-10 19:17:29 +01:00
Arnaud J Le Hors
ae91463639 Merge "[FAB-13769] Add UT code to ABAC sample Chaincode" 2019-06-05 12:07:13 +00:00
Simon Stone
9225122fb3 Merge "[FAB-15601] BYFN: Fix MAX_RETRY for couchdb" 2019-06-05 11:04:32 +00:00
Arnaud J Le Hors
423b2ffe18 Merge "[FAB-9329] Remove the unused variable in BYFN/EYFN" 2019-06-05 09:18:51 +00:00
Tatsuya Sato
1ed1a10af6 [FAB-15573] Fix typo in fabric-samples-ci.md
This patch fixes typo in docs/fabric-samples-ci.md

Change-Id: I814efb14d47e3509e3f785504b8d6d2ef26399a0
Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
2019-06-04 21:23:14 +00:00
Arnaud J Le Hors
2e7fec9da8 [FAB-15601] BYFN: Fix MAX_RETRY for couchdb
CR31665 increased MAX_RETRY to 15 which allowed the fabcar go test
to succeed but the fabcar javascript test still fails. This sets
it to 20 in hope this will be enough.

Change-Id: I51a0e24893634d773b12341f5b87d49d2bbf7cb6
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2019-06-03 16:30:54 +02:00
Yuki Kondo
1e9e4c4dce [FAB-9329] Remove the unused variable in BYFN/EYFN
This CR removes the unused variable 'OS_ARCH' from byfn.sh,
eyfn.sh and interest swap in fabric-samples.

FAB-9329 #done

Change-Id: I0d1b87679d66bec1d9e4aaee9e770305f9c8f4b9
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
2019-06-03 10:42:47 +00: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
Yuki Kondo
964c09fe00 [FAB-15601] BYFN: Fix MAX_RETRY for couchdb
BYFN and Fabcar with couchdb are failing intermittently
because CLI sends a request for joining a Channel before
a Peer connects to the couchdb.
This CR changes the value of MAX_RETRY from 10 to 15
as a workaround.

FAB-15601 #done

Change-Id: I8d91fa224c585cc52c9dfabebb808b8909253900
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
2019-05-31 23:50:36 +00:00
Arnaud J Le Hors
0b12e687fb Merge "[FAB-15127] Update high throughput sample" 2019-05-28 16:37:42 +00:00
NIKHIL E GUPTA
41dca99e5a [FAB-15127] Update high throughput sample
Update high throughput sample scripts for
chaincode lifecycle

Change-Id: I8e7f9d98bb62d75a779e2767b0e165a36a700d43
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2019-05-28 11:04:31 -04:00
Matthew White
876662e244 Merge "[FAB-14487] Make FabCar use BYFN, not basic-network" 2019-05-28 10:24:00 +00:00
Arnaud J Le Hors
f331828701 Merge "Use official CouchDB image" 2019-05-21 08:09:21 +00: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
Arnaud J Le Hors
11a534fac7 Merge "[FAB-14369]Fix dev mode failing to build Chaincode" 2019-05-16 14:15:52 +00:00
Arnaud J Le Hors
ccf765ad56 Merge "[FAB-15051] delStandard() function for high-throughput" 2019-05-16 13:45:53 +00:00
Gari Singh
3fe014a8c2 Use official CouchDB image
Replace fabric-couchdb image with
official CouchDB library image.

FAB-15353 #done

Change-Id: I248fb452419f590553ad578141dbfb3ab1fb5dd5
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2019-05-05 09:01:01 -04:00
Simon Stone
f2d0fa05e4 [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-05-03 08:51:17 +01: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