Commit graph

19 commits

Author SHA1 Message Date
Brett Logan
e5b898c08d
Revert "first-network/scripts/*: Make Chaincode name configurable (#118)" (#131)
This reverts commit 9ef61e2d72.

Introduced regressions when running without explicitly specifying
a chaincode label

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-02-26 01:22:13 -05:00
Anoop Vijayan Maniankara
9ef61e2d72
first-network/scripts/*: Make Chaincode name configurable (#118)
Signed-off-by: Anoop Vijayan Maniankara <anoop@tuxera.com>
2020-02-23 07:35:41 +01:00
Simon Stone
3996db59dc [FAB-12219] abstore node -> javascript
Rename the abstore node directory as the sample code
within is JavaScript, and we are planning to add a
TypeScript version as well.

This change also requires updates to BYFN to reflect
the renamed directory.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I1cd554c6598ac7cc71e2b0c65ab541cfaa477354
2019-08-02 11:22:56 +01:00
Will Lahti
583ff8f6d4 Use renamed CheckCommitReadiness function
FAB-16111 #done

Change-Id: Iacdbd59515b71cb692935b0afbd1c678e0f55851
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
2019-07-30 09:51:06 +00:00
Matthew Sykes
61c33d3fba [FAB-15973] use --output json on simulatecommit
Change-Id: Ic31b390898f1981a0138935990ff11a3902007ee
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
2019-07-16 12:24:11 -04:00
Will Lahti
0254d67b37 QueryApprovalStatus -> SimulateCommitChaincodeDef
Update samples now that QueryApprovalStatus has been renamed
to SimulateCommitChaincodeDefinition.

FAB-15831 #done

Change-Id: I4e12ca2c8424bf8d6537e77e1a9de7fd3723636d
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
2019-07-02 13:37:20 -04:00
Alessandro Sorniotti
eb3fe0810f [FAB-14779] QueryApprovalStatus step in byfn
Between the approve and commit steps we add a QueryApprovalStatus to verify
whether peers are ready to commit the chaincode definition.

Change-Id: I18805a4180fa61da07d2bca321c6355660f772fc
Signed-off-by: Alessandro Sorniotti <ale.linux@sopit.net>
2019-03-28 14:00:37 +00:00
Alessandro Sorniotti
27774297ec [FAB-14711] update byfn with new lifecycle
Change-Id: I24dd3e85f6dedab52b05ce3103ee06435f01f9a3
Signed-off-by: Alessandro Sorniotti <ale.linux@sopit.net>
2019-03-26 16:25:14 +01:00
Simon Stone
f942010fa6 [FAB-14268] Make BYFN/EYFN ports match external ports
Update both BYFN and EYFN so that the peer request and
chaincode ports match the externally mapped ports. This
enables applications both inside and outside the Docker
network to use service discovery to interact with these
networks (see the JIRA for more details).

Change-Id: I73c36dfdb269ec4225376fb04b1e7a087363e4cc
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2019-02-21 14:57:39 +00:00
Naga Pemmara
20ad472356 FAB-10801 format and styling for shell artifacts
formatting for existing shell scripts

Change-Id: I7e067730558bc55edc74b73e59195af7c825d8b2
Signed-off-by: Naga Pemmara <naga.pemmaraju@ibm.com>
2018-06-21 15:25:27 -04:00
Will Lahti
b5dad8cd25 [FAB-9317] Update first-network with multi endorse
This CR updates the first-network (BYFN and EYFN) to use an
'AND (...)' endorsement policy. It also cleans up some of the
output and fixes the line length of some comments.

Change-Id: I741f41226955ccfcd3eb5369d8ba6eb77e49e89e
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
2018-05-03 09:52:22 -04:00
Artem Barger
54b071bfdc Merge "FAB-9294 eliminate excess noise in BYFN" 2018-04-21 20:18:47 +00:00
nirro
2d6386c421 [FAB-8245] change first network according to the fix
fixed [FAB-8245], and fabric samples have to be changed accordingly.
currently, added support for both output formats.

Change-Id: I0cac063af44556d6a37f17b25abf20134032540f
Signed-off-by: nirro <nirro@il.ibm.com>
2018-04-17 15:47:45 +03:00
Christopher Ferris
77a65685c5 FAB-9294 eliminate excess noise in BYFN
eliminate the noise of echoing the environment
variables for each command and add -v option to
enable the noise for debug purposes for byfn.sh
and eyfn.sh in first-network sample

also eliminate noise in fabcar

Change-Id: I46c377360efbab598fd37c0a31b29a119b99173e
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2018-04-08 19:14:20 -04:00
Saad Karim
2bbb0a85b3 [FAB-8630] byfn failing intermittently in CI
byfn test failing intermittently in CI due to peer not
being available when the join channel command is
executed. Need to wait for peer to finsih establishing
connection with couchdb before joining channel.

The exit code was not being correctly captured from the
peer join command and thus the retry logic was not being
executed.

Change-Id: I2c27d17cd769c6b8de1bdcfed263d9b0f758b432
Signed-off-by: Saad Karim <skarim@us.ibm.com>
2018-03-08 11:36:08 -05:00
Christopher Ferris
10526d5a1d FAB-8564 add debug commands to byfn
replace DEBUG level logging w/INFO, but add in
shell debug statements for all fabric commands
for improved UX

Change-Id: I97a19db0373ecaf7a504cb95d4815a11cd64dfed
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
2018-02-28 10:05:33 -05:00
Surya
cba57da0dc [FAB-8165] Adding upgrade function to byfn
Adding upgrade functionality to byfn.sh to upgrade the fabric network
from v1.0.x to v1.1 and scripts for cli to enable
/Channel, /Channel/Orderer, /Channel/Application capabilities

Usage:
git fetch origin
git checkout origin/release
./byfn.sh -m up -i 1.0.6
git checkout origin/master
./byfn.sh upgrade

Change-Id: I6f53a6db39501e2653dc4c325d3d42d78f463e87
Signed-off-by: Surya <suryalnvs@gmail.com>
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
2018-02-27 21:13:42 +00:00
Angelo De Caro
24f35c1493 [FAB-7750] first network with support to FAB-5664
This change-set does the following:
- it modifies the first-network example to show how to use FAB-5664.
Namely, the identity classification is enabled by
setting EnableNodeOUs to true in crypto-config.yaml.
Then, the endorsement policy is changed to requires
peers and not members. Finally, cryptotx.yaml is modified
to enable v1.1 capabilities.

Change-Id: If8e943b5833b4402d612895449ac110ab2fee4b5
Signed-off-by: Angelo De Caro <adc@zurich.ibm.com>
2018-02-15 13:19:22 +01:00
Arnaud J Le Hors
1d69e9e2d1 [FAB-7540] Simplifies Reconfigure Your Network tutorial
This change brings a new set of scripts and configuration files to the
first-network sample to make it easier for people to follow the new
tutorial on how to add a third org to the network setup in BYFN.

To function properly the new Extend You First Network script (eyfn.sh)
must be run after byfn.sh is run and with the same parameters. So,
valid uses include:

./byfn.sh up
./eyfn.sh up

or

./byfn.sh up -c testchannel -s couchdb -l node
./eyfn.sh up -c testchannel -s couchdb -l node

A single './eyfn.sh down' command is however necessary to take the
whole network down.

Patch-set #2: fixes ./eyfn.sh down
Patch-set #3: removed unused option from Usage and spurious whitespaces
Patch-set #4: added missing test file

Change-Id: I9c926b52f2243dda1c5f9368112c314a6c5c6929
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2018-02-10 09:36:19 +01:00