Commit graph

240 commits

Author SHA1 Message Date
David Enyeart
4bde7d4e82 Merge "FAB-12322 Update commercial-paper sample" 2018-11-16 22:03:01 +00:00
Simon Stone
4fb3b57e6b [FAB-12852] Add fabcar contract w/ new prog model (TS)
Add new FabCar contract sample using the new programming model, written
in TypeScript. Add the new contract sample alongside the existing one
written in the old programming model, which will be removed in a subsequent
change request.

Change-Id: I47e5f16b475c68f9a1c4752af2623f090fbf12c9
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-11-16 21:12:31 +00:00
Gari Singh
fad8ee1e50 Merge "[FAB-12851] Add fabcar contract w/ new prog model (JS)" 2018-11-16 21:12:14 +00:00
David Enyeart
ac35f1e906 Merge "[FAB-12371]Fix the abac sample to use new cid package" 2018-11-15 15:18:18 +00:00
Simon Stone
9facb4256b [FAB-12851] Add fabcar contract w/ new prog model (JS)
Add new FabCar contract sample using the new programming model, written
in JavaScript. Add the new contract sample alongside the existing one
written in the old programming model, which will be removed in a subsequent
change request.

Change-Id: Iea46b0a616dbd072b5bd7227ada827a26560f153
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-11-15 10:48:28 +00:00
Anthony O'Dowd
e67fcf14a3 FAB-12322 Update commercial-paper sample
Change-Id: I235cb62df492b7713bb1c355b7457f679903bd34
Signed-off-by: Anthony O'Dowd <a_o-dowd@uk.ibm.com>
2018-11-14 17:53:12 +00: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
Christopher Ferris
1c8211371b Merge "FAB-12608 Update pipeline script" 2018-11-02 15:08:17 +00:00
rameshthoomu
c05f172ba7 FAB-12608 Update pipeline script
Change-Id: I788c3a6caaf967a4f2157428ee8264b969070acb
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2018-10-31 14:42:14 -04:00
Yuki Kondo
286861e0e3 [FAB-12371]Fix the abac sample to use new cid package
The latest cid package is fabric/core/chaincode/shim/ext/cid.
This CR fixes the abac sample to use the new cid package instead
of the old one at fabric/core/chaincode/lib/cid.
The vendor folder is also updated with the new cid package.

Change-Id: Ifc431ee4504cd009f84f9d5de271721597bba6e7
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
2018-10-30 20:05:57 +00:00
zhaochy
24c5e47539 [FAB-12026] pagination samples for node marbles02
This change synchronizes the node marbles02 sample chaincode with
fabric/examples/marbles02

Change-Id: I6c11fee15ae39950fca7344fbf230c42f876274a
Signed-off-by: zhaochy <zhaochy_2015@hotmail.com>
2018-10-27 10:43:07 +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
David Enyeart
c9251480d5 [FAB-12415] samples for 1.3.0 (master cleanup)
fabric-samples already completed in release-1.3 branch.
This CR fixes up version references in master to match.

Change-Id: I95f9d2db5e5fed749560768ca0ba753bb7cae700
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-10-10 17:20:24 -04:00
Gari Singh
bc7317c475 Merge "FAB-11867 Develop Apps:Sample pt 2 -- application" 2018-10-06 09:04:47 +00:00
Gari Singh
4e7a174210 Merge "FAB-11723 Developing Apps: Sample pt 1 -- contract" 2018-10-06 09:04:20 +00:00
David Enyeart
61059f5f12 Merge "[FAB-12275] Fix the warn in creating genesis block" 2018-10-04 04:34:03 +00:00
Artem Barger
57ef596d63 Merge "[FAB-12257] allow balance-transfer for doscovery" 2018-10-03 21:33:36 +00:00
Hui Kang
3a12c6022b [FAB-12275] Fix the warn in creating genesis block
- add system channel name

