Commit graph

406 commits

Author SHA1 Message Date
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
Matthew Sykes
1d3e267bbd Redirect samples to fabric-{chaincode,protos}-go
FAB-16401 #done

Change-Id: I9e6c3857cf1842ccf43d7fa0d25ff64dbeae12d0
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
2019-08-23 17:25:16 +00:00
Brett Logan
398a5b1a1d [FABCI-394] Remove AnsiColor Wrapper
Signed-off-by: Brett Logan <Brett.T.Logan@ibm.com>
Change-Id: I51158ccf006ec7be9c0b4506a4902f023c845a16
2019-08-19 23:30:14 +00:00
Arnaud J Le Hors
72ecf45088 Merge "[FAB-16310] Vendor Go dependencies in all samples" 2019-08-15 16:51:49 +00:00
Arnaud J Le Hors
82d886b1b4 Merge "[FAB-16285] Update blacklisted versions in BYFN" 2019-08-15 16:48:19 +00:00
Arnaud J Le Hors
08e980080a Merge "[FAB-16284] Remove E2E file and -f option from BYFN" 2019-08-15 16:48:00 +00:00
Arnaud J Le Hors
1fb272473d Merge "[FAB-16277] Update BYFN w/ Raft ports in Docker network" 2019-08-15 16:42:33 +00:00
Simon Stone
ce154e044b [FAB-16310] Vendor Go dependencies in all samples
All samples that deploy Go chaincode must now vendor
their dependencies before deployment, due to changes
in FAB-5177 which stop the shim being available at
deployment time. This CR adds the command:

"GO111MODULE=on go mod vendor"

... to all scripts/readmes as appropriate.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: If0a2cc3a20dc943917d8325a8905427a79eb2400
2019-08-15 11:44:00 +01:00
Simon Stone
6ea7c71c6c [FAB-16285] Update blacklisted versions in BYFN
Update the blacklisted versions in BYFN so that
BYFN from Fabric v2.0 samples refuses to work
with binaries and Docker images from Fabric v1.x.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I7fceb7f2b7635830ada35e2e47988d84b9ee14c3
2019-08-12 17:43:35 +01:00
Simon Stone
86cd831f93 [FAB-16284] Remove E2E file and -f option from BYFN
The docker-compose-e2e-template.yaml file and generated
docker-compose-e2e.yaml file should not be used any more,
and should be removed. The associated Docker Compose
file argument (-f docker-compose-e2e.yaml) should also
be removed.

Users wishing to deploy BYFN with a CA should use the new
-a option, and we should probably just make that the default
anyway.

There are associated documentation changes required for
this which I will do in another CR.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: Ie7fc0b809b44cbb2a7d55865ce8f3e887e0e7c58
2019-08-12 17:33:27 +01:00
Will Lahti
0063abed2a Update stale script name in interest rate swaps
FAB-16283 #done

Change-Id: I0db01dbceaa9a3f81703a9194167636a6b47bcac
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
2019-08-12 12:02:33 -04:00
Simon Stone
3907507981 [FAB-16277] Update BYFN w/ Raft ports in Docker network
Update the Raft ordering nodes to use the same ports
inside the Docker network as they are mapped to outside
of the Docker network (7050, 8050, 9050, 10050, 11050).

This enables applications to work using service
discovery, whether those applications are running inside
or outside the Docker network.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I40b24653d76b6e60c73b754cd7e1544c333e0021
2019-08-12 16:12:09 +01:00
Simon Stone
5d8f287c40 Merge "[FAB-14813] Channel event sample in fabric-samples" 2019-08-09 08:04:25 +00:00
Chris Elder
33b0065d69 [FAB-14813] Channel event sample in fabric-samples
Add a channel event handler sample to master and
update for lifecyce.


