Commit graph

651 commits

Author SHA1 Message Date
Bret Harrison
524ee2d63f Have the submitTransaction look at the results of submit.
The results of the submit must be returned by the chaincode.

Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2020-10-22 14:00:28 -04:00
nikhil550
15740deec1
Include link to external chaincode builder doc (#356)
Signed-off-by: Nikhil Gupta <ngupta@symbridge.com>
2020-10-19 20:05:52 +02:00
nikhil550
d081d0cd3f
update high througput sample to use deployCC script (#353)
Signed-off-by: Nikhil Gupta <ngupta@symbridge.com>
2020-10-18 19:50:39 +02:00
nikhil550
d82adf3e75
Fix go SDK bug and enable go SDK test (#352)
Signed-off-by: NIKHIL E GUPTA <ngupta@symbridge.com>
2020-10-16 11:28:18 -04:00
Arnaud J Le Hors
d7abc1edeb Add Token samples to README
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2020-10-14 08:12:11 -04:00
Arnaud J Le Hors
949bd9095b Fix token-account-based README terminal 2 setup
The user's PATH must be set on the first use of Terminal 2 for the
call to the fabric-ca-client command to succeed. The current README
only sets it later. This fix changes that.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2020-10-14 08:10:21 -04:00
Arnaud J Le Hors
cb42df6d7a Fix token-utxo-based README terminal 2 setup
The user's PATH must be set on the first use of Terminal 2 for the
call to the fabric-ca-client command to succeed. The current README
only sets it later. This fix changes that.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2020-10-14 08:10:01 -04:00
denyeart
882218af0f
Add UTXO token sample (go chaincode) (#319)
Add a UTXO token sample go chaincode, as well as an associated readme tutorial.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2020-10-14 08:58:24 +02:00
denyeart
fa0529c393
Add account-based token sample (go chaincode) (#318)
Add an account-based token sample go chaincode, as well as an associated readme tutorial.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2020-10-14 08:26:38 +02:00
Sijo Cherian
e7189fc62a bugfix: asset type field name in couchdb index def
Signed-off-by: Sijo Cherian <sijo@ibm.com>
2020-10-12 16:27:17 -04:00
nikhil550
c18a59ceaa
Replace private data readme with link to tutorial (#346)
Signed-off-by: Nikhil Gupta <ngupta@symbridge.com>
2020-10-12 20:01:59 +02:00
Gaurav Giri
a432e7d70c
add setStateBasedEndorsementNOutOf for typescript chaincode (#330)
Signed-off-by: Gaurav Giri <girigaurav@gmail.com>
2020-10-12 16:07:15 +02:00
NIKHIL E GUPTA
6d196bd9df Move off chain data samples to basic chaincode
Signed-off-by: NIKHIL E GUPTA <ngupta@symbridge.com>
2020-10-07 03:20:07 -04:00
NIKHIL E GUPTA
327e3a78aa Remove restart mode and add mode specific help text
Signed-off-by: NIKHIL E GUPTA <ngupta@symbridge.com>
2020-10-07 03:03:00 -04:00
nikhil550
75e3be1137
Remove instantiate comment (#343)
Signed-off-by: NIKHIL E GUPTA <ngupta@symbridge.com>
2020-10-03 07:53:52 +02:00
nikhil550
22393b629b
Link to rebased private data tutorial (#342)
Signed-off-by: Nikhil Gupta <ngupta@symbridge.com>
2020-09-25 14:09:10 +02:00
GeonWoo Kim
7f6fa7ce0c
Fix Error message application-go (#341)
[FAB-18236]
* fix Error message
* add additional logs to transaction

Signed-off-by: KIM GEONWOO <kgw8919@gmail.com>
2020-09-22 11:57:14 +02:00
Kestutis Gudynas
a461ff581e
Dependencies updated (#336)
Signed-off-by: Kestutis Gudynas <44440041+kemi04@users.noreply.github.com>
2020-09-18 12:34:34 +01:00
nikhil550
ed598f733b
Update help text for colors on mac (#337)
Signed-off-by: NIKHIL E GUPTA <ngupta@symbridge.com>
2020-09-17 14:27:21 -04:00
dependabot[bot]
f497793e57
Bump yargs-parser from 13.1.1 to 13.1.2 in /fabcar/javascript (#328)
Bumps [yargs-parser](https://github.com/yargs/yargs-parser) from 13.1.1 to 13.1.2.
- [Release notes](https://github.com/yargs/yargs-parser/releases)
- [Changelog](https://github.com/yargs/yargs-parser/blob/master/docs/CHANGELOG-full.md)
- [Commits](https://github.com/yargs/yargs-parser/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-09-16 15:20:28 -04:00
user00000001
3d2875c180
Fixed script bugs "SendTransaction failed: orderers is nil". (#326)
Signed-off-by: jiangyunbin <yunbin.jiang@anchain.ai>

Co-authored-by: jiangyunbin <yunbin.jiang@anchain.ai>
2020-09-16 10:48:39 -04:00
Nikhil Gupta
5f04e3f3af Update chaincode readme table
Signed-off-by: Nikhil Gupta <ngupta@symbridge.com>
2020-09-15 14:40:14 -04:00
nikhil550
5b7f2fcae8
Remove chaincode dev sample (#314)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-09-15 15:48:16 +02:00
nikhil550
aaaf1ba59b
Replace waiting period (#331)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-09-15 15:35:38 +02:00
IKEGAWA. Koshi
c2e6c9f46e
Fix help messages (#332)
Signed-off-by: ikegawa-koshi <koshi.ikegawa.mf@hitachi.com>
2020-09-15 08:55:36 -04:00
nikhil550
c8703df425
Update main readme for new applications (#329)
Signed-off-by: Nikhil Gupta <nikhilg550@gmail.com>
2020-09-11 09:32:47 -04:00
Bret Harrison
fdea4f0f89 Add secured agreement javascript application
Add the asset-transfer-secured-agreement javascript application
and have it run during CI.

Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2020-09-10 11:27:23 -04:00
Bret Harrison
0bc6f89cf2 Add SBE javascript application
Add in a javascript application to show the state-based-endorsement
specific type of operations

Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2020-09-10 11:26:21 -04:00
nikhil550
d43b7b5e64
Readme updates (#323)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-09-03 10:43:18 +02:00
Gaurav Giri
f9679ed9c9
Demonstrate NoutOf policies may be set for SBE (#316)
Signed-off-by: Gaurav Giri <girigaurav@gmail.com>
2020-09-02 14:08:07 -04:00
Sangwon Hong
8df641f10d
correct the link to the correct URL (#320)
Signed-off-by: Sangwon Hong <qpakzk@gmail.com>
2020-09-01 17:02:15 -04:00
Chris Gabriel
521d4b5873
Update script artifacts removal to reference basic.tar.gz and remove fabcar (#317)
Signed-off-by: Chris Gabriel <chris_gabriel_98@yahoo.com>

udpate artifact removal to include all .tar.gz

Signed-off-by: Chris Gabriel <chris_gabriel_98@yahoo.com>
2020-08-31 14:51:43 -04:00
Rijul Aggarwal
85320a8131
Readme links fix - point to latest (#315)
Signed-off-by: Rijul Aggarwal <rijul.aggarwal@ibm.com>

Co-authored-by: Rijul Aggarwal <rijul.aggarwal@ibm.com>
2020-08-29 18:03:25 +02:00
Kyohei Shimozato
b1471ef850
Fix duplicate code: asset-transfer-basic/application-go (#313)
Signed-off-by: zatton <ou4ei1@gmail.com>
2020-08-28 09:40:36 -04:00
Naser Mirzaei
eb88315107
add utils.sh and colorize messages (#310)
* add utils.sh and colorize messages

Signed-off-by: Naser Mirzaei <nasermirzaei89@gmail.com>

* rename utils to scriptUtils

Signed-off-by: Naser Mirzaei <nasermirzaei89@gmail.com>
2020-08-27 16:43:19 -04:00
Sijo Cherian
c1424748b0
Asset transfer private-data go-chaincode - Add unit tests (#290)
* Adding golang application for asset-transfer-basic sample. (#211)

Signed-off-by: Chongxin Luo <Chongxin.Luo@ibm.com>

Improved private data Go Chaincode in idiomatic go.

Adding go chaincode unit tests

Signed-off-by: Sijo Cherian <sijo@ibm.com>

* Added unit tests for query-asset chaincode functions

Signed-off-by: Sijo Cherian <sijo@ibm.com>

* Improved README

Signed-off-by: Sijo Cherian <sijo@ibm.com>

* Added unit tests for query-asset chaincode functions

Signed-off-by: Sijo Cherian <sijo@ibm.com>

* Fixed json.Marsal usage per review comments, Improved DeleteAsset validation

Added owner collection check for DeleteAsset chaincode
JS app now demos a new expected error on DeleteAsset by a non-owner org

Signed-off-by: Sijo Cherian <sijo@ibm.com>

Co-authored-by: Dereck <Chongxin.Luo@ibm.com>
Co-authored-by: Sijo Cherian <sijo@ibm.com>
2020-08-25 10:04:03 -04:00
Gaurav Giri
67811efc92
Smart Contract using SBE implemented in Java (#302)
* asset smart contract using sbe implemented in java

Signed-off-by: Gaurav Giri <girigaurav@gmail.com>

* add sbe chaincode to ci

Signed-off-by: Gaurav Giri <girigaurav@gmail.com>
2020-08-25 10:03:28 -04:00
Paul
94faa34930 Fixed code review items 2020-08-21 16:26:35 -04:00
Paul
69b96f85e0 Added javascript chaincode unit tests for asset-transfer-basic
Signed-off-by: Paul <pksingh8878@gmail.com>
2020-08-21 16:26:35 -04:00
Naser Mirzaei
be3ce853dc hide set +x from output
Signed-off-by: Naser Mirzaei <nasermirzaei89@gmail.com>
2020-08-21 13:03:30 -04:00
David Enyeart
b3bc39ae5f Re-enable CI tests for asset-transfer-private-data JS app
Re-enable CI tests for asset-transfer-private-data JavaScript application.

Also re-add the error when private asset details are not found in the collection,
so that the CLI instructions work as desired, and to demonstrate error
handing in the client application.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2020-08-20 16:05:42 -04:00
Dereck
8bb870f930
Fix minor issues related to asset-transfer-basic application-go (#291)
* added additional logs to application.
* minor fixes

Signed-off-by: Chongxin Luo <Chongxin.Luo@ibm.com>
2020-08-20 15:40:18 -04:00
Arnaud J Le Hors
5173e73e7b Improve basic asset transfer external chaincode detect script
This change makes the way the type property is extracted from the
metadata.json file much more robust, and therefore sets a better
example.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2020-08-20 12:36:30 -04:00
nikhil550
fdebe1f2e6
Update sbe transfer sample readme (#304)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-08-19 12:50:33 -04:00
Chris Gabriel
9963449387 Update README table to reflect addition of Go application
Signed-off-by: Chris Gabriel <chris@hyperchainlabs.com>
2020-08-16 23:13:03 -04:00
Brett Logan
11c05fa612 Add missing apps and chaincodes to CI
Adds the apps and chaincodes to linting and testing
CI that weren't added before.

Linting issues were corrected where necessary to make CI pass.

The Basic-Go application and Private-Javascript application
are currently disabled pending fixes currently being worked on.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-08-16 23:11:24 -04:00
denyeart
8f180cd5a3
Update asset-transfer-basic external chaincode readme (#300)
Minor clarifications to external chaincode readme.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2020-08-15 09:49:06 +02:00
Arnaud J Le Hors
0bfdecd736 Add chaincode-external for asset-transfer-basic sample.
Improve on the initial PR to expand on the README with detailed
information on how to run the external chaincode in a container
on the test network and use the node application against it.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2020-08-14 15:05:00 -04:00
Sijo Cherian
36a2d3a7d0
Switched private data JS app to commons util (#294)
* Switched private data JS app to commons util

Reusing JS app & ca utils
Refactored for Org1 & Org2
assettransfer-basic JS app update for commons util refactor

Signed-off-by: Sijo Cherian <sijo@ibm.com>

* fixed assettransfer-ledgerqueries & private usage of commons util refactor

Signed-off-by: Sijo Cherian <sijo@ibm.com>

Co-authored-by: Sijo Cherian <sijo@ibm.com>
2020-08-13 08:22:05 -04:00
Bret Harrison
b92d61d5cf FIx ledger queries package.json
Update the package.json to indicate the correct sample

Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2020-08-13 05:36:33 -04:00