Commit graph

336 commits

Author SHA1 Message Date
Brett Logan
797b991b4f Change stalebot settings
Signed-off-by: Brett Logan <Brett.T.Logan@ibm.com>
2019-10-26 11:52:34 -04:00
Simon Stone
750474d458 [FAB-16850] Set up CI with Azure Pipelines
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I3821a329ec5eb439ce0f27cfbc71b28e6b0b8a09
2019-10-17 12:48:04 +01: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
Matthew B. White
9915995df7 [FAB-16844] Modify pattern for cc images
- remove images that match dev-*
- correcting a dependency

Change-Id: I603dc822260be827ca36677e5c05aa5f196858ae
Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>
2019-10-16 11:48:02 +01:00
Ry Jones
ca5bcb27ae [IN-68] Add default GitHub SECURITY policy
this file must exist on the default branch

Signed-off-by: Ry Jones <ry@linux.com>
Change-Id: Ie805816e929f4449689214c74964b71eac56e31d
(cherry picked from commit 7b65a25a86)
2019-09-29 01:36:29 +00:00
rthatcher
ecd08c0357 [FAB-16474] marbles02 chaincode error
Signed-off-by: rthatcher <robert.thatcher@uk.ibm.com>
Change-Id: Ib8780cb2a4cbae8c5a55708682490b9c8230b519
2019-09-24 14:04:44 +01:00
bjzhang03
7e8edb3189 [FAB-16619] Fix the policy warning
This fixes #FAB-16619

Change-Id: I251d10bc9dc9baf4f7e7d20cc11a34703baffc52
Signed-off-by: bjzhang03 <bjzhang03@foxmail.com>
2019-09-17 16:56:20 +08:00
bjzhang03
70ce148927 [FAB-16592] Add the etcdraft into the config
This is fix #FAB-16592

Signed-off-by: bjzhang03 <bjzhang03@foxmail.com>
Change-Id: If246f455c65403de2edcdc58ff35cde04279950d
2019-09-17 09:54:51 +08:00
vijaypunugubati
ddf013ba01 FAB-16608 Update base_version on ci.prop
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
2019-09-16 09:31:51 -04:00
jaehyun
0b980ebda7 [FAB-16362] adding chaincode excution comments
adding chaincode excution comments

Signed-off-by: jaehyun <jaehyun@lgcns.com>
Change-Id: I61ce32561f68fb8db8e0dc3f0d18b0564aaafb70
(cherry picked from commit 48082cfa95)
2019-09-06 12:12:02 +00:00
Ry Jones
b4e097ff7c [FAB-16487] Update eslint
Signed-off-by: Ry Jones <ry@linux.com>
Change-Id: I69233df8716f0bc081b67c771fb7eeaac6fc9d52
(cherry picked from commit a6ce915106)
2019-08-31 18:34:46 +00:00
Simon Stone
d7932fd420 Merge "[FAB-16402] Fabcar only needs two endorsements" into release-1.4 2019-08-27 08:19:35 +00:00
Varun Agarwal
f86ec95726 [FAB-16390] Added filter for invalid transactions
Signed-off-by: Varun Agarwal <varunagarwal315@gmail.com>
Change-Id: Idb6c57e047bba9a176b312f86d05c2ee21aeb175
2019-08-25 14:19:02 +05:30
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
David Enyeart
a963990313 Merge "[FAB-16344] Upgrade scripts for v1.4.3" into release-1.4 2019-08-23 22:57:21 +00:00
bharadwajambati1
a4460a9947 [FAB-16344] Upgrade scripts for v1.4.3
Signed-off-by: bharadwajambati1 <bharadwaj.ambati1@ibm.com>
Change-Id: Icd4eb98e7953288cc51577a7952b5680997934c7
2019-08-23 11:21:51 -04:00
vijaypunugubati
549e9fdd09 Remove AnsiColor wrapper in Fabric Samples
FABCI-402 #done

Signed-off-by: vijaypunugubati <vijaypunugubati@gmail.com>
Change-Id: Ie4ee8c1eecc63d959b2a8d188d737c5b03face67
2019-08-22 11:17:14 -04:00
David Enyeart
fc5975b285 [FAB-16322] fabric-samples to V1_4_3 channel capability
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>
2019-08-15 23:47:43 -04:00
NIKHIL E GUPTA
3d364ed082 [FAB-16296] Fixes for interest rate sample
backporting fixes from master to v1.4 for
interest rate sample

Change-Id: If7648c91c53dff737103de178bd8a09556765951
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2019-08-13 10:17:40 -04:00
Arnaud J Le Hors
e80379a06f Merge "[FAB-14813] Channel event sample in fabric-samples" into release-1.4 2019-08-08 00:04:55 +00:00
Arnaud J Le Hors
da7f3cd0cc Merge "[FAB-16036] Fix a error of get query in testAPI.sh" into release-1.4 2019-08-07 23:18:44 +00:00
Chris Elder
1efd213110 [FAB-14813] Channel event sample in fabric-samples
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>
2019-08-06 21:43:26 +00:00
Simon Stone
d26e27e0d1 Merge "[FAB-16147] Compilation and Lint Checks" into release-1.4 2019-08-02 09:31:08 +00:00
Matthew B. White
11d6ee14a9 [FAB-16147] Compilation and Lint Checks
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>
2019-07-31 11:47:17 +01: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
Simon Stone
9040e28b55 [FAB-15897] Improve FabCar test logging
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
2019-07-30 17:55:24 +01:00
Matthew B. White
dcce485561 [FAB-15213] Update Commercial Paper for Java
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>
2019-07-30 14:37:05 +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
Simon Stone
9a8acd5752 Merge "FGJ-4 split java fabcar into separate classes" into release-1.4 2019-07-25 12:27:31 +00: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
andrew-coleman
c57f10f5f6 FGJ-4 commercial paper client sample
commercial paper sample for Java Gateway SDK (client app)

Change-Id: I80c6b9dbc36631004903244a20e6a492138c7751
Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>
2019-07-24 10:17:55 +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
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
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