Commit graph

31 commits

Author SHA1 Message Date
Arnaud J Le Hors
2e3683c419
Add missing Copyright in some files (#163)
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2020-05-19 15:50:48 +01:00
heatherlp
6f853b56a4 FABCAG-27 Update fabric-samples to use latest contract-api-go@v1.1.0
Signed-off-by: heatherlp <heatherpollard0@gmail.com>
2020-05-01 09:47:36 -04:00
Hongbin Mao
cedb74dea3
add miss checksum (#168)
Signed-off-by: hello2mao <hello2mao@gmail.com>
2020-04-27 12:59:24 +02:00
denyeart
11e4c23a35
Update samples to use v2.0 or later dependencies (#161)
Update application and chaincode dependendencies to use v2.0 or
later versions in package.json, build.gradle, pom.xml files.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2020-04-17 14:29:37 +02:00
Stefan Obermeier
5e5d2c8e01
Update java chaincode to be compatible with doc and other implementations (#149)
* Use numbers without leading zeroes for key

Signed-off-by: Stefan Obermeier <scray@stefan-obermeier.de>

* Update chaincode to be compatible with doc.

E.g. Return key of the queried record

Signed-off-by: Stefan Obermeier <scray@stefan-obermeier.de>

* Clean up

Use always whitespaces to indent the start of the line
Remove unnecessary whitespaces

Signed-off-by: Stefan Obermeier <scray@stefan-obermeier.de>
2020-04-07 09:09:10 +02:00
James Taylor
db69c6ff19
Add fabcar external service sample (#136)
Add sample which can be used with the builder scripts described in
the "Chaincode as an external service" documentation

Signed-off-by: James Taylor <jamest@uk.ibm.com>
2020-03-20 15:06:01 +00:00
Andrew Hurt
0df5ed9269
[FAB-17477] Update fabcar to use go api v1.0.0 (#116)
Signed-off-by: Andrew Hurt <andrew.hurt1@ibm.com>
2020-02-07 10:42:47 +00:00
Matthew B White
571733f7b9 [FAB-17447] Update to 2.0.0 Libraries
NodeSDK has not been released at 2.0.0 to date

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2020-01-29 00:26:12 -05:00
Brett Logan
4fe6a2507e [FABCI-482] Update Nexus URL's to Artifactory (#92)
Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-01-20 15:33:02 +00: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
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
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
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
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
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
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
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
James Taylor
750f937218 [FAB-15213] Add Java FabCar sample contract
Change-Id: I0ae40c2a02aea8293a348038e3e1bd02f7030509
Signed-off-by: James Taylor <jamest@uk.ibm.com>
2019-07-29 11:59:30 +00: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
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
David Enyeart
137327a009 [FAB-14162] Pin fabric-samples in master to "unstable"
Pin fabric-samples in master to "unstable" so that latest node modules get used by default.

Change-Id: I36df30cb108a350c8e59756ed0d2f03610eb1d73
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2019-02-12 13:08:22 -05:00
David Enyeart
9567985d29 [FAB-13407] Align fabric-samples with 1.4.0-rc2 release
Change-Id: If784ead9b35c89b874078fe3e87e702fd3be5953
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-12-20 17:11:36 -05:00
David Enyeart
6a7472e72e [FAB-13126] Align fabric-samples with 1.4.0-rc1 release
Change-Id: I2ff248e93cbac8747c322672f7a831ece597e116
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-12-12 07:55:08 -05:00
Simon Stone
445ccbc25a [FAB-12880] Move old prog model samples for FabCar
Move the old programming model samples for FabCar,
including the "node" (JavaScript!) chaincode sample
and the JavaScript application in the top level into
new subdirectories called "javascript-low-level".

We still want to keep these samples around for comparision
purposes, but most new developers should be using the new
samples built using the new programming model.

At the same time, update the startFabric.sh script
to output correct help information on how to run
the applications built using the new programming model
after starting the Fabric network and deploying the chaincode.

Change-Id: I1e3701737f105cba67f661bf893771ac8a3a0373
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-12-10 21:39:30 +00:00
Simon Stone
5c087f1443 [FAB-13046] Update TypeScript contract dependencies
The type definitions for the sinon module have been updated so that
they require TypeScript 3; TypeScript 3 has been out for a while, so
we should pick that up as well as updating all of the other dependencies.

Change-Id: Ia58e36158d83ed3cc5cad6353e164bfc2453a00a
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-11-29 11:51:28 +00:00
Simon Stone
4fb3b57e6b [FAB-12852] Add fabcar contract w/ new prog model (TS)
Add new FabCar contract sample using the new programming model, written
in TypeScript. Add the new contract sample alongside the existing one
written in the old programming model, which will be removed in a subsequent
change request.

Change-Id: I47e5f16b475c68f9a1c4752af2623f090fbf12c9
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-11-16 21:12:31 +00:00
Simon Stone
9facb4256b [FAB-12851] Add fabcar contract w/ new prog model (JS)
Add new FabCar contract sample using the new programming model, written
in JavaScript. Add the new contract sample alongside the existing one
written in the old programming model, which will be removed in a subsequent
change request.

Change-Id: Iea46b0a616dbd072b5bd7227ada827a26560f153
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-11-15 10:48:28 +00:00
nikklein
a0c1687ad8 [FAB-7487] Fix typo in node/fabcar.js
According to this tutorial http://hyperledger-fabric.readthedocs.io/en/latest/write_first_app.html
the function name is spelled changeCarOwner.

Renamed changeCarowner to changeCarOwner.

Change-Id: Ic32c76137e3686cbf951f846da0ef8c4c5d8986d
Signed-off-by: Nikita Klein <objcoding@gmail.com>
2017-12-29 11:57:22 +01:00
ratnakar
1961835674 [FAB-6870] Update node modules versions
fabcar uses 1.0.2 node modules changing it to unstable so that
latest node modules can be used on master branch

Change-Id: Ia9dc866931763760dd3cd7dbc5c7fd9a5de099be
Signed-off-by: ratnakar <asara.ratnakar@gmail.com>
2017-11-02 11:19:57 -04:00
ratnakar
44c204d8b6 [FAB-5898] porting samples to node.js chaincode
Fabric 1.1 supports javascript chaincode. This changeset
addresses porting of the golang chaincode to node.js
chiancode and the corresponding README files

Change-Id: Iae24e713f16ab3508fe0cc18ee062ffa412b8ba6
Signed-off-by: ratnakar <asara.ratnakar@gmail.com>
2017-10-15 21:12:11 -04:00
Jim Zhang
ca8fad3151 [FAB-5260] Update samples to v1.0.0
basic-network:
 - moved "crypto-config" to top-level and removed
   "network" folder
 - added generate.sh to re-gen crypto materials
 - docker-compose.yaml to ref v1.0.0 images
 - add CLI to docker-compose
 - start.sh to only start CA, orderer, peer and couch
 - startFabric.sh to run start.sh, then launch CLI
   for create channel, install, instantiate, invoke
fabcar:
 - moved chaincode to central chaincode folder
 - moved "creds" to top-level and removed "network"
   folder
 - changed to use the basic-network as the target
   and removed docker-compose.yaml and crypto-config
 - updated package.json to require v1.0.0 modules

- added missing license headers
- restructured to use a central chaincode subdirectory

Change-Id: Ic784d1cf55ea51da5155624f3c38275883de1dca
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
Signed-off-by: Nick Gaski <ngaski@us.ibm.com>
Signed-off-by: Jim Zhang <jzhang@us.ibm.com>
2017-07-12 09:07:39 -04:00