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

624 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Bret Harrison
f361386231 Add the javascript application for ledger queries 
Add the asset-transfer-ledger-queries javascript application.
Update the CI script to run it against go and javascript chaincode.

Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
 2020-08-11 22:32:34 -04:00
denyeart
8e2535ee65
Fix ledger queries chaincode-go InitLedger (#293) 
The InitLedger was not writing the composite key for the color index.
Therefore TransferAssetByColor was not working.

Now InitLedger will call CreateAsset which creates both the asset
and the color index entry.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
 2020-08-11 17:51:05 -04:00
Dereck
155a3e7e26
Adding golang application for asset-transfer-basic sample. (#211) 
Signed-off-by: Chongxin Luo <Chongxin.Luo@ibm.com>
 2020-08-10 10:49:04 -04:00
NIKHIL E GUPTA
026217db9a Add sbe to help text 
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
 2020-08-10 09:20:35 -04:00
denyeart
1d6d557570
Fix ledger queries sample - history and pagination (#288) 
Fix history query results.
Fix paginated query results.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
 2020-08-10 08:15:34 -04:00
denyeart
17dbe839f1
Updates to samples README (#287) 
Promote asset transfer as the primary set of samples.
Misc other updates to the README.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
 2020-08-10 08:12:59 -04:00
Gaurav Giri
02368e99b0 SBE Improvements and Referencing SBE in fabric-samples readme and test-network 
Signed-off-by: Gaurav Giri <girigaurav@gmail.com>
 2020-08-09 14:58:18 -04:00
Gaurav Giri
6e965ec55f fabric samples for state-based endorsement for chaincode typescript 
Signed-off-by: Gaurav Giri <girigaurav@gmail.com>
 2020-08-07 18:20:57 -04:00
tyanj
55c0b47952
[BUG] res=$? missing (#260) 
Signed-off-by: tyanj <653291675@qq.com>
Signed-off-by: Ry Jones <ry@linux.com>

Co-authored-by: Ry Jones <ry@linux.com>
 2020-08-07 20:22:24 +02:00
nikhil550
b9661a7ecc
Update samples readme for fabcar deprecation, new langagues (#284) 
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
 2020-08-07 19:25:32 +02:00
Titas
0031db5de2
Fix deployment of chaincode with higher version than 9 issue (#243) 
This script fails if chaincode version is higher than 9 as 'grep' does not match ex. version equal to '10'

Signed-off-by: Titas <titas.petravicius@gmail.com>
Signed-off-by: lehors <lehors@us.ibm.com>

Co-authored-by: Arnaud J Le Hors <lehors@us.ibm.com>
 2020-08-06 22:59:25 +02:00
harrisob
c0ffb1cffb
Restructure the basic javascript application to use common code. (#281) 
Use common code for reading a connection profile, enrolling the admin,
registering and enrolling a user, building a wallet, and
building a certificate authority client.

Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
 2020-08-06 22:07:54 +02:00
Sijo Cherian
e90554f4f8
JS App workflow for private-data asset transfer, Chaincode fixes (#252) 
* Adding JS App workflow, Bugfixes in Go Chaincode

Initial impl JS App workflow, Added 2 asset sample, with transfer & delete
Bugfixes: Bug fix in ReadTransferAgreement
Improved logging in Go Chaincode, Improved Chaincode error handling, checks for execution on orgs peer, bug fix, lint issues
use addDiscoveryInterest to scope policy, instead of setEndorsingOrganizations

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

* added js app to CI pipeline , and linting matrix

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

Co-authored-by: Sijo Cherian <sijo@ibm.com>
 2020-08-06 14:23:11 -04:00
r2roC
cb8e03b726
asset-transfer-ledger-queries java application. (#280) 
Running TestApp: gradle runApp

Signed-off-by: r2roC <arturo@IBM.com>
 2020-08-06 12:00:26 -04:00
Arnaud J Le Hors
42026e2fd4 Improve unmarshalling in asset-transfer-basic Go cc 
Although the current code works thanks to Go being quite
forgiving when it comes to pointers, it doesn't exhibit
the best coding style. This patch addresses this.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
 2020-08-06 11:12:56 -04:00
Dereck
e2817762f1
Add chaincode-external for asset-transfer-basic sample. (#234) 
Signed-off-by: Chongxin Luo <Chongxin.Luo@ibm.com>
 2020-08-06 02:12:12 +02:00
dependabot[bot]
21572f833f
Bump elliptic from 6.5.2 to 6.5.3 in /fabcar/javascript (#273) 
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-08-05 13:25:32 -04:00
aldredb
d2fb039ba5
Correct swap JSON payload in interest_rate_swaps example (#279) 
Corrected swap JSON payload so that the JSON object can be unmarshalled properly

Signed-off-by: Aldred Benedict <aldred@sg.ibm.com>
 2020-08-05 13:22:21 -04:00
r2roC
6e49a18d90
I removed some unnecessary comments that I left there by accident. (#278) 
I also capitalized 'Tom' as that is what the asset is initialized to.

Signed-off-by: r2roC <arturo@IBM.com>
 2020-08-04 19:45:47 -04:00
r2roC
86d5a50a7c
asset-transfer-basic java application. (#276) 
Matches format of js app.
Running TestApp: gradle runApp

Signed-off-by: r2roC <arturo@IBM.com>
 2020-08-04 17:05:45 -04:00
Chris Gabriel
1270c8418b
Fix typo in code comment (#275) 
Signed-off-by: Chris Gabriel <chris_gabriel_98@yahoo.com>
 2020-08-03 22:27:16 +02:00
r2roC
e51dfb9bce asset-transfer-basic Java CC. Adapted from fabcar. Unit tests are attached. Integration testing conducted using test network and asset-transfer-basic application-js. 
Signed-off-by: r2roC <arturo@IBM.com>
 2020-07-31 09:00:12 -04:00
Raghu Saxena
6de6c77f8d
Update addOrg3.sh (#271) 
Fixed a comment which said `Create Org1 Identities` to `Create Org3 Identities`
 2020-07-29 12:05:42 -04:00
Brett Logan
1c500ba30e Use Busybox to Remove Files and Folders 
We delete folders and files locally on the host system
today. If the user is not a super user the files can't
be deleted as they are created by a root user in the
containers. This change uses busybox to perform the
deletions instead so a root user can remove them.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
 2020-07-27 23:55:20 -04:00
Brett Logan
59613c7e91 Add Linters 
Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
 2020-07-27 23:51:51 -04:00
Brett Logan
e6184563ad Update CI For Asset Transfer 
Pushes the scripting logic into a standalone script
and adds tests for the applications which by side-effect
also test the invoke and query functions on the chaincode.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
 2020-07-27 23:51:51 -04:00
Brett Logan
4c3fe17310 Refactor GetAllAssets 
GetAllAssets uses getStateByRange which returns an iterator.
Refactored code to make use of the iterator as this code did
not function in its previous state

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
 2020-07-27 23:51:51 -04:00