Change-Id: Ie36e36b2053524cf3bbcf9be17305ccb7d3f966c
Signed-off-by: Hui Kang <kangh@us.ibm.com>
2018-10-02 23:53:21 -04: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
rameshthoomu
4445e8d47e FAB-12272 Increase MAX_RETRY to 10
This change is to fix the couchdb timeout errors in byfn
test. This could be an CI environment issue but to fix CI
failures, increasing the MAX_RETRY count to 10

Change-Id: Id16b1846374eb2cb91b4d67fedb38562df90c7d3
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2018-10-02 22:56:22 -04:00
rameshthoomu
33d333fd46 FAB-12190 Update stable version in CI scripts
Update stable version to 1.4.0-stable in CI scripts

Change-Id: I558442ccce8975533f9123193d7aa343ae883ba5
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2018-09-26 17:24:07 -04:00
David Enyeart
edee6387f1 [FAB-12184] Prepare fabric-samples for 1.3.0-rc1
Change-Id: I791a7dc50557547036209dbabb5a6c42ee2e0c38
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-09-26 13:16:02 -04:00
David Enyeart
514d4560d9 [FAB-12170] Fix dependency check in java chaincode
Currently sample java chaincode can only work with version
1.3.0-SNAPSHOT of the shim.

Allow sample java chaincode to work with any v1.x java shim.

Change-Id: Iee69289392b4fa5fdb5cb14c41672f96120f711f
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-09-26 00:39:26 -04:00
Keith Smith
6935679d8d Merge "FAB-12106 Update fabric-ca build scripts" 2018-09-24 17:23:31 +00:00
gennady
9f80e47d2d [FAB-12119] Fix groupId in java chaincodes
According to sonatype.org naming requirements, java shim jars
groupId should be org.hyperledger.fabric-chaincode-java

Change-Id: Ia30cb77b1081b3fb4f7573568f2e2abfe89315d4
Signed-off-by: gennady <gennady@il.ibm.com>
2018-09-24 11:50:58 +03:00
Jonathan Blood
3237229184 [FAB-12073] Fix Org3 peers CouchDB config.
Change-Id: I279a32b3a07a326fc0291f259f66b4f3a036a58a
Signed-off-by: Jonathan Blood <jonathan.blood@uk.ibm.com>
2018-09-23 19:15:31 +00:00
rameshthoomu
eece3d893b FAB-12106 Update fabric-ca build scripts
Update fabric-ca build scripts to download s390x binary
to run the fabric-ca test scripts

Change-Id: Ieaeac4a7e43435dbf49e6b9dc2649705e9348892
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2018-09-23 11:43:33 -04:00
Jonathan Levi (HACERA)
634203d26f Merge "[FABC-131] Change fabric-ca sample to build images" 2018-09-21 22:08:11 +00:00
Keith Smith
f62952f980 [FABC-131] Change fabric-ca sample to build images
Since fabric-ca-orderer/peer/tools images are no longer being
published, this updates the fabric-ca sample to not use them.
Instead, it either uses locally built images or it builds them
by using curl to download the published fabric-ca-client binary
from nexus.

Change-Id: I29776c72445660ab02a5e82a4e6b0ade0d0167e7
Signed-off-by: Keith Smith <bksmith@us.ibm.com>
Signed-off-by: Saad Karim <skarim@us.ibm.com>
2018-09-21 15:51:39 -04:00
Anthony O'Dowd
40897861b0 FAB-11867 Develop Apps:Sample pt 2 -- application
Change-Id: I0897682a00be1f6ebaf8eee090872c5057dc3fba
Signed-off-by: Anthony O'Dowd <a_o-dowd@uk.ibm.com>
2018-09-21 06:59:03 +00:00
Surya
9ee57c6c22 [FAB-11778] Upgrade to v1.3.x from v1.2.x in byfn
Changes include upgrade from v1.2.x to v1.3.x.

First, upgrades the network from v1.2.x to v1.3.x and
upgrade_to_v13.sh will run config updates on /Channel level and
/Channel/Application level for v1_3 capabilities.

Add 15 sec's delay to couchdb tests