Change-Id: I5420ddc7070dbee785218ce5960f7604ac799f90
Signed-off-by: Chris Elder <chris.elder@us.ibm.com>
(cherry picked from commit 1efd213110)
2019-08-08 20:12:35 +00:00
Arnaud J Le Hors
4ff4105ba1 Merge "[FAB-16198] Run "go mod vendor" for FabCar Go contract" 2019-08-08 17:54:46 +00:00
Arnaud J Le Hors
977ba9ff28 Merge "[FAB-16132] Remove Kafka consensus from BYFN" 2019-08-08 17:42:59 +00:00
Simon Stone
a3dc349276 Merge "[FAB-15213] Update Commercial Paper for Java" 2019-08-08 16:49:54 +00:00
Arnaud J Le Hors
33b43b6550 Merge "[FAB-16232] Remove FabToken sample" 2019-08-08 13:37:07 +00:00
Simon Stone
b62d5bd77b [FAB-16132] Remove Kafka consensus from BYFN
Remove Kafka as a consensus mechanism option
in BYFN, including all related configuration.

Users wishing to configure Kafka (not best
practice) in Fabric v2.0 can consult the
Fabric v1.4 and earlier samples.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I3bbffc876a6b64831cb6b2bdfac28a88cc013bdf
2019-08-08 13:07:27 +01:00
Matthew B. White
9b1452508f [FAB-15213] Update Commercial Paper for Java
Update with Java Contract

Change-Id: Iced5568a248c1474ae4b6fb0352d23e49ebfc252
Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>
Signed-off-by: James Taylor <jamest@uk.ibm.com>
2019-08-07 11:18:37 +01:00
Simon Stone
4158877505 [FAB-16232] Remove FabToken sample
The FabToken sample needs to be removed, as the FabToken code
itself is being removed/disabled by Angelo De Caro due to it
not being included in Fabric v2.0. Additionally, the FabToken
sample is subject to sporadic CI failures, which we are trying
to clean up.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: Id434d384493f030d2407ca2f9d8687b0681a3723
2019-08-06 09:14:39 +01:00
Simon Stone
b6380cc88c [FAB-16198] Run "go mod vendor" for FabCar Go contract
FAB-15782 added go.mod files for versioned dependencies,
but "go mod vendor" is never run before deploying the
FabCar Go contract either by the user or in CI.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I958d426ca72938a2051bf95d6ecc4c6e3cd1d7b2
2019-08-02 15:48:48 +01:00
Simon Stone
639848a31d [FAB-16197] Add connection profiles to .gitignore
Connection profiles are now generated during BYFN
execution, and should not be tracked via Git. Also,
the remaining connection profiles for Org3 need to
be removed as they are no longer used/valid.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: Ifb76e2a183643a26e95781b455f8c42fc2935928
2019-08-02 14:30:05 +01:00
Simon Stone
3996db59dc [FAB-12219] abstore node -> javascript
Rename the abstore node directory as the sample code
within is JavaScript, and we are planning to add a
TypeScript version as well.

This change also requires updates to BYFN to reflect
the renamed directory.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I1cd554c6598ac7cc71e2b0c65ab541cfaa477354
2019-08-02 11:22:56 +01:00
Simon Stone
14ac271c63 [FAB-12219] marbles02 node -> javascript
Rename the marbles02 node directory as the sample code
within is JavaScript, and we are planning to add a
TypeScript version as well.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I423c8cf78fa16be057f762316e8b3d60b73df7ba
2019-08-02 10:07:31 +01:00
Simon Stone
13f16e5d6d [FGJ-4] CI tests for FabCar Java sample
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I2b28c69a2f3ec0e3d87252ef4a585b4a46fddcbd
2019-07-30 17:23:08 +01:00
Simon Stone
81be9da421 Merge "[FAB-15625] Add UT for Simple Asset Chaincode" 2019-07-30 14:11:49 +00:00
andrew-coleman
171a7d2275 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>

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>

FGJ-4 add license header to fabcar java sample

Change-Id: Ic658fe3bdece9875ca3ceaf28d94c5fb48879083
Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>
2019-07-30 14:07:14 +01:00
Tatsuya Sato
868f9d01ca [FAB-15625] Add UT for Simple Asset Chaincode
This patch adds unit test for chaincode/sacc.

The positive test cases are aligned with the manual testing procedures
described in `fabric/docs/source/chaincode4ade.rst`.

FAB-15625 #done

Patch-set #4: adjust to new shim Mockup location

Change-Id: Ic3625e885f6e49507859af7d5f0bfa136eb7a757
Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2019-07-30 12:56:06 +00:00
Simon Stone
597d1508e1 [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: I87b7edf477064b79f449f618f48902b9495e7d4a
2019-07-30 12:03:18 +01:00