Commit graph

536 commits

Author SHA1 Message Date
Ry Jones
33f349a5f5 Remove Stalebot
Signed-off-by: Ry Jones <ry@linux.com>
2019-11-04 22:44:53 -05:00
Ry Jones
bc72f3e3a6 Remove Stalebot
Signed-off-by: Ry Jones <ry@linux.com>
2019-11-04 22:43:20 -05:00
Ry Jones
0e200ab61e
Merge branch 'master' into FAB-16284-remove-E2E-file-BYFN 2019-10-28 01:02:51 -07:00
Ry Jones
ce0d06f599
Merge branch 'release-1.4' into release-1.4 2019-10-28 01:01:47 -07:00
Arnaud J Le Hors
e4f147f396
Merge pull request #71 from hyperledger/samples_stalebot_1.4
Cherrypick stalebot settings from master
2019-10-27 17:21:52 +01:00
Arnaud J Le Hors
c4d8bb74cf
Merge pull request #70 from hyperledger/samples_stalebot
Change stalebot settings
2019-10-27 17:20:21 +01:00
Ry Jones
99657d19c7
Merge branch 'release-1.4' into release-1.4 2019-10-27 09:04:54 -07:00
Brett Logan
797b991b4f Change stalebot settings
Signed-off-by: Brett Logan <Brett.T.Logan@ibm.com>
2019-10-26 11:52:34 -04:00
Brett Logan
6af43bfdab Change stalebot settings
Signed-off-by: Brett Logan <Brett.T.Logan@ibm.com>
2019-10-26 11:51:16 -04:00
Arnaud J Le Hors
48804014d3 [FAB-16284] Remove E2E file and -f option from BYFN
Remove leftover call to removed ReplacePrivateKey function which
makes calling ./byfn.sh up fail if cryptogen hasn't been run first.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2019-10-25 22:41:38 +02: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
Simon Stone
fe96f60311 [FAB-16850] Set up CI with Azure Pipelines
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I3821a329ec5eb439ce0f27cfbc71b28e6b0b8a09
2019-10-17 09:53:11 +01:00
Simon Stone
81aabf4c0b [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
2019-10-16 17:12:48 +01: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
Simon Stone
a42b858bc4 Update FabCar to reflect wallet API changes
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I845aa7af376b9a21da9f285079c025c71c43a2cf
2019-10-07 05:18:16 -04:00
Simon Stone
890f9eab9f [FAB-16713] Fix npm audit warnings
Also add .gitignore files for abstore/marbles02, as these are
currently missing.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I9f9da3e5289a275dd26c1021ea8de80def605e36
2019-10-07 04:16:39 -04:00
David Enyeart
e48e804828 [FAB-16776] Move BYFN up to V2_0 capabilities
Using V2_0_0 capabilities will turn on identification of admins
via node OU, and will fix the failing sample since cryptogen
is now setup to generate admins via node OU.

Change-Id: I30ff651a112bd88c93f6563f5e4414f8d2c6693e
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2019-10-06 16:30:19 -04: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
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
Ry Jones
7b65a25a86 [IN-68] Add default GitHub SECURITY policy
Signed-off-by: Ry Jones <ry@linux.com>
Change-Id: Ie805816e929f4449689214c74964b71eac56e31d
2019-09-25 10:22:26 -07:00
Simon Stone
333dbd0baa Merge "[FAB-16668] fabcar chaincode modify console output" 2019-09-24 16:10:54 +00:00
bjzhang03
408e0e873c [FAB-16619] Fix the policy warning
This fixes #FAB-16619

Change-Id: I251d10bc9dc9baf4f7e7d20cc11a34703baffc52
Signed-off-by: bjzhang03 <bjzhang03@foxmail.com>
(cherry picked from commit 7e8edb3189)
2019-09-24 13:09:48 +00:00
SteveKIM
670d446139 [FAB-16668] fabcar chaincode modify console output
Signed-off-by: SteveKIM <khktoto@gmail.com>
Change-Id: I6f549c9ed6e3142b2476d1cd8674d2a6d453668f
2019-09-24 13:08:20 +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
Simon Stone
f2939e29c6 [FAB-6415] Java 11 support for Commercial Paper sample
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I3de1927a67723044899dce7ec22d4e46e4c6b944
2019-09-24 09:41:02 +01:00
Simon Stone
3d19014bd7 [FAB-6415] Java 11 support for FabCar sample
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I97cd3ab48f6f2fe828c3328adfaf706be5124387
2019-09-24 09:41:02 +01:00
Simon Stone
e2b7cb7464 [FAB-6415] Java 11 support for abstore sample
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: Ie66fc453cba72dee4ad84b5d1e77feb64a37f678
2019-09-24 09:41:02 +01:00
Simon Stone
db48612180 [FAB-6415] Increase chaincode execute timeout
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I553f4cba445c5c93bb4c04214e37eed88f664d77
2019-09-24 09:40:56 +01:00
Matthew White
7010c503ac Merge "[FAB-16607] Update FabCar to reflect CC updates" 2019-09-19 13:01:35 +00:00
Simon Stone
521a7ffc4a [FAB-16607] Update FabCar to reflect CC updates
Node.js CC:
As a result of using the new protobufjs library, certain
external APIs have changed in the Node.js chaincode. The
samples need to be updated to use these new APIs.

Java CC:
As a result of moving to Java 11, we hit this issue:
https://github.com/gradle/gradle/issues/8286
The sample needs to be updated to specify the absolute
path to checkstyle's suppression.xml.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I4db886b3feff46d165e05a7eda624230b65f9cbe
2019-09-19 13:26:51 +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
Dongming
c13a5ec8f6 [FAB-16528] marbles private chaincode sync up
This CR is part 2 of porting changes in marbles
private in fabric/integration by FAB-15894 back
to fabric-samples

Signed-off-by: Dongming <dongming@ibm.com>
Change-Id: Ic823bdf4c3c571f43b4700452c50fd4283d35262
2019-09-11 12:35:25 -04:00
Dongming
3fad853c15 [FAB-16528] marbles private chaincode sync up
This CR is to port minor changes made in marbles
private in fabric/integration by FAB-15894 back
to fabric-samples.

Signed-off-by: Dongming <dongming@ibm.com>
Change-Id: I3d729f0d692dbd24e11c1cce45233eda5ddb4831
2019-09-06 12:49:22 -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
Simon Stone
86ff0e6581 Merge "[FAB-16362] adding chaincode excution comments" 2019-09-06 12:11:26 +00:00
Simon Stone
2bd54352dd Merge "[FAB-16489] Add CODEOWNERS" 2019-09-02 08:49:55 +00:00
Ry Jones
8b9b82f747 [FAB-16489] Add CODEOWNERS
Signed-off-by: Ry Jones <ry@linux.com>
Change-Id: I3727040fe1d8c188c20a84804acb2709288bdf41
2019-08-31 19:05:45 +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
Ry Jones
a6ce915106 [FAB-16487] Update eslint
Signed-off-by: Ry Jones <ry@linux.com>
Change-Id: I69233df8716f0bc081b67c771fb7eeaac6fc9d52
2019-08-30 12:09:52 -07:00
jaehyun
48082cfa95 [FAB-16362] adding chaincode excution comments
adding chaincode excution comments

Signed-off-by: jaehyun <jaehyun@lgcns.com>
Change-Id: I61ce32561f68fb8db8e0dc3f0d18b0564aaafb70
2019-08-30 10:28:39 +09:00
rthatcher
1d379f341d [FAB-16474] marbles02 chaincode error
Signed-off-by: rthatcher <robert.thatcher@uk.ibm.com>
Change-Id: I72d857b2fe905cbb75e33b76b1ac838e83e6f756
2019-08-29 16:05:50 +01:00
Simon Stone
18712ca8f6 [FAB-16133] Remove Solo consensus from BYFN
A Solo ordering node offers no benefits over
a single node Raft ordering node. Raft is the
best practice for Fabric v2.0, and should be
the only option in the BYFN sample going
forwards.

This CR removes Solo and the consensus related
options from BYFN, and always uses Raft.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I686cb68d8bc8fc9a231a0fa680263175451f2820
2019-08-27 10:00:07 +01: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
91c720a7ff [FAB-16390] Added filter for invalid transactions
Signed-off-by: Varun Agarwal <varunagarwal315@gmail.com>
Change-Id: Idb6c57e047bba9a176b312f86d05c2ee21aeb175
(cherry picked from commit f86ec95726)
2019-08-25 19:09:06 +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