Change-Id: Ic2a1633842b7dd8a39ee674c5159d67b46122ff4
Signed-off-by: Surya <suryalnvs@gmail.com>
Signed-off-by: RameshBabu <rameshbabu.thoomu@gmail.com>
2018-09-17 14:34:27 +00:00
Chris Elder
e7a1b76edb [FAB-9386] Remove Marbles sample reference to Fauxton
Remove marbles sample chaincode references to Fauxton
and outdated "data" wrapper.

This change also synchronizes the marbles sample chaincode with
fabric/examples/marbles02, for example it adds pagination
support that is in fabric/examples/marbles02.

Change-Id: Ie80c66d7b2f97081d21c5ea889b159e398b64777
Signed-off-by: Chris Elder <chris.elder@us.ibm.com>
2018-09-17 12:15:24 +00:00
David Enyeart
9c6aceed38 [FAB-12022] Fix CI by increasing couchdb timeout
Increase retry timeout from 3s to 15s so that initial CLI
commands after peers and couchdb come up are successful.

Change-Id: Ib5f879bde52395d9f600683da17bf03aff6e05b2
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-09-16 23:37:04 -04:00
Jonathan Levi (HACERA)
eb3331eba4 Merge "[FAB-11577] Fix balance transfer to install Chaincode" 2018-09-09 17:26:57 +00:00
gennady
4030ebdb3d [FAB-11397] Adding java cc
Added java project sources under chaincode
Added support for "-l java" to byfn.sh

Change-Id: I7038aed9b21ad9bf51bcb58c6b71ceb1f161813f
Signed-off-by: gennady <gennady@il.ibm.com>
2018-09-08 17:35:27 +03:00
Anthony O'Dowd
d77665186e FAB-11723 Developing Apps: Sample pt 1 -- contract
Change-Id: Ia61aae9b83c3297dfe28fd475c585e021186a4aa
Signed-off-by: Anthony O'Dowd <a_o-dowd@uk.ibm.com>
2018-09-05 07:41:50 +01: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
rameshthoomu
5930dfc06a FAB-11488 Update CI script
Update byfn_eyfn.sh script to fetch the binaries from the
correct nexus url.

Change-Id: I0ea675235cc0dce691b8a1bbf30951504f0a8112
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2018-08-06 12:22:05 -04:00
Kostas Christidis
08aad9ac83 Merge "FAB-9297 fix README links and update bootstrap.sh" 2018-07-27 14:39:59 +00:00
rameshthoomu
ca6959cb5d FAB-11311 Update fabric image version
Update fabric image version to 1.3.0-stable to pull the
latest fabric and fabric-ca docker images

Change-Id: I598b98afa205ca68b37598d159bf0fb9f36fd370
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2018-07-27 14:20:08 +00:00
David Enyeart
f6df2f3c7a Merge "FABN-833 Update Jenkinsfile to capture build artifacts" 2018-07-27 13:05:02 +00:00
Gari Singh
30d36be46c Merge "FAB-11220 Samples - remove EventHub" 2018-07-26 11:04:59 +00:00
rameshthoomu
0ca9e6e173 FABN-833 Update Jenkinsfile to capture build artifacts
Change-Id: Ie5eb6bb82b99ba12f7a4d417450b55d175d811b3
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2018-07-24 14:53:33 +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
Christopher Ferris
6edd320ded FAB-9297 fix README links and update bootstrap.sh
Change-Id: I00cac1a0c01a777af887104064e7dfa775359359
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2018-07-05 12:03:20 +00:00
Christopher Ferris
1745c996b3 Merge "[FAB-10811] fabric-ca sample is broken on v1.2" 2018-06-22 15:20:04 +00:00
Keith Smith
75e293183b [FAB-10811] fabric-ca sample is broken on v1.2
The Profile section of configtx.yaml must now be at the end of the file,
so the building of this file dynamically must be updated.
I also updated the version of the fabric CA in bootstrap.sh to 1.2.0.

Change-Id: Ifabccebc901f74569cfa1fe1d824fbcd26c4ffd1
Signed-off-by: Keith Smith <bksmith@us.ibm.com>
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2018-06-22 10:40:33 -04:00