Commit graph

1085 commits

Author SHA1 Message Date
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
Mark S. Lewis
85fbbc0924 Fix Node HSM sample
Also:
- Tidy up README documentation.
- Add MacOS/Homebrew (Apple silicon) default SoftHSM library location to HSM scripts and sample applications to avoid the need to explicitly override the library location when running the sample.

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
2023-03-14 11:33:21 -04:00
Dave Enyeart
eb787b7afa
Update Go and Go dependencies (#996)
* Update go dependencies

Update go dependencies in sample chaincodes and applications

Signed-off-by: David Enyeart <enyeart@us.ibm.com>

* Update to Go 1.19.6

Update to Go 1.19.6

Signed-off-by: David Enyeart <enyeart@us.ibm.com>

---------

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-03-07 14:44:33 +00:00
Dave Enyeart
488e74ed08
asset-transfer-basic CI improvements (#998)
* Return exit(1) if application-java fails

If application-java fails, return an exit(1) code,
so that callers such as Github Actions CI can detect the failure.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>

* asset-transfer-basic CI improvements

- Application failure should result in CI failure
- Automatically remove wallet from prior runs
- Fix chaincode name issues, allow chaincode name to be passed from CI
- Fix appUser collisions (duplicate registration failures)
- Fix key create collisions across apps (in cases where same chaincode is used for multiple apps)

Signed-off-by: David Enyeart <enyeart@us.ibm.com>

---------

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-03-07 09:43:10 +00:00
Tatsuya Sato
199e290f5e
Fix gradle version used in asset-transfer-basic/chaincode-java image build to 7 (#961)
This patch fixes the gradle version used in asset-transfer-basic/
chaincode-java build to 7.

The reason is because the gradle version in the gradle:jdk11-alpine
image is updated from 7 to 8, which seems to cause the build to fail.

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2023-03-02 12:05:44 +00:00
David Enyeart
128950edca Fix go lint issue
Fix go lint issue by running goimports.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-03-02 00:44:36 -05:00
Dave Enyeart
f7b3a7703f Revert "Bump github.com/prometheus/client_golang (#932)"
This reverts commit a0b2822e71.
2023-03-01 11:51:42 -05:00
Dave Enyeart
1816d24732 Revert "Bump github.com/prometheus/client_golang (#933)"
This reverts commit fd4332d9c0.
2023-03-01 11:51:26 -05:00
David Enyeart
3af7eddcd3 Remove heritage chaincode samples
The samples repository has been refactored to focus on an asset transfer series of samples.
The goal of the samples repository is to align with the fabric documentation tutorials
with minimal other distractions.
The heritage samples were left in place for a period of time until the asset transfer series stabilized.
It is now time to purge the heritage samples.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-03-01 11:50:47 -05:00
David Enyeart
b8c2448bc6 Remove changelog script
Manual changelog is no longer created since github provides a changelog.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2023-03-01 11:20:43 -05:00
dependabot[bot]
fd4332d9c0
Bump github.com/prometheus/client_golang (#933)
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.1.0 to 1.11.1.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prometheus/client_golang/compare/v1.1.0...v1.11.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-23 16:18:03 +01:00
dependabot[bot]
a0b2822e71
Bump github.com/prometheus/client_golang (#932)
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.1.0 to 1.11.1.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prometheus/client_golang/compare/v1.1.0...v1.11.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-23 16:07:47 +01:00
dependabot[bot]
c723d812e9
Bump github.com/prometheus/client_golang in /fabcar/go (#931)
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.1.0 to 1.11.1.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prometheus/client_golang/compare/v1.1.0...v1.11.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-02-15 13:21:17 +01:00
Mark S. Lewis
10e9377555 Avoid explicit import of grpc-js or fabric-protos in TypeScript apps
Rely on the dependencies of @hyperledger/fabric-gateway making these packages transitively available. Having explicit dependency versions in the application can cause type conflicts due to private member changes in the gRPC Client class across versions.

Also fix some missing or incorrect Node types and engines version contraints.

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
2023-02-10 11:36:41 -05:00
Matthew B White
cb886be466 Commercial Paper
The Commercial Paper example code hasn't kept pace with the state-of-the-art of writing applications and chaincode

Whilst the scenario is still a valid usecase, the example itself is not helping - in fact causing confusion.

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2023-01-31 21:25:52 -05:00
jkneubuh
c986c8d227
Run FSAT tests with 2.5 images, binaries, and trigger on all builds for regression coverage (#919)
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2023-01-27 09:49:52 -05:00