Commit graph

50 commits

Author SHA1 Message Date
Taku Shimosawa
3d53f79be3 [FAB-9033] TypeScript sample uses latest type defs
This patchset removes the type defintions for the TypeScript
version of balance-transfer, and makes it use the definitions
in the npm repository.

Change-Id: I711d438354101f48240dfec115d747d65448ee2a
Signed-off-by: Taku Shimosawa <taku.shimosawa@hal.hitachi.com>
2019-04-30 17:15:18 -07:00
preminem
6be46eed05 Fix balance-transfer script
Change-Id: I610d9cd3b91b3be83fa62ea126c7b326e092239d
Signed-off-by: preminem <preminem@ruc.edu.cn>
2019-03-26 11:48:08 +00:00
David Enyeart
bb39b6ed09 [FAB-13570] Align fabric-samples with 1.4.0 release
Change-Id: Ic0291f07e2aba519bcd05238d002eecd5ec43891
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2019-01-09 15:36:16 -05:00
Bret Harrison
e9b9477a31 FAB-13372 Fabric-Samples return error msg
Update the Balance Transfer to return the fabric error.
The sample application was updated to both return the error
in the REST response and to post the error to the log.
The sample was updated with the 'channel.close()' so
that users will note how to shutdown a channel and not
hold connections open.

Change-Id: I49f20a50340adff52cf57db00a121ffd75eb1827
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2019-01-04 14:23:38 +00: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
Will Lahti
c21bbbaa38 Update samples to use new logging env variables
FAB-12669 #done

Change-Id: Ibb50cc77cb64c3cc138af9afde7273636f34b816
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
2018-12-05 15:32:41 -05:00
Daisuke IIZUKA
fd6e2c41c9 [FAB-12703] Fix misspelling "lauches"
iFix misspelling "lauches" to "launches".

Change-Id: I4605262356631e421db7a8902b1b324e8d17ca25
Signed-off-by: Daisuke IIZUKA <daisuke.iizuka.ag@hitachi.com>
2018-11-05 04:40:49 +00:00
sebastianpaulp
6dc5ce503b [FAB-12587] Fix for Query Block by block hash API
Block Query by hash Fixed in balance transfer app.

Change-Id: Iad5c0af657e7359ee787e1f939a6695d470da1cd
Signed-off-by: sebastianpaulp <spaul@jeadigital.com>
2018-10-24 18:23:26 +00:00
Yuki Kondo
df311ce23a [FAB-12173] balance-transfer: Update anchor peers
Currently, balance-transfer does not have anchor peer
configuration. As a result, users are unable to use private data
and can't take advantage of service discovery.
This CR adds a function and modifies a test script to update
anchor peers at the setup.

Change-Id: Icbd7e4eb2e3bbcb187a083e94c616ef4825c5fb4
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
2018-10-12 16:50:38 +00:00
Cláudio Ramos
c6f6324186 [FAB-12257] allow balance-transfer for doscovery
Balance-Transfer docker-compose file does not have the parameters
-CORE_PEER_GOSSIP_BOOTSTRAP and -CORE_PEER_GOSSIP_EXTERNALENDPOINT
assigned to its peers. This impacts the usage of Fabric v1.2 discovery
feature by apps like Blockchain Explorer

Change-Id: I2ca8adc57af34a0442e91a956b97e754088bba74
Signed-off-by: Cláudio Ramos <claudiovtramos@gmail.com>
2018-10-03 00:22:57 -03:00
Yuki Kondo
cbbbc78b44 [FAB-11577] Fix balance transfer to install Chaincode
Balance transfer fails to install Chaincode since there is a
undeclared variable "tx_id". However, "tx_id" is not required
in ChaincodeInstallRequest.
This CR removes the line getting transactionId to execute
installChaincode correctly.

Change-Id: Ia62844172ceecd84fa9a9f2e40e804d1f7a7499b
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
2018-08-13 19:51:37 +00:00
clydedacruz
bfdc0b6e7a FAB-11518
Fixed typo in instatiate-chaincode.js and removed unused imports from other JavaScript files in balance-transfer/app

