Commit graph

260 commits

Author SHA1 Message Date
Artem Barger
89fff6df43 Merge "FAB-13011 add kafka consensus type to byfn sample" 2018-12-13 09:14:35 +00:00
Yacov Manevich
a79d7cf3aa Merge "[FAB-13126] Align fabric-samples with 1.4.0-rc1 release" 2018-12-12 18:20:05 +00:00
Matthew Sykes
f67782113d [FAB-13232] fix peer node start command
The -o flag was a legacy option on `peer node start` and has been
removed.

Change-Id: Idf3cf57d39461b57c6f61b32e971e14031278e3f
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
2018-12-12 11:14:54 -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
Simon Stone
445ccbc25a [FAB-12880] Move old prog model samples for FabCar
Move the old programming model samples for FabCar,
including the "node" (JavaScript!) chaincode sample
and the JavaScript application in the top level into
new subdirectories called "javascript-low-level".

We still want to keep these samples around for comparision
purposes, but most new developers should be using the new
samples built using the new programming model.

At the same time, update the startFabric.sh script
to output correct help information on how to run
the applications built using the new programming model
after starting the Fabric network and deploying the chaincode.

Change-Id: I1e3701737f105cba67f661bf893771ac8a3a0373
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-12-10 21:39:30 +00:00
Christopher Ferris
527024833b Merge "[FAB-13206] Remove dependencies on fabric-client" 2018-12-10 15:56:46 +00:00
Simon Stone
5be62b5200 [FAB-13207] Remove incorrect discovery options
The TypeScript version of the FabCar app uses a dodgy
"as any" cast to get around a bug that has been fixed;
turns out the wrong name was being used (should have
been asLocalhost, not useLocalhost).

Note, because basic-network does not use TLS, we cannot
use service discovery. We can enable service discovery
when we migrate FabCar to BYFN instead.

Change-Id: I36dad1c8cc7380ca1123805ae3e74fe1e7665b40
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-12-10 13:13:11 +00:00
Simon Stone
fdbd92d65f [FAB-13206] Remove dependencies on fabric-client
The new FabCar apps currently have a dependency on
the fabric-client (old programming model) module,
but now the dependencies of the fabric-network module
have been corrected, this dependency can be removed.

The fabric-ca-client dependency is staying because the
FabCar apps explicitly require this module to perform
CA interactions.

Change-Id: Iee40f7a560d5ac0a0f8202fc6d751aa45467829e
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-12-10 12:03:03 +00:00
Jonathan Levi (HACERA)
c17083ce55 Merge "[FAB-12877] Add fabcar app using new prog model (JS)" 2018-12-08 08:06:45 +00:00
Jonathan Levi (HACERA)
26dcf99e05 Merge "[FAB-12878] Add fabcar app using new prog model (TS)" 2018-12-08 08:06:37 +00:00
Srinivasan Muralidharan
8e45db62ac Merge "[FAB-12724] Upgrade from 1.3.x to 1.4.0" 2018-12-07 23:18:30 +00:00
Simon Stone
eff00466f3 [FAB-12877] Add fabcar app using new prog model (JS)
Add a new version of the FabCar applications using the new
programming model (fabric-network), written in JavaScript.

Change-Id: I0fcc2e8a10291805d5389c7fc8d1e529debd600a
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-12-07 22:18:50 +00:00
Simon Stone
c18419644d [FAB-12878] Add fabcar app using new prog model (TS)
Add a new version of the FabCar applications using the new
programming model (fabric-network), written in TypeScript.

The new programming model requires a connection profile, so
I have added connection profiles (JSON and YAML) versions to
the basic-network sample. When we switch FabCar to use first-network,
we will have to add connection profiles into that as well.

Change-Id: I81bae907fc64a1cde0234325f37b53e5cd7964e5
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-12-07 22:18:37 +00:00
Surya Lanka
e1a39e685a [FAB-12724] Upgrade from 1.3.x to 1.4.0
Adding support to upgrade from 1.3.x to 1.4.0 using upgrade_to_v14.sh
and changes to byfn.sh

For this, no v1_4 capabilities need to be enabled other than v1_3
capabilities on channel and application group level

Only upgrading the images from v1.3.x to v.1.4.0 for peer, orderer,
cli, ccenv

Change-Id: I991f96c2deb3c91870ec4654aa8b561f49594248
Signed-off-by: Surya Lanka <suryalnvs@gmail.com>
2018-12-07 14:17:30 +00: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
Yoav Tock
7ad9f196a4 FAB-13011 add kafka consensus type to byfn sample
Augment the fabric-samples first-network sample to include a flag that allows a choice of  consensus-type:
solo (default) or kafka.

- Add note on production deployment of kafka
- Remove port mapping for kafka and zookeeper containars

Change-Id: I3204ba44e5974961eb69649b6f5744f52097ce80
Signed-off-by: Yoav Tock <tock@il.ibm.com>
2018-12-05 11:06:35 +02:00
David Enyeart
33f064f2fb [FAB-13170] Add memberOnlyRead to marbles sample
memberOnlyRead is a new private data collection config
property in v1.4. This CR adds it to the marbles02_private
sample chaincode.

Change-Id: I9aeedd43cf835533c7bb2f0f0b6343f819b53e9c
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-12-04 22:24:50 -05:00
Simon Stone
928b72b60a [FAB-12875] Add automated tests for fabcar sample
Introduce automated tests for the fabcar sample, that deploy
the new sample contracts and submit the initLedger transaction
using the "peer" CLI.

Additional changes will follow to drive the new sample apps
to ensure that they work as well (but the apps aren't there
yet!).

Change-Id: Ie42d139eb1dc1cf0f7c16f41f54bb5f40309921c
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-11-30 09:52:25 +00:00
Simon Stone
5c087f1443 [FAB-13046] Update TypeScript contract dependencies
The type definitions for the sinon module have been updated so that
they require TypeScript 3; TypeScript 3 has been out for a while, so
we should pick that up as well as updating all of the other dependencies.

Change-Id: Ia58e36158d83ed3cc5cad6353e164bfc2453a00a
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-11-29 11:51:28 +00:00
Simon Stone
3748983dd9 [FAB-12879] Update fabcar script for new contracts
This CR updates the startFabric.sh script in the fabcar
sample to deploy the new fabcar contracts written with
the new programming model, in either JavaScript or
TypeScript.

Because both JavaScript and TypeScript use the chaincode
language of "node", we need to separate "source" language
from "runtime" language. Also taking the chance to rename
the option "golang" to "go" to match the directory.

Change-Id: Ib42661223925b1d8df8fd73cf8c1aac9d8a29e59
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2018-11-21 14:44:35 +00:00
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