epistemophiliac/fabric-samples
1
0
Fork 0
mirror of https://github.com/hyperledger/fabric-samples.git synced 2026-06-17 07:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
435 commits 20 branches 63 tags 635 MiB
Commit graph

435 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arnaud J Le Hors
a026a4ffbf Fixed typo (#90) 
Originally submitted as PR81 by https://github.com/ArkiZh

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
 2019-12-16 08:33:58 +00:00
Fábio Nogueira de Lucena
cdb0e8b40c TYPO (#89) 
magentocorp.sh instead of magnetocorp.sh

Signed-off-by: kyriosdata <fabio@inf.ufg.br>
 2019-12-16 07:22:39 +01:00
Matthew B White
94ac8b6050 Update to use beta levels of modules (#88) 
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
 2019-12-13 20:20:58 +00:00
Arnaud J Le Hors
b565448a70
Merge pull request #85 from nikhil550/testNetFixes 
Fix test network bugs for adding org3
 2019-12-13 15:49:50 +01:00
Arnaud J Le Hors
7b0534a70a
Merge pull request #87 from mbwhite/byfn-cc-name 
[FAB-16844] Correct BYFN CC name
 2019-12-13 15:32:17 +01:00
Matthew B White
d84863340c [FAB-16844] Correct BYFN CC name 
Correct chaincode name regexp in byfn.sh so it is not restricted
to one named chaincode.

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
 2019-12-13 13:53:35 +00:00
NIKHIL E GUPTA
73267e1f7f Fix test network bugs for adding org3 
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
 2019-12-12 12:34:59 -05:00
Arnaud J Le Hors
66ac1adcdf
Merge pull request #80 from nikhil550/FAB-17145 
[FAB-17145] Add test network to Fabric Samples
 2019-12-12 11:12:28 +01:00
NIKHIL E GUPTA
5d58254280 [FAB-17145] Add test network to Fabric Samples 
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
 2019-12-11 10:28:39 -05:00
Arnaud J Le Hors
28d357b814
Merge pull request #82 from satota2/FAB-17062 
[FAB-17062] Fix typos in Commercial Paper readme
 2019-12-04 07:20:55 +01:00
Tatsuya Sato
e9f2957afe [FAB-17062] Fix typos in Commercial Paper readme 
This patch fixes some typos in Commercial Paper readme.

Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
 2019-12-04 01:54:45 +00:00
Simon Stone
4c0cc56e01
Merge pull request #78 from awjh-ibm/fabcar-go 
[FAB-17139] Update fabcar go to new programming model
 2019-12-03 22:09:55 +00:00
Simon Stone
ac121774fc
Merge pull request #75 from hyperledger/dependabot/npm_and_yarn/commercial-paper/organization/magnetocorp/application/eslint-utils-1.4.3 
Bump eslint-utils from 1.4.0 to 1.4.3 in /commercial-paper/organization/magnetocorp/application
 2019-11-27 09:55:14 +00:00
Simon Stone
1b9749af3f
Merge pull request #77 from yeasy/FAB-17121 
[FAB-17121] Use new bootstrap config in orderer
 2019-11-27 09:54:46 +00:00
Baohua Yang
36694d08e5 [FAB-17121] Use new bootstrap config in orderer 
It includes two config changes in fabric recently:

* GenesisMethod --> BootstrapMethod
* GenesisFile --> BootstrapFile

Signed-off-by: Baohua Yang <yangbaohua@gmail.com>
Signed-off-by: Baohua Yang <baohua.yang@oracle.com>
 2019-11-26 11:41:19 -08:00
Andrew Hurt
429f087c5a
update fabcar go to new programming model 
Signed-off-by: Andrew Hurt <andrew.hurt1@ibm.com>
 2019-11-25 16:57:20 +00:00
Simon Stone
f1a86435a0
Merge branch 'master' into dependabot/npm_and_yarn/commercial-paper/organization/magnetocorp/application/eslint-utils-1.4.3 2019-11-15 09:42:38 +00:00
Simon Stone
118fe07e9e
Merge pull request #69 from lehors/FAB-16284-remove-E2E-file-BYFN 
[FAB-16284] Remove E2E file and -f option from BYFN
 2019-11-15 09:40:12 +00:00
dependabot[bot]
1467086f30
Bump eslint-utils 
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.4.0 to 1.4.3.
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.4.0...v1.4.3)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-11-14 16:27:21 +00:00
Simon Stone
3a8c3170ed
Merge branch 'master' into FAB-16284-remove-E2E-file-BYFN 2019-11-13 15:28:36 +00:00
Ry Jones
33f349a5f5 Remove Stalebot 
Signed-off-by: Ry Jones <ry@linux.com>
 2019-11-04 22:44:53 -05:00
Ry Jones
0e200ab61e
Merge branch 'master' into FAB-16284-remove-E2E-file-BYFN 2019-10-28 01:02:51 -07: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
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
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
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
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
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
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
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
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
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