Change-Id: If9695c4f51e9c0835230b2c7f969cbf4aa132675
Signed-off-by: Clyde DCruz <clydecroix@gmail.com>
2018-08-08 23:32:53 +05:30
Gari Singh
30d36be46c Merge "FAB-11220 Samples - remove EventHub" 2018-07-26 11:04:59 +00:00
Bret Harrison
a4a15cb379 FAB-11220 Samples - remove EventHub
Removed the use of the old EventHub from both
FabCar and BalanceTransfer.

Change-Id: Ia4a0bb443f95c462efde9b054058986ae8bd80fd
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2018-07-19 12:50:28 -04:00
susmita
c4bdc68e1b [FAB-8479] Added Endorsement policy
for balance transfer app in node-sdk samples.
Added Endorsement policy in instantiate-chaincode.

Change-Id: Ie7344353a8febf0f1e76f6a4edcb3035ab2d00e2
Signed-off-by: susmita <susmita.somanchi@gmail.com>
2018-07-12 12:03:55 -04:00
Taku Shimosawa
a603655419 [FAB-10306] Fix config in balance-transfer
This patchset removes wrong max message size configuration from
network-config.yaml in the balance-transfer sample.
After [FAB-9337] was merged, this configuration was activated and caused
an error in running the sample.

Change-Id: I209448bd7701d5843b7ac06501be6a9d16d378e1
Signed-off-by: Taku Shimosawa <taku.shimosawa@hal.hitachi.com>
2018-05-22 17:51:30 -07:00
Gari Singh
9eb7ff6f19 Merge "[FAB-10021] Typo in balance-transfer/testAPIs.sh" 2018-05-22 12:18:38 +00:00
Matthew Sykes
5cf19449f1 [FAB-10185] Reorder for logical consistency
Change-Id: I0274250c8c0c5d1801b6db0fb7bfce3359bb1c2f
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
2018-05-17 11:06:09 -04:00
Matthew Sykes
e2f4f20bd6 [FAB-10176] Fix invalid configtx.yaml documents
Change-Id: Ibf52f9380ed3b724c594b53550321a12475e9860
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
2018-05-17 08:41:05 -04:00
weikeng
ace2e5ab91 [FAB-10021] Typo in balance-transfer/testAPIs.sh
There is a typo for transaction in testAPIs.sh

Change-Id: I0f8ca7b2a9003b5f85ba980cab5eff80853b03dc
Signed-off-by: weikeng <w.k@berkeley.edu>
2018-05-12 08:14:51 -07:00
Robert P. J. Day
9d518fb795 [FAB-9330] Refactor top-level .gitignore into subdirs
Rather than cram most .gitignore content into the top-level .gitignore
file, partition it into lower-level .gitignore files, as is already done
with a couple subdirectories, just to be consistent.

I'm sure these files could be even tidier but this seems sufficient for
a first pass.

Change-Id: I0cc8cb2a9d7fa82c4f6de1aef9f82107c8cc7a6a
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
2018-04-04 06:26:20 -04:00
Bret Harrison
4f97717287 FAB-8947 Fabric-Samples remove package lock
Remove the package lock file and allow current
versions to be installed.

Change-Id: I74a4710173e4f2307e87b73c6021ecf20237a974
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2018-03-23 17:51:21 +00:00
Bret Harrison
ffd7a2576c FAB-6400 Balance-transfer filtered events
Update sample code to use the channel-based events.
The sample will also use the new connection profile
API to get a list of channel-based NodeSDK event hubs
using filtered blocks, automatic unregistration, and
automatic disconnect, all new features of channel-based
events. This will demostrate the most common use case
for events. The sample code will require the NodeSDK
to be at 1.1 alpha.

Change-Id: Id9f2b37f02d7d662b7ca1016586560ee4c595992
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2018-02-27 23:10:19 +00:00
susmita
0daa8bcb04 [FAB-8122] Updated README.md file- balancetransfer
FIX [FAB-8122] Added steps to clear containers and
artifacts before starting the network manually.

