Commit graph

574 commits

Author SHA1 Message Date
Brett Logan
bd38f9220b Capitalize Function Names
Short of creating a second application that calls
the lowerCase version of functions, since Go requires
the functions be exported, capitalizing them in the
Node and Typescript chaincode seems the simplest solution

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-27 23:51:51 -04:00
Brett Logan
06c42bf68b Clean up Node Application and Address Linting Issues
Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-27 23:51:51 -04:00
Brett Logan
73a62a6780 Clean up Node Chaincode and Address Linting Issues
Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-27 23:51:51 -04:00
Brett Logan
e31ecf3165 Decorate Typescript Chaincode
Add the contract-api specific annotations and
enable the experimental features.

Also properly format code according to the linter

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-27 23:51:51 -04:00
Brett Logan
66b4b2b86a Remove Typescript Application
As the typescript application shows no Fabric
specific features we have elected to remove it

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-27 23:51:51 -04:00
NIKHIL E GUPTA
d72be92feb private data readme edits
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-07-27 23:37:41 -04:00
r2roC
64f280a1f3 Update asset_transfer_ledger_chaincode.js
Standardized function names

Signed-off-by: r2roC <arturo@IBM.com>
2020-07-27 09:32:36 -04:00
r2roC
c2b6fcfd3f Standardized createAsset parameters, removed getAllAssets function, and changed transferAssetsBasedOnColor to match go-chaincode
Signed-off-by: r2roC <arturo@IBM.com>
2020-07-27 09:32:36 -04:00
r2roC
9a9a3d2683 Modfied .gitignore so that node_modules is the only addition to the root .gitignore
Signed-off-by: r2roC <arturo@IBM.com>
2020-07-27 09:32:36 -04:00
r2roC
1c5cf4383c Added new lines at the bottom of index.js and asset_transfer_ledger_chaincode.js. Modified node version in package.json. Modified error messages in the chaincode to all begin uppercase.
Signed-off-by: r2roC <arturo@IBM.com>
2020-07-27 09:32:36 -04:00
r2roC
666e61ec6e fixed a couple unused variable issues
Signed-off-by: r2roC <arturo@IBM.com>
2020-07-27 09:32:36 -04:00
r2roC
af81e1287f Javascript version of asset-transfer-ledger-chaincode.go
Tested using the test network
Adapted from marbles02

