Commit graph

272 commits

Author SHA1 Message Date
BigManing
a8a55395af Fix doc link
Fix variable error

Change-Id: I24cae31cc3df080b8906812b81f63b15795dc6e5
Signed-off-by: BigManing <lingshui2008@qq.com>
2019-01-24 16:47:03 +08:00
David Enyeart
8a458b5cdc [FAB-12056] Private marbles cc use transient data
The marbles02_private example needs to be updated to pass all
attributes as transient data instead of arguments.
This will prevent identifiable information being sent to the orderer.

Also removed transferMarblesBasedOnColor since range
queries and update is not supported in a transaction when
using private data, as different peers may have
different data in their local private state
databases.

Change-Id: I7c3cebcb49b6c59e4e8ea35f46a799ffdd1999e9
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2019-01-06 16:52:37 -05:00
Gari Singh
39e8ec4a8a Merge "FAB-13372 Fabric-Samples return error msg" 2019-01-04 19:23:15 +00:00
Gari Singh
461b6abcd6 FABC-781 Remove fabric-ca sample
This sample  uses images which are no
longer published and are not supported
by the community.

FABC-781 #done

Change-Id: I01865b433a1ef4345aaf47255b92c1f83275aa4f
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2019-01-04 09:38:39 -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
Gari Singh
e6ce28c1e8 Merge "FAB-13305 Update scripts to pull latest artifacts" 2019-01-04 14:03:08 +00:00
Sambhav Nidamarty
e3da2208d7 FAB-13433 - Update Jenkinsfile configuration
This change is to update Jenkinsfile to fetch
the patchset for verify jobs and clone the latest
commit for merge jobs.

Change-Id: I20f9a322eb9f60b648b4b630df2d4565223be916
Signed-off-by: Sambhav Nidamarty <sambhavdutt@gmail.com>
2019-01-02 22:54:53 -05:00
Ry Jones
33db64e277 Configure Stale ProBot
Use GitHub's process to automatically comment
and close PRs, with a pointer to the contributing
guide.

Change-Id: Iea3d1391a4175c98f2d5eeb9a8047d09286d46b7
Signed-off-by: Ry Jones <ry@linux.com>
2018-12-30 02:02:14 -08:00
Matthias Neugschwandtner
5cd277fdc0 [FAB-11951] Interest-rate swap example for SBE
This is an example on how to represent and implement basic interest
rate swap handling using fabric. It demonstrates the
usage of state-based endorsement.

Change-Id: I04e631299d95262e54e1532489766aa20477064c
Signed-off-by: Matthias Neugschwandtner <eug@zurich.ibm.com>
Signed-off-by: Alessandro Sorniotti <ale.linux@sopit.net>
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2018-12-26 10:30:57 -05: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
Sambhav Nidamarty
c7572aad9b FAB-13305 Update scripts to pull latest artifacts
Update byfn/eyfn Jenkins script to get the latest
version binaries for fabric and fabric-ca

Change-Id: I0a310385285b1c086a6cfef0f7cb1c1906ed8351
Signed-off-by: Sambhav Nidamarty <sambhavdutt@gmail.com>
2018-12-17 14:40:10 -05:00
wenjian3
ab46e3548c [FAB-13283] Update sample code for commercial paper
- Update CORE_LOGGING_LEVEL to FABRIC_LOGGING_SPEC
- Add port as an argument in case default port is used

Change-Id: I29725a100a095b2b6f2ec6262e7b70730445385e
Signed-off-by: Wenjian Qiao <wenjianq@gmail.com>
2018-12-14 12:12:12 -05:00
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