Change-Id: I83abd30e0080ff2395d91c76029a3527e4e69de4
Signed-off-by: susmita <susmita.somanchi@gmail.com>
2018-02-08 10:22:45 -05:00
David Enyeart
50cb8d9b1f Merge "[FAB-5913]balance-transfer:Fix query response message" 2018-01-30 19:12:51 +00:00
Keith Smith
5eb2fb2ff6 [FAB-7653] Fix incorrect chaincode location
Fix the chaincode location by adding "go" subdirectory to path.

Change-Id: Idc72a0f4fcecf519d49a68d141025ada054cf847
Signed-off-by: Keith Smith <bksmith@us.ibm.com>
2018-01-08 15:27:09 -05:00
Gari Singh
5a974a42e0 [FAB-7533] Fix typo in balance-transfer sample
Trivial fix of a typo which causes the app to
crash

Change-Id: I55bb6a0e971d21adb0bd50f450571d6698686c9a
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2018-01-06 07:13:34 -05:00
Keith Smith
47da1bbeb3 Merge "[FAB-7511] clear crypto material after clearing network" 2018-01-02 20:45:14 +00:00
Keith Smith
cd18887f4b Merge "[FAB-7160] Samples - readme sample commands" 2018-01-02 19:47:15 +00:00
David Enyeart
55d0140381 Merge "[FAB-6550] Sample app written in typescript" 2017-12-20 14:01:02 +00:00
ratnakar
e84821637c [FAB-7511] clear crypto material after clearing network
Crypto materal is cleared after every re-start of a new network

Change-Id: I01c919109401428de1252695930f42e73eb3f795
Signed-off-by: ratnakar <asara.ratnakar@gmail.com>
2017-12-19 14:17:18 -05:00
Kapil Sachdeva
c4465100c4 [FAB-6550] Sample app written in typescript
This is a sample application that demonstrates usage of Fabric SDK typings.

Change-Id: I5b9b42c666de51a490043cafe0faac29e4f4a0a4
Signed-off-by: Kapil Sachdeva <ksachdeva17@gmail.com>
2017-12-07 02:08:54 +00:00
Bret Harrison
7428f6496a [FAB-7160] Samples - readme sample commands
The balance transfer sample commands do not work.
Fixed the readme sample commands along with a few
supporting application code.

Change-Id: I74c5ff150f26e4c1868201499eb616daca316ee8
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2017-12-01 13:56:54 -05:00
Yuki Kondo
948e2372b8 [FAB-5913]balance-transfer:Fix query response message
"queryChaincode" doesn’t output responses from all
peers in log message. It exits the loop processing after
outputting the first response.
We should print all responses from all peers. Also, we should
return a response (e.g. the response_payloads[0]) after the loop.

This patch fixes the problems above.

Change-Id: I92a0c5a663d6da0854d89bf76c5ba36da86754ef
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
2017-11-10 22:51:20 +00:00
Bret Harrison
bb3ac84e6e [FAB-5363] fabric-samples update balance
Update balance transfer sample to use the
connection profile and node 8.

Change-Id: I17c74c6cb23ebe55a8f2bba735d41525ae9e5ab1
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
Signed-off-by: ratnakar <asara.ratnakar@gmail.com>
2017-10-31 16:00:14 -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
Gari Singh
ba0a098ca6 FAB-5995 Update samples to work with v1.0.2
basic network:
- update docker-compose.yaml to use v1.0.2
- regenerate artifacts

fabcar:
- update creds

chaincode-docker-devmode:
- renegerate channel tx and genesis block

balance-transfer:
- update docker-compose.yaml
- update readme to use download link
- regenerate channel artifacts

Change-Id: I7d52f1afce51ea9e1b115fa287d281af95d9ad85
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2017-09-03 08:08:53 -04:00
Jim Zhang
bb842993d2 Merge "[FAB-5155]Fix README.md in "balance-transfer" example" 2017-08-09 19:17:43 +00:00
Yacov Manevich
9cd3f5425d Merge "[FAB-5303] Further balance-transfer code optimization" 2017-08-09 19:13:07 +00:00
Jim Zhang
79cb041124 [FAB-5303] Further balance-transfer code optimization
- Made it possible to deploy the app (both the client and fabric
  backend) to a location other than localhost