Signed-off-by: r2roC <arturo@IBM.com>
2020-07-27 09:32:36 -04:00
Chris Gabriel
fef45be995
Remove images folder from fabric-samples. (#266)
Signed-off-by: Chris Gabriel <chris_gabriel_98@yahoo.com>

Remove images from fabric-samples and move to docs.

Signed-off-by: Chris Gabriel <chris_gabriel_98@yahoo.com>
2020-07-25 19:43:22 +02:00
nikhil550
971af50cdf
Fix bugs in deployCC script (#265)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-07-23 23:36:33 -04:00
nikhil550
8c32a85f66
Update private data chaincode to use test network script (#249)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-07-23 14:17:50 -04:00
Arnaud J Le Hors
7771b4f216
Revert "Remove Typescript References (#258)" (#261)
This reverts commit 7a23d7872a.
2020-07-23 17:06:57 +02:00
Brett Logan
7a23d7872a
Remove Typescript References (#258)
As the Typescript examples are essentially just reiterations
of the same Javascript code, there is no benefit to having
providing examples in both languages. The functional code
was exactly the same in both languages. On the contrary it
meant we widened the surface of maitainence and thus we are
removing due to the limited benefit provided by the example
chaincode and applications.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-22 21:57:54 +02:00
stephyee
31cce9e330
Update secured asset sample tutorial link and remove README (#257)
Signed-off-by: Tiffany Harris <tiffany.harris@ibm.com>
2020-07-22 14:45:57 -04:00
nikhil550
6acc140671
Add asset transfer series documentation to Fabric samples README (#251)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-07-21 00:33:21 +02:00
Brett Logan
daa732d3d8 Revert "WIP (#253)"
This reverts commit d5ce443bee.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-20 13:18:45 -04:00
Brett Logan
d5ce443bee
WIP (#253)
* WIP

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>

* WIP 2

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-20 12:49:16 -04:00
Tiffany Harris
cad6b90383 Fix unmarshaling asset in ReadAsset()
Signed-off-by: Tiffany Harris <tiffany.harris@ibm.com>
2020-07-20 11:51:32 -04:00
Naser Mirzaei
12b07b40a9
use mkdir -p for create directories (#248)
Signed-off-by: Naser Mirzaei <nasermirzaei89@gmail.com>
2020-07-20 11:37:16 -04:00
nikhil550
f4c439ce8a
Add endorsement policy to chaincode deployment script (#247)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-07-17 08:58:19 -04:00
Sijo Cherian
b4ed9e5afd
Simplify asset-transfer-basic javascript application (#241)
* Improve asset-transfer-basic javascript app code by combining invoke & query.js

Adding a sample application workflow to demonstrate the chaincodes, similar to the WIP PR for basic go-application (https://github.com/hyperledger/fabric-samples/pull/211).
Simplify and document-in-code the app workflow of this sample, in a single app , instead of invoke & query setting up Gateway

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

improve javascript app code by combining invoke & query.js

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

reverted chaincode func signature

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

* create/updateAsset signature in sync with chaincode func change as in #227

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

* Tested with latest chaincode, Improved comments

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

Co-authored-by: Sijo Cherian <sijo@ibm.com>
2020-07-15 15:21:38 -04:00
Brett Logan
14e9ccf85b Remove QueryResult Type
There was no need for GetAllAssets to return a custom type,
it can simple return an array of all assets.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-15 13:22:56 -04:00
Brett Logan
c621ca9eb4 Fix constructQueryResponseFromIterator
constructQueryResponseFromIterator was returning a QueryResult
slice as opposed to an Asset slice.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-15 13:22:11 -04:00
Bret Harrison
1f27c327f3 Allow install of a chaincode
options on the network script to deploy chaincode
-ccn The name to be used as the deployed name and used as
     the short name of known chaincodes when the -ccp is not included.
   known short names
     'basic' - asset-transfer-basic
     'secure' - asset-transfer-secured-agreement
     'ledger' - asset-transfer-ledger-queries
     'private' - asset-transfer-private-data
-ccl the language of the chaincode
-ccv the version
-ccs the sequence
-ccp [optional] the path to the chaincode, when provided
     the -ccn will be the deployed name
-cci [optional] the chaincode function to call during deployment
     that will perform an initialization of the channel state
     required for this chaincode

Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2020-07-15 10:39:12 -04:00
Brett Logan
5f80da096c Refactor Asset Query Chaincode Into Idiomatic Go
Rewrites the chaincod in idiomatic Go and cleans up
the general implementation.

A future commit should push the chaincode logic itself
into a separate package as chaincode cannot be tested
when the logic is part of the main package.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-15 10:36:04 -04:00
Chris Gabriel
621a2c263e Fix param sequence for typescript invoke function.
Signed-off-by: Chris Gabriel <chris_gabriel_98@yahoo.com>
2020-07-12 17:29:06 -04:00
Chris Gabriel
e83aecfe0c Fix param sequence for javascript invoke function.
Signed-off-by: Chris Gabriel <chris_gabriel_98@yahoo.com>
2020-07-12 17:28:43 -04:00
Chris Gabriel
aa3ae32afb Fix param sequence in smartcontract
smartcontract_test.

Signed-off-by: Chris Gabriel <chris_gabriel_98@yahoo.com>
2020-07-12 12:12:32 -04:00
NIKHIL E GUPTA
09ebf1c1ce Initialize new private data asset transfer CC
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-07-11 08:04:37 -04:00
Brett Logan
a401bc92bc Refactor Asset Secured Chaincode Into Idiomatic Go
Rewrites the chaincode in idiomatic Go and cleans up
the general implementation.

A future commit should push the chaincode logic itself
into a separate package as chaincode cannot be tested
when the logic is part of the main package.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-11 07:53:45 -04:00
Acmefocus
59acacbef1
run fabcar go (#232)
* add go/runfabcar.sh

Signed-off-by: Acmefocus <107723772@qq.com>

* add set hosts and env in go

Signed-off-by: Acmefocus <107723772@qq.com>

* Update fabcar/startFabric.sh

Co-authored-by: Sijo Cherian <sijocherian@users.noreply.github.com>
Signed-off-by: Acmefocus <107723772@qq.com>

* Update startFabric.sh

delete  set  /etc/hosts

Signed-off-by: Acmefocus <107723772@qq.com>

* add environment variable DISCOVERY_AS_LOCALHOST

Signed-off-by: Acmefocus <107723772@qq.com>

Co-authored-by: Sijo Cherian <sijocherian@users.noreply.github.com>
2020-07-10 16:18:05 +01:00
r2roC
1249207afd Update asset_transfer_ledger_chaincode.go
Small off-by-1 bug fix.

Signed-off-by: r2roC <arturo@IBM.com>
2020-07-10 07:39:46 -04:00
Brett Logan
426cdf1f98 Add Tests and Mocks To Asset Transfer Chaincode
Many users raise questions on how to test chaincode. It used
to be much easier with the old shim, as they could directly
use the old mock stub in the shim. Now that it no longer exists
the fabcar example can provide an example of how to test chaincode.

Also worth noting is our current directory structure of our Go
chaincodes prevents the creation of mocks due to import cycles.
This change also pushes the chaincode logic down into a `chaincode`
package.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-10 05:59:22 -04:00
Brett Logan
a04db374aa Refactor Chaincode Into Idiomatic Go
Cleans up the code and pushes the smart contract
implementation down into a `chaincode` package.
This is in prep for implementing unit testing in the
chaincode, as you cannot mock code that is part of
the main package.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-10 05:59:22 -04:00
James Taylor
5fe1387a89
Fix java fabcar queryAllCars (#239)
Java chaincode still does not support open ended range queries

Signed-off-by: James Taylor <jamest@uk.ibm.com>
2020-07-09 17:32:08 +01:00
NIKHIL E GUPTA
df727853c8 Update tests for commercial paper
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-07-03 13:46:01 -04:00
NIKHIL E GUPTA
a1b7da9b5c remove link to BYFN in README
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-07-03 13:44:31 -04:00
denyeart
9291154f78
Remove gossip leader election config from samples (#223)
In Fabric v2.2, the gossip defaults are changed to make
peers org leaders instead of using leader election.
This change removes the config from the samples, so that
the samples simply inherit the new peer defaults.
This will simplify the sample configuration.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2020-07-02 15:37:15 -04:00
Dereck
1eafa98a6f
Add application-typescript to asset-transfer-basci (#221)
Signed-off-by: Chongxin Luo <Chongxin.Luo@ibm.com>
2020-07-02 13:43:48 -04:00
Dereck
fd98ec650a
Add filepath check for invoke (#222)
Signed-off-by: Chongxin Luo <Chongxin.Luo@ibm.com>
2020-07-02 13:36:47 -04:00
Brett Logan
8b54e14ee4 Use Official CouchDB 3.1 Image
Fabric 2.2 removes official support for CouchDB 2.x.
The migration to 3.1 was to address fsync issues
in the underlying storage implementation in Couch.

This change moves to CouchDB 3.1 which requires the
user to now set an admin identity at startup.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-02 09:56:30 -04:00
James Taylor
7154ed8629
Update fabcar java sample build (#219)
- Update gradle version
- Switch to application plugin
  (cc is started as an app not a lib, and java-library-distribution
  is still incubating)
- make sure tests and coverage checks are run before installDist

Signed-off-by: James Taylor <jamest@uk.ibm.com>
2020-07-01 17:12:11 +01:00
James Taylor
c0570df2f8
Fix fabcar Java chaincode test & coverage failures (#218)
Also updates queryAllCars to match other implementations

Signed-off-by: James Taylor <jamest@uk.ibm.com>
2020-07-01 11:25:08 +01:00
Dereck
2f58fb29c4
Adding NodeJS app for asset-transfer-basic sample. (#206)
Signed-off-by: Chongxin Luo <Chongxin.Luo@ibm.com>
2020-06-30 15:36:47 -04:00
nikhil550
adfef198df
FAB-18015 (#214)
Remove first network sample if Fabric 2.2

Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-06-26 12:36:29 -04:00
Chongxin Luo
a42bbba2c5 Adding chaincode-typescript to asset-transfer-basic sample.
Signed-off-by: Chongxin Luo <Chongxin.Luo@ibm.com>
2020-06-25 12:06:13 -04:00