Commit graph

130 commits

Author SHA1 Message Date
Mark S. Lewis
c0a0104ca1 Fix test-network chaincode-as-a-service deployment
Resolves a regression introduced in e73bb717db.

Previous change defaulted to "auto" as the sequence number but omitted the call to generate the correct sequence number for the "auto" value. This resulted in "auto" being used as the sequence number, which is an error since an integer is required.

Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
2023-11-07 16:12:07 -05:00
Chris Elder
e73bb717db Add chaincode utilities
This change is meant to help cover end user functionality
that was previously covered by the blockchain VSCode Plugin.

Functions added:
- cc mode with package, list chaincode, invoke and query functions
- auto sequencing for chaincode deployment
- move variables into config file

Signed-off-by: Chris Elder <celder@Chriss-MacBook-Air.local>
2023-10-10 12:24:23 -04:00
Arne Rutjes
98f748155b add a retry to the test-network ccaas chaincode init command
Without this, the init command fails if the chaincode container is not ready.

Signed-off-by: Arne Rutjes <arne123@gmail.com>
2023-09-27 08:14:33 -06:00
Aditya Joshi
9441772423 updated help message for CFSSL
Signed-off-by: Aditya Joshi <adityaprakashjoshi1@gmail.com>
2023-09-27 08:08:20 -06:00
Aditya Joshi
e63c7d564e cfssl to generating certificates
Signed-off-by: Aditya Joshi <adityaprakashjoshi1@gmail.com>
2023-09-27 08:08:20 -06:00
Tatsuya Sato
f2c1c59c50 Fix OrdererEndpoints in test-network's bft sample
This patch fixes the description of orderer2-4 in OrdererEndpoints
in test-network's bft-config/configtx.yaml.

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2023-08-29 11:03:22 -04:00
Tatsuya Sato
7d5aaf11e2
Improve BFT sample on test-network (#1083)
This patch includes:
- Fixed a minor bug in the parsing of the BFT flag
- Added check for when a user attempts to use BFT orderer in
  Fabric network with CA
- Update of printHelp for use of the BFT flag
- Fixed explanations

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2023-08-28 15:38:14 +02:00
arkadipiven
eb16caf3d5 Fix test-network to work with BFT consensus.
Added a new option for creating channel:
Running ./network.sh createChannel -bft will initiate a channel running BFT orderers.
Using ./network.sh up -bft will initiate dockers for bft environment.
Added option for 4 orderers.

Add add_new_orderer_to_config.py which is referenced in the fabric official docs.

Signed-off-by: Arkadi Piven <arkadi.piven@ibm.com>
Signed-off-by: arkadipiven <arkadi7770@gmail.com>
2023-08-22 10:54:41 -04:00
Zhaoxuan "Tony" Wu
c04253d554
fix(test-network): ignore the error output when killing CCAAS containers (#1063)
Signed-off-by: Tony Wu <tonywu3027@me.com>
2023-07-04 13:01:30 +09:00
Dave Enyeart
e1d077582a
Bump CouchDB to 3.3.2 (#1028)
Bump CouchDB to 3.3.2.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-05-05 13:26:28 +01:00
Dave Enyeart
9a382c8fab
Add test-network org3 affilication (#1026)
The org3 affiliation is needed when registering users for org3.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-05-05 13:24:44 +01:00
Dave Enyeart
97a400ea28
Bump couchdb to 3.2.2 (#1008)
Bump couchdb to 3.2.2.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-03-17 13:08:55 +00:00
Dave Enyeart
dada89c710
Remove csr.hosts from msp enrollments (#1009)
Flag --csr.hosts is only relevant for tls enrollments, it adds the SAN to the TLS cert.
For msp enrollments, the cert is only used for identity, therefore there is no need for SAN and no need to pass --csr.hosts.
Having --csr.hosts for msp enrollments is misleading, this commit removes it.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-03-17 13:08:03 +00:00
Matthew B White
795673dee3
Add in examples and notes on using PurgePrivateData (#878)
* Add in examples and notes on using PurgePrivateData

- Update the configtx.yaml to enable the 2.5 capabillity
- Added purge into the chancode
- Added pruge into the application client code.

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>

* Temporarily remove java cc test

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2023-01-23 11:40:52 -05:00
Arnaud J Le Hors
0fe4d091d2
Fix network.sh (#886)
This adds a missing reference to $CONTAINER_CLI.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2023-01-18 09:16:05 -05:00
Parameswaran Selvam
f838d6b5a8
added a check for prereq into deploycc script (#884)
Signed-off-by: Parameswaran Selvam <parselva@in.ibm.com>

Signed-off-by: Parameswaran Selvam <parselva@in.ibm.com>
2022-12-14 09:31:10 +01:00
Matthew B White
2e421139a0
Remove mistaken msp path (#873)
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2022-11-18 15:54:08 +01:00
James Taylor
4eff55b75b
Fix test network chaincode deploy (#827)
Correctly check for installed chaincode and enable the same chaincode to be deployed on different channels

Signed-off-by: James Taylor <jamest@uk.ibm.com>

Signed-off-by: James Taylor <jamest@uk.ibm.com>
2022-09-09 12:33:27 +01:00
Arnaud J Le Hors
eb3acf34eb
Update CHAINCODE_AS_A_SERVICE_TUTORIAL.md (#804)
This change fixes a few minor errors and adds a note to help the user.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2022-08-22 17:13:06 -04:00
Arnaud J Le Hors
a1b7d20ebe Clarifies podman instructions for test-network
Also reverts to using install-fabric.sh which is preferred over bootstrap.sh.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2022-08-03 13:38:06 -04:00
Arnaud J Le Hors
bfe8f6e04d Update podman support information
This change updates the test-network README with up-to-date information
about using podman on Mac and improves support for podman in deployCCAAS.sh

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2022-08-03 12:06:39 -04:00
Zakaria Hossain Foysal
8ca50df4ff
Update setOrgEnv.sh (#748)
Type found in line 36 of setOrgEnv.sh file

Signed-off-by: Zakaria Hossain Foysal <zakaria15-9556@diu.edu.bd>
2022-05-26 13:55:02 +01:00
D
17d5b96493 fix error message in deployCC
Signed-off-by: D <d_kelsey@uk.ibm.com>
2022-05-13 06:28:31 -04:00
Basil K Y
fdcf07dc25
fix wrong indentationin in the connection profile generated for Org 3 (#715)
Signed-off-by: Basil K Y <techiebasil@gmail.com>
2022-04-18 06:38:48 -04:00
James Wilson
e1fb6269dc
Fix typo (#683)
* Fix Typo

Set up as two words functions as a verb.

Signed-off-by: James Wilson <jgwilson1214@gmail.com>
2022-03-23 15:18:22 +01:00
Yuki Kondo
70cce456d4
fix docs: Chaincode-as-a-service tutorial (#663)
This PR fixes the followings to run the tutorial.
- Add an instruction to set PATH to call the `peer` command.
- Correct an option for `deployCCAAS` to debug Chaincode.

Signed-off-by: Yuki Kondo <yuki.kondo.ob@hitachi.com>
2022-03-09 08:49:34 +00:00
D
b2d74ddbab fix addOrg3 for test network
Also added testing addOrg3 to build pipeline

Signed-off-by: D <d_kelsey@uk.ibm.com>
2022-03-03 17:14:49 -05:00
Kieran O Mahony
50a6dd62ad
Issue 602 (#641)
* check if running

Signed-off-by: Kieran O Mahony <Kieran.O.Mahony1@ibm.com>

* fix indent

Signed-off-by: Kieran O Mahony <Kieran.O.Mahony1@ibm.com>

better detection in create channel

Signed-off-by: Kieran O Mahony <Kieran.O.Mahony1@ibm.com>

bring network down first case

Signed-off-by: Kieran O Mahony <Kieran.O.Mahony1@ibm.com>

bring network down first case

changed count of containers to 4

Signed-off-by: Kieran O Mahony <Kieran.O.Mahony1@ibm.com>

add echo

Signed-off-by: Kieran O Mahony <Kieran.O.Mahony1@ibm.com>

typo

Signed-off-by: Kieran O Mahony <Kieran.O.Mahony1@ibm.com>

Co-authored-by: Kieran O Mahony <Kieran.O.Mahony1@ibm.com>
2022-02-20 22:43:01 -05:00
Matthew B White
19b8f6bcbd
Podman experimental and not native MacOs (#636)
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2022-02-08 15:39:39 +01:00
Matthew B White
ecbf3f5db1
Support for using podman with the test-network (#596)
* Experimental Support for using podman with the test-network

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>

* supplement podman with nerdctl

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>

* adds experimental support for nerdctl compose

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>

* install fabric images to containerd with 'nerdctl' pull

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>

* Podman Support

Use a core set of compose files, with overlays for specific details.
In the case of podman, the overlays refer to a specific core.yaml for the peer that distables the use of teh
docker daemon

In the case of docker, the overlays add enable the docker daemon accesss for the peer to create chaincode
containers

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>

Co-authored-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-02-08 06:41:56 -05:00
Matthew B White
b50611575b
Make network.sh more tolerant (#634)
The network.sh is dependent onbeing executed from the test-network directory
This PR makes it a little more tolerant, and will add a bin directgory based on the location
of the script - not just the PWD

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2022-02-08 12:08:59 +01:00
Dave Kelsey
893bc29bbe
further grafana dashboard improvements (#614)
- removed unused overrides
- addressed issue using $__interval which doesn't work as well as
$interval
- addressed issue where multiple channels may not give correct output
Signed-off-by: D <d_kelsey@uk.ibm.com>

Co-authored-by: D <d_kelsey@uk.ibm.com>
2022-02-02 15:30:09 +00:00
Dave Enyeart
9e9b8d3138
Update test-network to use org level ca-cert.pem (#609)
Although test network scripts functionally worked, they demonstrated
some strange patterns around use of the ca cert.

This change makes it clear that the ca cert is configured and used
at the org level, and not related to any individual peer or orderer node.
Also that when connecting to individual servers, clients can pass the
org level CA cert as the root of trust when establishing TLS connections.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2022-02-02 09:03:20 +00:00
Dave Kelsey
e2d351ed61
Minor improvement to test network docs (#607)
Also fix the version of prometheus and grafana being used
to ensure the queries remain compatible as well as avoid
issues whether they may not work if latest images already
exist on machine but are not at a level that will work

Signed-off-by: D <d_kelsey@uk.ibm.com>

Co-authored-by: D <d_kelsey@uk.ibm.com>
2022-02-01 15:53:30 +00:00
Dave Kelsey
f79190e88b
Update the grafana dashboard (#610)
Addresses some incorrect queries

Signed-off-by: D <d_kelsey@uk.ibm.com>

Co-authored-by: D <d_kelsey@uk.ibm.com>
2022-02-01 15:51:53 +00:00
Arnaud J Le Hors
730976a70e
Fix CHAINCODE_AS_A_SERVICE_TUTORIAL.md (#598)
This fixes several typos and more importantly add an instruction to
set FABRIC_CFG_PATH without which the peer command fails.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2022-01-29 16:19:50 -05:00
fraVlaca
77431f5b39
add prometheus/grafana performances sample into test-network directory (#576)
Signed-off-by: fraVlaca <ocsenarf@outlook.com>

added promethesus-grafana server to test-network

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

changed image for cadvisor to version that works on Linux

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

improved documentation on README and tweaked docker-compose file

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

updated and fixed documentation for the prometheus/grafana sample for the test-network

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

final modification to grafana dashboard and prom/graf docs

Signed-off-by: fraVlaca <ocsenarf@outlook.com>
2022-01-20 09:37:37 +00:00
Eugene
e0d11fe8de
remove shift after verbose (#586)
Signed-off-by: eugene9467 <eugene@kth.tw>

Co-authored-by: eugene9467 <eugene@kth.tw>
2022-01-19 14:35:20 +01:00
Justin Yang
0d7fa171d1
test-network: Fix a indentation for readability (#568)
Additionally, remove a trailing white space

Signed-off-by: Justin Yang <justin.yang@themedium.io>
2021-12-22 09:56:10 -05:00
Matthew B White
e07a9ff86b
Adding examples of CCAAS and support into the test-network-k8s (#527)
* Changes to the test-network k8s deployment to use the
built-in as-a-service chaincode builder from the Peer Container

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>

* Remove the ccaas init container from org2 peer; tweak docs on ccaas config

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>

Co-authored-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2021-12-17 14:09:03 +00:00
Matthew B White
96623f1bd5
Adding examples of CCAAS and support into the test-network (#560)
- Updated the test-network with examples of runnig CCAAS
- Updating the asset transfer basic with how to run chaincode as a service.

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2021-12-17 13:18:22 +00:00
sapthasurendran
9df7e9f86d
Configtxlator script changes (#552)
Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
2021-12-09 11:37:38 +00:00
fraVlaca
ce66638035
Extend test network to support prometheus/grafana performances framework (#542)
Signed-off-by: fraVlaca <ocsenarf@outlook.com>
2021-11-24 16:04:42 +00:00
Justin Yang
d47b2c286a
test-network: Make the regexp of checking version more strict (#515)
Signed-off-by: Justin Yang <justin.yang@themedium.io>
2021-10-26 11:24:15 +01:00
Matthew B White
a97c0b0359
Add in a setEnvOrg script (#487)
Helper script to set environment variables, so make it eaiser to use the peer command
from the shell command line

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2021-09-08 14:54:11 +00:00
nikhil550
38e08da13b
Rm docker files mount for CLI container (#479)
Signed-off-by: Nikhil Gupta <ngupta@triplepointliquidity.com>

Co-authored-by: Nikhil Gupta <ngupta@triplepointliquidity.com>
Co-authored-by: Arnaud J Le Hors <lehors@us.ibm.com>
2021-09-07 14:22:26 +00:00
QQ喵
42c456ffda
Clean install folder for Java (#475)
Signed-off-by: gqqnbig <gqqnb2005@gmail.com>

Co-authored-by: Matthew B White <mbwhite@users.noreply.github.com>
2021-09-03 07:54:36 +00:00
nao
b8edd6593f
Fix: logspec output (#470)
If ORDERER_KAFKA_VERBOSE is true, the output of /logspec will contain
the following kafka information even if it is raft orderer.
{"spec":"orderer.consensus.kafka.sarama=debug:info"}
This PR deletes environment valiable for kafka in docker-compose.

Signed-off-by: Nao Nishijima <nao.nishijima.xt@hitachi.com>
2021-09-03 08:09:51 +01:00
Arnaud J Le Hors
2b47c9f0c0
Update Compose Spec & VM Spec Version (#482)
Based on PR 449 by Brett Logan <lindluni@github.com>

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2021-09-02 10:26:14 +01:00
Tatsuya Sato
8890d49d19
Fix typo (#466)
Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2021-08-02 13:33:25 -04:00