Commit graph

240 commits

Author SHA1 Message Date
hag3
4932b7bf50
Create crypto-config-all.yaml 2018-12-26 23:03:46 +08:00
hag3
36d6b60954
Update crypto-config-ord1.yaml 2018-12-26 21:25:01 +08:00
hag3
5f76791346
Update crypto-config-org2.yaml 2018-12-26 21:14:07 +08:00
hag3
7ebd23502b
Update crypto-config-org1.yaml 2018-12-26 21:13:36 +08:00
hag3
6c1edb3bfc
Update crypto-config-ord2.yaml 2018-12-26 21:01:55 +08:00
hag3
c0e682ba07
Update crypto-config-ord1.yaml 2018-12-26 21:00:16 +08:00
hag3
c1367317f3
Update crypto-config-ord2.yaml 2018-12-26 18:38:56 +08:00
hag3
d2ecea7631
Create crypto-config-ord2.yaml 2018-12-26 12:29:30 +08:00
hag3
d27370af59
Update crypto-config-ord1.yaml 2018-12-26 12:28:30 +08:00
hag3
d4805938f0
Update crypto-config-org2.yaml 2018-12-26 12:27:54 +08:00
hag3
62f1b0f390
Update crypto-config-org1.yaml 2018-12-26 12:27:32 +08:00
hag3
2f3b86fe64
Update org3-crypto.yaml 2018-12-26 12:27:03 +08:00
hag3
b20c459064
Create crypto-config-org2.yaml 2018-12-26 11:49:00 +08:00
hag3
27628c1630
Create crypto-config-org1.yaml 2018-12-26 11:47:51 +08:00
hag3
7078b4d482
Create crypto-config-ord1.yaml 2018-12-26 11:46:48 +08:00
hag3
c3586bcf02
Add filtering function to the dkcl function (DCO)
The original dkcl function deletes all containers regardless of whether they were started by this sample or not (e.g. rancher/agent).
Doing so would corrupt the host's environment and cause inconvenience. So I added conditional filtering to the dkfc function.
Signed-off-by: Hag hag3@21cn.com
2018-12-11 12:18:07 +08:00
hag3
dccd41ec13
Add filtering function to the dkcl function
The original dkcl function deletes all containers regardless of whether they were started by this sample or not (e.g. rancher/agent).
Doing so would corrupt the host's environment and cause inconvenience. So I added conditional filtering to the dkfc function.
2018-12-11 10:46:38 +08:00
Christopher Ferris
53ae435304 Merge "FAB-12548 Update node, stable versions in CI" into release-1.3 2018-11-02 15:09:55 +00:00
rameshthoomu
3dfa75c1d1 FAB-12548 Update node, stable versions in CI
Update Nodejs and STABLE version to latest release-1.3
versions in CI pipeline script.

Change-Id: I2291f1af07a5eed4578e04c73295d17722b82bef
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
2018-10-31 09:23:05 -04:00
sebastianpaulp
f2b2ebf40a [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>
(cherry picked from commit 6dc5ce503b)
2018-10-26 15:21:22 +00:00
Yuki Kondo
7fd95f6a25 [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>
(cherry picked from commit df311ce23a)
2018-10-17 22:48:25 +00:00
David Enyeart
94c21eb9bd [FAB-12395] Pin samples and release for v1.3.0
Pin release-1.3 samples to node.js "~1.3.0"
and update all version references in fabric-samples.

Change-Id: Id053634ce22d7b9b15c0fc520178b901cc982fcd
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-10-10 16:05:32 -04:00
Cláudio Ramos
2f817dab28 [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 21:26:52 +00:00
rameshthoomu
68fc877619 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:50:36 -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
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
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