This CR removes the unused variable 'OS_ARCH' from byfn.sh,
eyfn.sh and interest swap in fabric-samples.
FAB-9329 #done
Change-Id: I0d1b87679d66bec1d9e4aaee9e770305f9c8f4b9
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
BYFN and Fabcar with couchdb are failing intermittently
because CLI sends a request for joining a Channel before
a Peer connects to the couchdb.
This CR changes the value of MAX_RETRY from 10 to 15
as a workaround.
FAB-15601 #done
Change-Id: I8d91fa224c585cc52c9dfabebb808b8909253900
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
Update high throughput sample scripts for
chaincode lifecycle
Change-Id: I8e7f9d98bb62d75a779e2767b0e165a36a700d43
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
Update FabCar to use BYFN. As a result, the sample
client applications need to change so that they use
the correct connection profile paths, and so that
they use service discovery.
Change-Id: If02b7fb4ad308c6a7d1e1aa9f953e1bc4e942719
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Add a new "-n" option to byfn.sh that optionally skips
the deployment of the abstore chaincode. When BYFN is
used as a network for other samples, we don't really
want the default chaincode deployed.
Change-Id: I6b4043a5c0bcedbeec431cc4a860a3b12da8d8f6
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Add a new "-a" option to byfn.sh that optionally deploys
certificate authorities (in Docker containers) for
organisation 1 and 2.
Change-Id: Ib58c46941aa6e8e58bac01aa3349e97d1f93b930
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Add connection profiles as part of the BYFN and EYFN
samples. The connection profiles can be used by client
applications using the Fabric SDKs to connect to those
networks.
Each organisation needs its own connection profile
that contains the set of peers that organisation
should use to connect to the network. Orderers and
channels are not needed, as they can be determined
by using service discovery.
Connection profiles can be specified in either JSON
or YAML, so provide both.
Change-Id: Ie8e3d2aef6475b324e5be8ebdada4c594c2235ae
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Previously fabric-samples utilized the fabric list of maintainers. Over time
other contributors have become active. The fabric maintainers will use this
CR to vote for a new set of fabric-samples mainatiners, with the initial list
based on developers with the most contributions and reviews for fabric-samples
over the last 12 months.
Additionally, change fabric-samples from a two +2 policy to a
non-author code review policy.
Change-Id: I9c479f2e8a3dd7389e6e317aa4430cba1df9f3b3
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
The issue is that BYFN passes "Init" function while the
sample Java chaincode checks for "init" function.
Within the init function, there is no need to check the function
argument that is passed in. The sample Go chaincode and Node.js
chaincode do not check the function argument. This change makes
sample Java chaincode behave the same way.
Change-Id: I802978e1276e92a3d420b3f4a391ff66a352d321
Signed-off-by: David Enyeart <enyeart@us.ibm.com>
- implement sample app to issue, transfer, redeem and list tokens
- change basic-network/crypto-config.yaml user count to 2
- regenerate crypto and channel config via generate.sh
- add fabtoken/README.md
Change-Id: I8d270c95b29e4af9c432fb05e7e8dc6be7bbc069
Signed-off-by: Wenjian Qiao <wenjianq@gmail.com>
This patch updates CI pipeline scripts which utilizes global shared
library reusable functions. It also creates ci.properties file with
all the parameters required to test the fabric-samples patch.
Change-Id: I9ed97c8dd0c07a3677042dbda034043e8a19a0f1
Signed-off-by: rameshthoomu <rameshbabu.thoomu@gmail.com>
This change set upgrades config files, scripts and fixtures for the
basic-network sample.
Changes are as follows:
- configtx.yaml was amended adding capabilities and policies required
to bootstrap a 2.0 channel
- crypto-config.yaml was amended adding support for node OUs (so that
policies involving peers, admins and clients can be evaluated)
- generate.sh was amended adding the name of the orderer system channel
- generate.sh is executed, producing fixtures in the crypto-config and
config directories
- docker-compose.yml is changed specifying the correct SKI after
crypto material has been regenerated
- finally, startFabric.sh has been upgraded to use the new lifecycle
Change-Id: I201a98e3bf4d9717741539f572719aa687f4bb63
Signed-off-by: Alessandro Sorniotti <ale.linux@sopit.net>
This change is to add a delStandard() function to the
high-throughput fabric sample, as well as fix a typo
in putStandard(). In addition to modifying the
chaincode, an additional bash script,
'del-traditional.sh', was created to remotely delete
a created asset from within the docker CLI in
accordance with the sample walkthrough.
This change is necessary to demonstrate the full
capability of the fabric Shim library, such that no
assets remain on the ledger that the user doesn't want
This change was tested on a local deployment of
Fabric 1.4, using the 'Basic Network' asset that
was created by Ethan Fox for internal use by the
IBM Blockchain Innovation Unit within GBS Global.
Change-Id: I34488dc3131f817563568a43f923856fecb07a5a
Signed-off-by: Ethan Fox <Ethan.Fox@ibm.com>
This sample does not demonstrate best
practices.
Change-Id: I80fb5a7748ac6d067e52e8e0601a46cfb15cb0ac
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
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>
A sample application in Write Your First Application has an
unnecessary parameter “chainId” in a transaction proposal request.
Since a channel name is included in a channel object, it is not
required in a request.
This CR removes the parameter ”chainId” from the sample code.
FAB-12215 #done
Change-Id: I1e9b24c791a2129534766805855d05e78b050149
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
The tools and fabric images are all alpine based now and do not have
apt-get. Instead, they are prepopulated with jq. This CR simply
removes the attempt to install jq (which always fails) and acts as a
red-herring when trying to debug.
Change-Id: I8fe83dc4a9ba6995ebfb2786cee45fe0e591b85a
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
Extend the 3-node etcd/raft cluster in BYFN to 5 nodes, in
order to better support the documentation effort. This will
allow users to experiment creating channels with less then
5 nodes, but avoid the pitfalls of a 2-node cluster.
Change-Id: I5ba1d6039b4bb4864b2b97271de81fbfe91b4fb5
Signed-off-by: Yoav Tock <tock@il.ibm.com>
Building Chaincode fails with the ccenv container created from
Alpine because go build process can't import the shim package.
GOPATH in ccenv changed from "/opt/gopath" to "/go" due to the
move to Alpine. However, docker-compose-simple.yaml still has
`GOPATH=/opt/gopath`.
This CR removes the environment variable.
FAB-14369 #done
Change-Id: I18d9861d9b6f45c1548169fbb143e7883f8ba207
Signed-off-by: Yuki Kondo <yuki.kondo@hal.hitachi.com>
Augment the fabric-samples first-network sample to include an option
to choose etcd/raft as consensus-type.
Extend the -o flag so that it allows users to choose between the
solo, kafka, or etcdraft consensus-type for the ordering service.
Use three orderer nodes.
Change-Id: Ibc4c3564220466aef0a87baee4a2d594e5554a62
Signed-off-by: Yoav Tock <tock@il.ibm.com>
Configtxgen was failing to print the org definition for org3 because it
was missing the required policies for the org definition. This caused a
failure in the CI test for adding an org.
Because it will be needed in the future, this CR also adds the new
lifecycle endorsement and general endorsement policies to the
configtx.yamls as well.
Change-Id: Ie53165231cf8afe6377b51a28625797b15ca78ec
Signed-off-by: Jason Yellick <jyellick@us.ibm.com>
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>
