Commit graph

1100 commits

Author SHA1 Message Date
Tatsuya Sato
bda72cac00 Move publishing of REST sample Image from AZP to GHA
This patch moves publishing of REST sample image from AZP to GHA.
This was the last job running on AZP.
Also, this patch fixes an error encounterd during the image build.
Publishing of REST sample image is now only executed when pushing to main.

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2023-09-28 12:38:43 -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
Mark S. Lewis
6e71f634e2 Fixes for build breakages
Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
2023-09-19 13:08:40 -04:00
Mark S. Lewis
30f70f6e73 Update TypeScript HSM sample application
- Update to Node 16.
- Simplify SKI code using Node standard packages and avoiding use of jsrsasign.

Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
2023-09-19 13:08:40 -04: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
munapower
a6d8f44fdb minor documentation fixes smart contract dev
Signed-off-by: munapower <mmunaro@hotmail.com>
2023-07-28 14:19:58 +09:00
munapower
5870033fcb spanish translation smart contract dev
Signed-off-by: munapower <mmunaro@hotmail.com>
2023-07-28 14:19:58 +09:00
geekya215
9ee0aac2ae
fix typo in high-througput/README.md (#1073)
Signed-off-by: geekya215 <geekya215@gmail.com>
2023-07-14 17:42:13 +09: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
yjwxfq
7671bdd7c6 Update token_contract.go, checking the input params > 0 in function sub().
Signed-off-by: yjwxfq <112159687+yjwxfq@users.noreply.github.com>
2023-06-20 12:21:41 -04:00
yjwxfq
9a4920d565 Update token_contract.go, modify the overflow judgment condition for function sub().
The general overflow judgment condition for function sub is not in every case.
The judgment result is wrong in the condition of b < 0 && q >=0
for example, b = -3, q = 2, diff = -5, it's not overflow,
but if (diff > b) == (b >= 0 && q >= 0) wil be true.

for another example, b = -3, q = maxint, b-q is overflow,
but if (diff > b) == (b >= 0 && q >= 0) wil be false.

Signed-off-by: yjwxfq <112159687+yjwxfq@users.noreply.github.com>
2023-06-20 12:21:41 -04:00
Pushp Vashisht
bc3a6bfa05
Fix typo (#1048)
Signed-off-by: Pushp Vashisht <pushptyagi1@gmail.com>
2023-06-20 07:17:16 +02:00
Tatsuya Sato
2c0fe75438 Minor improvements on test-network-nano-bash
- Fix typos
- Update gitignore

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2023-06-16 16:45:22 -04:00
Tatsuya Sato
bb98f1e582 FSAT: Extend sleep time to stabilize integration test
This patch extends the sleep time to wait for starting
nginx by following the description on
full-stack-asset-transfer-guide/justfile
to stabilize the intergration test

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2023-06-16 16:44:36 -04:00
Dave Enyeart
ae9e7e8df8
test-network-nano-bash chaincode id and waitForEvent improvements (#1052)
- Use calculatepackageid to set CHAINCODE_ID
- Use waitForEvent to wait for commit event intead of 2s sleep

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-06-09 21:48:39 +09:00
Arkadi Piven
81390fbbbf Fix nano-bash-bft sample to work with channel-participation.
remove dependency on deprecated system-channel.

Signed-off-by: Arkadi Piven <arkadi.piven@ibm.com>
Signed-off-by: arkadipiven <arkadi7770@gmail.com>
2023-06-07 10:17:46 -04:00
yjwxfq
20009ecd02 Update token_contract.go, modify the overflow judgment condition for function add()
Signed-off-by: yjwxfq <112159687+yjwxfq@users.noreply.github.com>
2023-06-06 15:26:09 -04:00
Ry Jones
2f11c4410f
chore(docs): fix discord link (#1044)
Signed-off-by: Ry Jones <ry@linux.com>
2023-05-25 16:41:02 +02:00
David Enyeart
5df2404b08 Nominate Tatsuya Sato as fabric-samples maintainer
Tatsuya has been helping to groom fabric-samples for multiple years.
More recently, Tatsuya has helped to keep test-network-k8s
and full-stack-asset-transfer samples working well.
Tatsuya has expressed interest in becoming a maintainer and
I would welcome the addition!

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-05-22 07:53:42 -04:00
yunusemrekarakose
4691478bfb Update package.json
Signed-off-by: yunusemrekarakose <yemre05@hotmail.com.tr>
2023-05-17 13:40:30 -04:00
yunusemrekarakose
3d747bdcd3 Update package.json
Signed-off-by: yunusemrekarakose <yemre05@hotmail.com.tr>
2023-05-17 13:40:30 -04:00
Yunus Emre Karaköse
8f62557843 chaincode-typescript
Signed-off-by: YunusEmreKarakose <yemre05@hotmail.com.tr>
Signed-off-by: Ry Jones <ry@linux.com>
Signed-off-by: yunusemrekarakose <yemre05@hotmail.com.tr>
2023-05-17 13:40:30 -04:00
Tatsuya Sato
5c020f2a71 Update FSAT to use Fabric 2.5 by default
This patch updates full-stack-asset-transfer to Fabric 2.5 by default.
In particular, since k8s-builder-peer is set as the default value for
peer image, it needs to be updated to use 0.11.0, which is derived
from Fabric v2.5 image, as the version default value.

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2023-05-17 13:23:08 -04:00
Tatsuya Sato
f8f52cab71 test-network-k8s: Update k8s CC builder to 0.11.0
This patch updates k8s CC builder to 0.11.0 to resolve the
distribution mismatch between k8s-builder base image and fabric-peer
base image.

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2023-05-09 22:11:57 -04:00
David Enyeart
57127ac75a Update test-network-k8s to Fabric v2.5
Update test-network-k8s to use Fabric v2.5.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-05-09 22:11:57 -04:00
Mark S. Lewis
e93cfacf1f Use Java gRPC instead of Netty API to establish TLS connections
Include specific gRPC TLS implementation in dependencies instead of relying on an appropriate one to be present as a transitive dependency.

Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
2023-05-08 14:17:21 -04:00
Dave Enyeart
84f9ba1dc4
Update CI to Fabric v2.5.1 (#1032)
Update CI to use Fabric v2.5.1.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-05-05 13:34:07 +01: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
Mark S. Lewis
628331d1a2 Fix error in full-stack-asset-transfer-guide docs
- Set correct CERTIFICATE file name in application ChaincodeEvents exercise.
- Add required environment variables to application AssetTransfer exercise, rather than rely on the RunApplication exercise being run in the same terminal first.

Signed-off-by: Mark S. Lewis <Mark.S.Lewis@outlook.com>
2023-05-02 12:46:03 -04:00
Javier Ruiz
74c48ec5aa Fix DOKS section
Signed-off-by: Javier Ruiz <japi@kolokium.com>
2023-05-01 15:21:08 -04:00
Mark S. Lewis
3eaabe789c Fix build failure in full-stack-asset-transfer
A typo in the 10-appdev-e2e.sh script caused the shell to exit with an error status, and the killall command appears to match some key processes in the runner so removing.

Also:
- Update sample application and smart contract to Node 18, using the latest fabric-contact-api release.
- Use release versions of Fabric v2.5 and update tool versions in workflow set up.
- Use GitHub Action to install just instead of curl of install script.

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
2023-04-27 16:07:36 -04:00
Arnaud J Le Hors
36ad010124 Fix erc-1155 sample README
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2023-04-24 17:27:08 -04:00
wisecoach
9e38280be2 fixed test-network-k8s/scripts/test_network.sh missing
fixed test-network-k8s/scripts/channel.sh missing

Signed-off-by: wisecoach <827165648@qq.com>
2023-04-24 17:11:12 -04:00
Ry Jones
c2f106adf1 chore(ci): use dedicated Fabric runners
Signed-off-by: Ry Jones <ry@linux.com>
2023-04-20 17:26:24 -07:00
Tatsuya Sato
aa153474f2
Fix npm problems on asset-transfer-basic/chaincode-typescript (#935)
* Fix npm problems on asset-transfer-basic/chaincode-typescript

This patch fixes npm problems on
asset-transfer-basic/chaincode-typescript.
- Sync npm-shrinkwrap.json with package.json to fix the npm ci error
- Update the version of TypeScript to avoid the type error on logform

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>

* Update npm-shrinkwrap.json

Fix dependencies

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

---------

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
Co-authored-by: Arnaud J Le Hors <lehors@us.ibm.com>
2023-04-20 17:18:43 +02:00
Krishnasuri Narayanam
2c831e4590
GetID to return clientId in base64 form (#771)
Signed-off-by: Krishnasuri Narayanam <knaraya3@in.ibm.com>
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
Co-authored-by: Arnaud J Le Hors <lehors@us.ibm.com>
2023-04-20 15:28:52 +02:00
Ry Jones
21361ae7b4 Apply suggestions from code review
Signed-off-by: Ry Jones <ry@linux.com>
2023-04-19 08:18:16 -07:00
David Enyeart
73e4d98dd9 Cancel existing workflows on subsequent PR push
Cancel existing workflows on subsequent PR push.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-04-19 08:18:16 -07:00
Matthew B White
7c42ff3d8e
Update the npm-shirnkwrap.json (node 16 used) (#1018)
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2023-04-12 15:18:58 +02:00
Matthew B White
67ae2c9d02 Correct the private data collection information
For the asset transfer example (https://hyperledger-fabric.readthedocs.io/en/release-2.5/private_data_tutorial.html#pd-use-case)
the are three private data collections, one per org and one shared between the orgs.

The shared collection didn't have an endorsement policy so inheritted the chaincodes; this was specifically set away from the default
to be OR(Org1MSP,Org2MSP).   The documentation says this is to ensure that either organization can create and asset.

However this isn't really necassary, the endorsement policy should be lowest level; so this PR moves the endorsement policy to
the collection.  The documentation does I believe lead to a false understanding

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2023-03-22 16:19:56 -04:00
Dave Enyeart
75b8419113
Sample apps should exit code 1 upon failure (#1003)
Ensure that all sample applications return exit code 1 upon failure
so that github actions can report the failure.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-03-17 13:18:18 +00:00
Dave Enyeart
00c561457f
Update samples to use Fabric v2.5.0-beta2 by default (#1006)
Update samples to use Fabric v2.5.0-beta2 by default.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-03-17 13:17:39 +00:00
Dave Enyeart
efbecb6d10
Add debug logging to CI scripts (#1007)
Add debug logging to CI scripts.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-03-17 13:11:30 +00: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