Commit graph

977 commits

Author SHA1 Message Date
nikhil550
b0ea1f6488
Add events sample to readme (#381)
Signed-off-by: NIKHIL E GUPTA <ngupta@symbridge.com>
2020-11-26 20:15:56 +01:00
Nikhil Gupta
89a98e126b Update readme for auction sample
Signed-off-by: Nikhil Gupta <ngupta@symbridge.com>
2020-11-26 00:34:33 -05:00
Sijo Cherian
757b0419b7 Java chaincode for asset transfer events sample. Tested/Compatible with js application
Signed-off-by: Sijo Cherian <sijo@ibm.com>
2020-11-26 00:04:54 -05:00
Sijo Cherian
8c9fd980b9 go chaincode now sets the Asset owner as client identity certificate string (instead of base64 str)
go chaincode now sets the Asset owner as client identity certificate string (instead of base64 str)
Reason for the update: "GetClientIdentity().GetID()" api in go chaincode returns base64 string, while same api in java chaincode returns the same data as string
go & java chaincode sets same owner string
updated js app verify method

Signed-off-by: Sijo Cherian <sijo@ibm.com>
2020-11-25 22:40:04 -05:00
Sijo Cherian
a80dc201ad java chaincode for private-data sample
Java chaincode that can be deployed via test-network, with shortname 'private'
Unit test for core transactions
Bugfix for QueryAsset txn function signature
Incorporated PR feedback

Signed-off-by: Sijo Cherian <sijo@ibm.com>
2020-11-25 22:17:30 -05:00
denyeart
e29ee4d7d9
Revert "Mount configuration files (#376)" (#380)
This reverts commit 0998528b3e.
2020-11-25 11:36:11 -05:00
nikhil550
0998528b3e
Mount configuration files (#376)
Signed-off-by: Nikhil Gupta <ngupta@symbridge.com>
2020-11-24 11:04:29 +01:00
Arnaud J Le Hors
b1e848e93c
Fix link anchor "here" in sample README (#378)
This is a pet peeve of mine: 'here' is a very poor choice for a link
anchor.
See https://lehors.wordpress.com/2009/01/29/linking-the-proper-way/

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2020-11-23 08:23:16 -05:00
Paul O'M
d2e2a8b683
Commercial Paper 2.x sample - enhancements and documentation (#335)
* commercial paper enhancements

Signed-off-by: Paul O'M <mahoney@uk.ibm.com>

* commercial paper enhancements

Signed-off-by: Paul O'M <mahoney@uk.ibm.com>

* commercial paper enhancements

Signed-off-by: Paul O'M <mahoney@uk.ibm.com>

* Add further README changes from #335

Signed-off-by: Paul O'M <mahoney@uk.ibm.com>

* Add further README changes from #335

Signed-off-by: Paul O'M <mahoney@uk.ibm.com>

* Add further README changes from #335

Signed-off-by: Paul O'M <mahoney@uk.ibm.com>
2020-11-23 09:56:36 +01:00
denyeart
75f491f2e4
Update ERC-20 readme (#377)
Update ERC-20 readme to indicate the new contract name
and add TransferFrom tutorial for Go chaincode.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2020-11-22 07:54:25 +01:00
Julian Castrence
1829666e3a Rename token-account-based Directory to token-erc-20
FAB-18275

Signed-off-by: Julian Castrence <juliancastrence@ibm.com>
2020-11-21 11:08:18 -05:00
Julian Castrence
d3bc97fae2
Add Chaincode Events to Transfer and Approve (#369)
FAB-18275

Signed-off-by: Julian Castrence <juliancastrence@ibm.com>

Co-authored-by: Julian Castrence <juliancastrence@ibm.com>
2020-11-12 12:44:17 -05:00
Julian Castrence
79485c5bab Implemented Approve, Allowance, and TransferFrom of ERC-20
FAB-18275

Signed-off-by: Julian Castrence <juliancastrence@ibm.com>
2020-11-10 13:41:28 -05:00
JGONGSQ
c6956e5057
Update asset_transfer_ledger_chaincode.js (#368)
the `let` def wont get the object of asset, and generate an error when init the ledger

Signed-off-by: James <james.gong927@gmail.com>
2020-11-10 15:22:05 +01:00
Arnaud J Le Hors
ff8a3c8d50
Simplify auction sample (#367)
This PR changes the auction sample to a simple blind auction with just a
single item to be sold to the highest bidder.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2020-11-06 13:08:34 -05:00
nikhil550
bf1d9fc667
Create auction sample (#355)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-11-06 13:09:35 +01:00
Bram Dufour
981893ab4d
Signed-off-by: Bram Dufour <britaj@bancolombia.com.co> (#366)
Added check to avoid double spent in token-utxo chaincode

In the transfer function it was possible to pass the same utxo more than once in the array of input utxos without any error. Making it possible to spend the same utxo more than once in the same transaction and like this create more tokens than minted. To fix this I changed the array that was used to store the input utxo states to a map and so utxos were stored in the map by there key, which made it possible to know if a key and so a utxo had already been used.
I tested this by setting up the test-network, deploying the token-utxo chaincode with my fix, minting a utxo and trying to spent this utxo more than once in the same transaction, which was not possible anymore. It can only be spent one time anymore with this fix.
2020-11-04 15:43:54 -05:00
Sijo Cherian
e7c74060f3
Adding assertions in private data js app (#365)
Adding assertions in js app, for CI pipeline testing
  Improved readability

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

Co-authored-by: Sijo Cherian <sijo@ibm.com>
2020-11-04 10:34:33 -05:00
Rijul Aggarwal
33adb8d164
asset transfer basic - application typescript (#339)
Signed-off-by: Rijul Aggarwal <rijul.aggarwal@ibm.com>

Co-authored-by: Rijul Aggarwal <rijul.aggarwal@ibm.com>
2020-11-04 10:27:09 -05:00
harrisob
9f245809bb
Add Asset-Transfer-Events (#325)
Add new chaincode and javascript application to demostrate
the use of chaincode events and block events with private data.

Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2020-11-04 15:13:08 +01:00
nikhil550
0088222df5
Move high-throughput sample to go application (#364)
Signed-off-by: Nikhil Gupta <ngupta@symbridge.com>

high throughput app
2020-10-28 22:00:24 +01:00
Yuki Kondo
e8d6e468af
[FAB-18228] Add ERC20 fungible token sample for chaincode javascript (#327)
This PR adds ERC20 capabilities to the token-account-based sample.
It includes javascript Chaincode and the updated README to explain
how to use tokens in the Fabric test-network.

Signed-off-by: Yuki Kondo <yuki.kondo.ob@hitachi.com>
2020-10-28 10:57:44 -04:00
Arnaud J Le Hors
3fbce62c01
Fix commercial paper org scripts (#362)
The current scripts given to setup the user environment do not work
on Mac:

$ . ./magnetocorp.sh
-bash: cd: /Users/lehors/Projects/Go/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp
Saving session...
...copying shared history...
...saving history...truncating history files...
...completed./../../../test-network: No such file or directory
-bash: ./scripts/envVar.sh: No such file or directory
[...truncated...]
export FABRIC_CFG_PATH="/Users/lehors/Projects/Go/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp"
export PATH="/Users/lehors/Projects/Go/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp"
export PEER_PARMS=""
Saving session...
Saving session...

The session history related output is actually captured when setting the environment variables:

$ echo $FABRIC_CFG_PATH
/Users/lehors/Projects/Go/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp
Saving session...
...copying shared history...
...saving history...truncating history files...
...completed./../../../config

With this simple change the scripts work:

$ echo $FABRIC_CFG_PATH
/Users/lehors/Projects/Go/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp/../../../config

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2020-10-27 12:07:49 -04:00
David Enyeart
1794c026c9 Update CouchDB to 3.1.1
Update CouchDB in CI and test-network to 3.1.1.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2020-10-22 19:18:55 -04:00
Jonas Kreusch
f9bd0097b9 Update buy.js
Fixed a typo. It should be "buy" instead of "issue"

Signed-off-by: Jonas Kreusch <krejon@googlemail.com>
2020-10-22 15:31:56 -04:00
Julian Castrence
6d47d06a9b Implemented TotalSupply function of ERC-20 Token Standard
FAB-18275

Signed-off-by: Julian Castrence <juliancastrence@ibm.com>
2020-10-22 14:05:05 -04:00
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