Commit graph

72 commits

Author SHA1 Message Date
Mark S. Lewis
e1c4fffee4 Reference v2.2 Fabric documentation
These samples target Fabric v2.2 but contained references to the
latest version of the Fabric documentation, many of which were broken
links since the structure and content of the Fabric documentation has
changed.

This change updates links to the Fabric documentation so that they
refer to release-2.2.

Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
2024-09-12 08:41:28 -04:00
Kaushik Kumar Bora
921d6ff15c
fix docker compose version 2 -> 2.1 (#649)
* fix docker compose version 2 -> 2.1

Signed-off-by: kaushikkumarbora <kaushikkumarbora@gmail.com>

* fixed missing space in docker compose files

Signed-off-by: kaushikkumarbora <kaushikkumarbora@gmail.com>
2022-02-21 20:57:44 +01:00
Varad Ramamoorthy
a72fbc8a91
sync ports for operations endpoint with main (#627)
* sync ports for operations endpoint with main

Signed-off-by: Varad Ramamoorthy <varad@us.ibm.com>

* oops! add port mapping

Signed-off-by: Varad Ramamoorthy <varad@us.ibm.com>

* fix address

Signed-off-by: Varad Ramamoorthy <varad@us.ibm.com>
2022-02-03 17:23:02 -05:00
Justin Yang
ad8fc2fba7
test-network: Make the regexp of checking version more strict (backpo… (#516)
* Updated dependencies for Json and fabric-chaincode-shim:2.+ in java samples (#481)

* fixed json dependencies for java

Signed-off-by: fraVlaca <ocsenarf@outlook.com>

* updated dependency for asset-tranfer-sbe: now declaing also org.hyperledger.fabric.protos.common

Signed-off-by: fraVlaca <ocsenarf@outlook.com>

* "corrected typo of last commit and added testImplementation 'org.hyperledger.fabric.protos.common'"

Signed-off-by: fraVlaca <ocsenarf@outlook.com>

* included correct dependecy for fabric-protos and added com.google.protobuf as well

Signed-off-by: fraVlaca <ocsenarf@outlook.com>
Signed-off-by: Justin Yang <justin.yang@themedium.io>

* test-network: Make the regexp of checking version more strict (backport #515)

Signed-off-by: Justin Yang <justin.yang@themedium.io>

* Updated dependencies fabric-chaincode-shim:2.2.+ in java samples from 2.+

Signed-off-by: Justin Yang <justin.yang@themedium.io>

Co-authored-by: fraVlaca <86831094+fraVlaca@users.noreply.github.com>
2021-11-01 08:40:29 +00:00
denyeart
e496083c0b
Remove .env Files and Explicitly Name Network (#417) (#469)
There have been lots of changes and quirks with the
docker-compose .env file, this change removes the file
and explicitly creates and assigns the networks in the
compose yaml files.

Signed-off-by: Brett Logan <lindluni@github.com>
Signed-off-by: David Enyeart <enyeart@us.ibm.com>

Co-authored-by: Brett Logan <lindluni@github.com>
2021-08-30 11:59:19 -04:00
Varad Ramamoorthy
b2a89cffbc
expose operations port (#454)
Signed-off-by: Varad Ramamoorthy <varad@us.ibm.com>
2021-07-06 08:38:57 +01:00
Nikhil Gupta
5b8c4390db Cleanup of register/enroll script
Signed-off-by: Nikhil Gupta <ngupta@symbridge.com>
2021-01-18 14:22:20 -05:00
Will Lahti
9b8f50e2d0
Remove Org3cli and configtx.yaml anchor peers from test-network (#401)
* Remove Org3cli from test-network

FAB-18381

Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

* Remove configtx.yaml anchor peers from test-network

These values were only used by configtxgen's --outputAnchorPeerUpdate
function and should not be set in a channel genesis block This is because
a peer cannot be an anchor peer for a channel until it has joined that
channel and it can't join a channel until the genesis block has been
created.

FAB-18381

Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
2021-01-11 11:27:58 -05:00
Will Lahti
b690d8f30f
Stop using deprecated outputAnchorPeersUpdate in test-network (#394)
* Stop using deprecated outputAnchorPeersUpdate in test-network

FAB-18381

Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

* Improve consistency of test-network output

Signed-off-by: Will Lahti <wtlahti@us.ibm.com>
2021-01-07 13:22:03 -05:00
Brett Logan
df752bfc7b
Explicitly Mount the Docker Unix Socket (#397)
Instead of mounted the entire /var/run directory
explicitly mount the unix socket. Mounting the entire
directory causes issues with future versions of Docker
on some platforms.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2021-01-04 13:47:57 -05:00
Julian Castrence
27ac653c74
Completely Remove Short Name Support (#390)
Signed-off-by: Julian Castrence <juliancastrence@ibm.com>

Co-authored-by: Julian Castrence <juliancastrence@ibm.com>
2020-12-22 18:10:58 -05:00
The Coder X Tea
541cebe154
correct typing (#391)
Signed-off-by: tuyendev <tuyendev@gmail.com>
2020-12-11 08:44:57 -05:00
Julian Castrence
d6773d502c Remove Short Names and Replace With Full Path in Samples
Signed-off-by: Julian Castrence <juliancastrence@ibm.com>
2020-12-02 23:59:42 -05:00
Arnaud J Le Hors
613d269f15
Fix test-network chaincode packaging log (#383)
The chaincode packaging function wrongly implies that the packaging
operation is performed on a peer when it is in fact done locally.
This change fixes that.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2020-12-01 08:30:46 -05:00
denyeart
e29ee4d7d9
Revert "Mount configuration files (#376)" (#380)
This reverts commit 0998528b3e.
2020-11-25 11:36:11 -05:00
nikhil550
0998528b3e
Mount configuration files (#376)
Signed-off-by: Nikhil Gupta <ngupta@symbridge.com>
2020-11-24 11:04:29 +01:00
harrisob
9f245809bb
Add Asset-Transfer-Events (#325)
Add new chaincode and javascript application to demostrate
the use of chaincode events and block events with private data.

Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2020-11-04 15:13:08 +01:00
David Enyeart
1794c026c9 Update CouchDB to 3.1.1
Update CouchDB in CI and test-network to 3.1.1.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2020-10-22 19:18:55 -04:00
NIKHIL E GUPTA
327e3a78aa Remove restart mode and add mode specific help text
Signed-off-by: NIKHIL E GUPTA <ngupta@symbridge.com>
2020-10-07 03:03:00 -04:00
nikhil550
75e3be1137
Remove instantiate comment (#343)
Signed-off-by: NIKHIL E GUPTA <ngupta@symbridge.com>
2020-10-03 07:53:52 +02:00
nikhil550
ed598f733b
Update help text for colors on mac (#337)
Signed-off-by: NIKHIL E GUPTA <ngupta@symbridge.com>
2020-09-17 14:27:21 -04:00
user00000001
3d2875c180
Fixed script bugs "SendTransaction failed: orderers is nil". (#326)
Signed-off-by: jiangyunbin <yunbin.jiang@anchain.ai>

Co-authored-by: jiangyunbin <yunbin.jiang@anchain.ai>
2020-09-16 10:48:39 -04:00
nikhil550
aaaf1ba59b
Replace waiting period (#331)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-09-15 15:35:38 +02:00
IKEGAWA. Koshi
c2e6c9f46e
Fix help messages (#332)
Signed-off-by: ikegawa-koshi <koshi.ikegawa.mf@hitachi.com>
2020-09-15 08:55:36 -04:00
Chris Gabriel
521d4b5873
Update script artifacts removal to reference basic.tar.gz and remove fabcar (#317)
Signed-off-by: Chris Gabriel <chris_gabriel_98@yahoo.com>

udpate artifact removal to include all .tar.gz

Signed-off-by: Chris Gabriel <chris_gabriel_98@yahoo.com>
2020-08-31 14:51:43 -04:00
Naser Mirzaei
eb88315107
add utils.sh and colorize messages (#310)
* add utils.sh and colorize messages

Signed-off-by: Naser Mirzaei <nasermirzaei89@gmail.com>

* rename utils to scriptUtils

Signed-off-by: Naser Mirzaei <nasermirzaei89@gmail.com>
2020-08-27 16:43:19 -04:00
Naser Mirzaei
be3ce853dc hide set +x from output
Signed-off-by: Naser Mirzaei <nasermirzaei89@gmail.com>
2020-08-21 13:03:30 -04:00
NIKHIL E GUPTA
026217db9a Add sbe to help text
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-08-10 09:20:35 -04:00
Gaurav Giri
02368e99b0 SBE Improvements and Referencing SBE in fabric-samples readme and test-network
Signed-off-by: Gaurav Giri <girigaurav@gmail.com>
2020-08-09 14:58:18 -04:00
tyanj
55c0b47952
[BUG] res=$? missing (#260)
Signed-off-by: tyanj <653291675@qq.com>
Signed-off-by: Ry Jones <ry@linux.com>

Co-authored-by: Ry Jones <ry@linux.com>
2020-08-07 20:22:24 +02:00
Titas
0031db5de2
Fix deployment of chaincode with higher version than 9 issue (#243)
This script fails if chaincode version is higher than 9 as 'grep' does not match ex. version equal to '10'

Signed-off-by: Titas <titas.petravicius@gmail.com>
Signed-off-by: lehors <lehors@us.ibm.com>

Co-authored-by: Arnaud J Le Hors <lehors@us.ibm.com>
2020-08-06 22:59:25 +02:00
Raghu Saxena
6de6c77f8d
Update addOrg3.sh (#271)
Fixed a comment which said `Create Org1 Identities` to `Create Org3 Identities`
2020-07-29 12:05:42 -04:00
Brett Logan
1c500ba30e Use Busybox to Remove Files and Folders
We delete folders and files locally on the host system
today. If the user is not a super user the files can't
be deleted as they are created by a root user in the
containers. This change uses busybox to perform the
deletions instead so a root user can remove them.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-27 23:55:20 -04:00
NIKHIL E GUPTA
d72be92feb private data readme edits
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-07-27 23:37:41 -04:00
nikhil550
971af50cdf
Fix bugs in deployCC script (#265)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-07-23 23:36:33 -04:00
Arnaud J Le Hors
7771b4f216
Revert "Remove Typescript References (#258)" (#261)
This reverts commit 7a23d7872a.
2020-07-23 17:06:57 +02:00
Brett Logan
7a23d7872a
Remove Typescript References (#258)
As the Typescript examples are essentially just reiterations
of the same Javascript code, there is no benefit to having
providing examples in both languages. The functional code
was exactly the same in both languages. On the contrary it
meant we widened the surface of maitainence and thus we are
removing due to the limited benefit provided by the example
chaincode and applications.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-22 21:57:54 +02:00
Brett Logan
daa732d3d8 Revert "WIP (#253)"
This reverts commit d5ce443bee.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-20 13:18:45 -04:00
Brett Logan
d5ce443bee
WIP (#253)
* WIP

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>

* WIP 2

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-20 12:49:16 -04:00
Naser Mirzaei
12b07b40a9
use mkdir -p for create directories (#248)
Signed-off-by: Naser Mirzaei <nasermirzaei89@gmail.com>
2020-07-20 11:37:16 -04:00
nikhil550
f4c439ce8a
Add endorsement policy to chaincode deployment script (#247)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-07-17 08:58:19 -04:00
Bret Harrison
1f27c327f3 Allow install of a chaincode
options on the network script to deploy chaincode
-ccn The name to be used as the deployed name and used as
     the short name of known chaincodes when the -ccp is not included.
   known short names
     'basic' - asset-transfer-basic
     'secure' - asset-transfer-secured-agreement
     'ledger' - asset-transfer-ledger-queries
     'private' - asset-transfer-private-data
-ccl the language of the chaincode
-ccv the version
-ccs the sequence
-ccp [optional] the path to the chaincode, when provided
     the -ccn will be the deployed name
-cci [optional] the chaincode function to call during deployment
     that will perform an initialization of the channel state
     required for this chaincode

Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2020-07-15 10:39:12 -04:00
denyeart
9291154f78
Remove gossip leader election config from samples (#223)
In Fabric v2.2, the gossip defaults are changed to make
peers org leaders instead of using leader election.
This change removes the config from the samples, so that
the samples simply inherit the new peer defaults.
This will simplify the sample configuration.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2020-07-02 15:37:15 -04:00
Brett Logan
8b54e14ee4 Use Official CouchDB 3.1 Image
Fabric 2.2 removes official support for CouchDB 2.x.
The migration to 3.1 was to address fsync issues
in the underlying storage implementation in Couch.

This change moves to CouchDB 3.1 which requires the
user to now set an admin identity at startup.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-02 09:56:30 -04:00
Tatsuya Sato
fc0c2f81d9 [FAB-18020] Add config.yaml to msp folder for User1 in test-network
This patch adds missing config.yaml to msp folder for user1 in test-network
to make user1 work properly when using FabricCA.

Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
2020-06-23 22:45:37 -04:00
robmurgai
045d9b69bc
Update deployCC.sh (#199)
In queryInstalled()
Removing line:   echo PackageID is ${PACKAGE_ID}
the ```peer lifecycle chaincode queryinstalled``` cmd already prints the Package ID when successfull.

Signed-off-by: Rob Murgai <murgai@us.ibm.com>
2020-06-05 16:07:14 -04:00
Tatsuya Sato
8c7e8e1b2f
[FAB-17957] Delete --tls extra arguments from fabric-samples (#198)
`--tls` option of the peer command does not require any argument.
On the other hand, some scripts assign the arguments.

This patch deletes the unnecessary arguments.

Also, this patch fixes a minor problem on private data tutorial instructions
for base64 (Related to FAB-13777).

Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
2020-06-04 16:49:29 -04:00
Tatsuya Sato
808f035088
[FAB-17952] Fix test-network to use the latest version of fabric-ca (#195)
To get rid of hard-coded versioning and use the latest version of fabric-ca
in test-network, this patch modifies the existence check logic of
the fabric-ca-client binary in the same way as peer and orderer.

Also, this patch updates addOrg3.sh to use cai <ca_imagetag> option.

Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
2020-06-03 13:34:26 -04:00
Andrew Coleman
cda88df4f6
FABG-935 GoSDK Fabcar sample (#192)
Fabcar sample demonstrating the use of the new Gateway package in the Go SDK

Signed-off-by: andrew-coleman <andrew_coleman@uk.ibm.com>
2020-05-27 15:19:16 +01:00
nikhil550
c750e9db6a
Remove adding current directory to path (#184)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-05-15 11:34:15 -04:00