- Made it possible to work with a backend over grpc instead of always
  assuming grpcs
- Made the list of target peers for instantiate and invoke calls
  to be optional
- Enabled target networks to be controlled by an env variable

Change-Id: Ie394cf7e8f6ed47d970d4be992f2f6a0394fff7f
Signed-off-by: Jim Zhang <jzhang@us.ibm.com>
2017-07-26 18:00:05 +00:00
Yuki Kondo
6cce07c440 [FAB-5155]Fix README.md in "balance-transfer" example
The README in "balance-transfer" should be fixed in the section:
https://github.com/hyperledger/fabric-samples/tree/master/
balance-transfer#running-the-sample-program

1. Broken link
There is a link to "Sample REST APIs Requests" which is broken.
This is linked to non-existent path on fabric-sdk-node repository.
I believe the intended link is to
https://github.com/hyperledger/fabric-samples/tree/master/
balance-transfer#sample-rest-apis-requests

2. Instruction to start node application.
There is no instruction to start node application.
If we execute the REST APIs according to the current README,
we can't get any responses since node application is not working.
We need to execute the following steps before calling REST APIs.

 - npm install
 - PORT=4000 node app

fix repo names

Change-Id: I9ec0ec18bb36addd6c8371481dc8cfe645053ec6
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2017-07-19 12:00:51 -04:00
Christopher Ferris
1153988540 Merge "[FAB-5311] Fix spelling error" 2017-07-19 14:14:51 +00:00
Christopher Ferris
d9e2d5cc8c Merge "[FAB-5287] NodeSDK - fix sample" 2017-07-17 20:05:34 +00:00
Christopher Ferris
0611471e4b Merge "[FAB-5197]Check all prop-responses in balance-transfer" 2017-07-17 20:03:26 +00:00
GeorgeLindsell
6422fc36ce [FAB-5311] Fix spelling error
Fix spelling error in instantiate-chaincode.js

Fix Issue # 5311.

Change-Id: Ib8654e2d12a6e3d138406d0bb8738e37ebee90d1
Signed-off-by: GeorgeLindsell <lindsellgeorge@gmail.com>
2017-07-14 15:44:41 +01:00
Bret Harrison
e0db341af9 [FAB-5287] NodeSDK - fix sample
Sample should use 'fcn' not 'functionName'
in the sample curl calls and sample app.

Change-Id: I4be92a0394fdf579195e9566d049aac0862d5888
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2017-07-13 17:04:32 -04:00
Jim Zhang
8f01c7f0e2 [FAB-5260] Update balance-transfer sample to v1.0.0
Change-Id: Ie6738415d8cca650c609fe72bb6195b36751b3d6
Signed-off-by: Jim Zhang <jzhang@us.ibm.com>
2017-07-11 14:06:44 -04:00
Yuki Kondo
70bff28f8a [FAB-5197]Check all prop-responses in balance-transfer
"balance-transfer" app doesn't check all of the proposal responses.

An app sends a transaction proposal to multiple peers and get
multiple responses. However, the only first response
"proposalResponses[0]" is checked repeatedly in the loop.

This patch fixes the code to check all of the array value of
proposalResponses correctly.

Change-Id: Id61e691eb4d1c3a6c4a7a390584dfd74f1fc6196
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
2017-07-06 08:08:52 -07:00
Bret Harrison
04c9eff110 [FAB-4996] NodeSDK - move sample to fabric-samples
Move the Balance Transfer sample application from
fabric-sdk-node to fabric-samples. This cr will
add the files to the fabric-samples. There will
another one to remove the files from fabric-sdk-node.

Change-Id: I2344ee00bcd47793ae07f203070af93bc2ee69d6
Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2017-06-27 05:59:53 -04:00