Commit graph

1044 commits

Author SHA1 Message Date
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
Matthew B White
5bc925a3d8
Add in 2.5 java test (#917)
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2023-01-25 09:03:46 -05:00
HousniAbdellatife
406d7e9d36
fix java contract paperkey parameter in commercial paper example (#905)
Signed-off-by: HousniAbdellatife <abdellatife.housni@gmail.com>
2023-01-25 08:48:10 -05:00
dependabot[bot]
9b1de5e0b1
Bump minimatch in /asset-transfer-basic/rest-api-typescript (#887)
Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2.
- [Release notes](https://github.com/isaacs/minimatch/releases)
- [Changelog](https://github.com/isaacs/minimatch/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/minimatch/compare/v3.0.4...v3.1.2)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-24 09:35:08 -05:00
dependabot[bot]
a231e12caa
Bump json5 in /asset-transfer-basic/rest-api-typescript (#898)
Bumps [json5](https://github.com/json5/json5) from 2.2.0 to 2.2.3.
- [Release notes](https://github.com/json5/json5/releases)
- [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md)
- [Commits](https://github.com/json5/json5/compare/v2.2.0...v2.2.3)

---
updated-dependencies:
- dependency-name: json5
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-24 09:34:28 -05:00
dependabot[bot]
7c46fdb087
Bump cookiejar in /asset-transfer-basic/rest-api-typescript (#916)
Bumps [cookiejar](https://github.com/bmeck/node-cookiejar) from 2.1.2 to 2.1.4.
- [Release notes](https://github.com/bmeck/node-cookiejar/releases)
- [Commits](https://github.com/bmeck/node-cookiejar/commits)

---
updated-dependencies:
- dependency-name: cookiejar
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-01-24 08:47:59 -05: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
jkneubuh
124adb43f9
run test suites with 2.5 binaries and images (#906)
* run test suites with 2.5 binaries and images

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

* Swap to use the Helper Function to create policies (#907)

The old way used the direct protobuf functions, there is a helper function
in the chaincode does exactly that.

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

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
Co-authored-by: Matthew B White <whitemat@uk.ibm.com>
2023-01-18 16:05:40 +00: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
Rubén
bcb2e1c910
fix chaincodes typo (#900)
Signed-off-by: Rubén <20502699+rubcv@users.noreply.github.com>

Signed-off-by: Rubén <20502699+rubcv@users.noreply.github.com>
2023-01-18 09:14:38 -05:00
Sam Yuan
5095954756
doc: add zh version for Fabric Full Stack Development Workshop Cloud Native Fabric part (#901)
Signed-off-by: Sam Yuan <yy19902439@126.com>
2023-01-18 09:13:54 -05:00
Matthew B White
e7d3b41287
Swap to use the Helper Function to create policies (#908)
The old way used the direct protobuf functions, there is a helper function
in the chaincode does exactly that.

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2023-01-18 07:25:07 -05:00
Matthew B White
a70547dd94
Update the name of the certificate. (#902)
Late 2022 it was discovered that when used via the CA, the certificate had a fixed named covention. cert.pem

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

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2023-01-09 10:16:03 -05:00
Ramesh M
1e6fe3b261
Update 13-kube-public-cloud.md (#891)
Signed-off-by: Ramesh M <62267259+ramdisk-ott@users.noreply.github.com>
2023-01-03 14:06:55 -05:00
skypos99
b23274b945
Update 10-kube.md (#890)
Signed-off-by: skypos99 <116450739+skypos99@users.noreply.github.com>

Signed-off-by: skypos99 <116450739+skypos99@users.noreply.github.com>
2023-01-03 14:03:59 -05:00
Deepak Singh
09959b967d
Update org1-peer2.yaml (#882)
Fixing TLS issues while using org1-peer-gateway-svc.${DOMAIN}.
This would be needed so there are no TLS issues when sending requests.

Signed-off-by: Deepak Singh <91736795+blockguardian@users.noreply.github.com>

Signed-off-by: Deepak Singh <91736795+blockguardian@users.noreply.github.com>
2023-01-03 14:02:45 -05:00
Marcus Brandenburger
8d0e632d86
Clean up full-stack-asset-trasfer-guide docs (#889)
Remove old repository (hyperledgendary) link from readme diagram.

Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>
2022-12-14 11:24:23 -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
dependabot[bot]
a96efaebde
Bump qs and express in /asset-transfer-basic/rest-api-typescript (#880)
Bumps [qs](https://github.com/ljharb/qs) to 6.11.0 and updates ancestor dependencies [qs](https://github.com/ljharb/qs), [qs](https://github.com/ljharb/qs) and [express](https://github.com/expressjs/express). These dependencies need to be updated together.


Updates `qs` from 6.10.2 to 6.11.0
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.2...v6.11.0)

Updates `qs` from 6.10.1 to 6.11.0
- [Release notes](https://github.com/ljharb/qs/releases)
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ljharb/qs/compare/v6.10.2...v6.11.0)

Updates `express` from 4.17.1 to 4.18.2
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.17.1...4.18.2)

---
updated-dependencies:
- dependency-name: qs
  dependency-type: indirect
- dependency-name: qs
  dependency-type: indirect
- dependency-name: express
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-12-14 09:23:23 +01:00
ali
05c06f4931
Fixed comment consistency problem (#844)
* fixed comment consistency problem with erc20 chaincode

Signed-off-by: Ali Shahverdi <ali@Alis-MacBook-Pro.local>

* added more comment consistancy fix

Signed-off-by: Ali Shahverdi <ali@Alis-MacBook-Pro.local>

* added more comment consistancy fix

Signed-off-by: Ali Shahverdi <ali@Alis-MacBook-Pro.local>

* added more comment consistancy fix

Signed-off-by: Ali Shahverdi <ali@Alis-MacBook-Pro.local>

* added more comment consistancy fix

Signed-off-by: Ali Shahverdi <ali@Alis-MacBook-Pro.local>

Signed-off-by: Ali Shahverdi <ali@Alis-MacBook-Pro.local>
Co-authored-by: Ali Shahverdi <ali@Alis-MacBook-Pro.local>
2022-12-14 09:18:21 +01:00
Basil K Y
b2de360e1c
REST api added for asset transfer in Golang (#836)
* REST api added for asset transfer in Golang

Signed-off-by: Basil K Y <techiebasil@gmail.com>

* add go.sum to git

Signed-off-by: Basil K Y <techiebasil@gmail.com>

* fix golint error

Signed-off-by: Basil K Y <techiebasil@gmail.com>

Signed-off-by: Basil K Y <techiebasil@gmail.com>
2022-12-14 09:16:09 +01:00
Mark S. Lewis
4109e741e4
Parse transaction creator to Identity in off_chain_data samples (#883)
Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
2022-12-13 13:18:50 +00:00
Mark S. Lewis
a6028cd398
Fix asset-transfer-basic/application-gateway-go (#874)
Error handling example used a transaction invocation with the wrong number of arguments and so did not demonstrate the same error condition as other language samples. The error handling code was also not as comprehensive as it should be.

Also changed the console output throughout to match the content and format of the Node and Java samples.

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
2022-11-30 13:21:49 +00:00
Satoshi Ito
22e1af4935
Minor fixes to the ingress setting (#850)
This patch fixes the ingress setting so that the peer-gateway works correctly.

Signed-off-by: Satoshi Ito <satoshi.ito.tf@hitachi.com>
2022-11-21 14:44:59 -05: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
Josh Kneubuhl
fd2fffbd43 review feedback: un-pin fabric CLI targets
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-11-15 16:08:24 -05:00
Josh Kneubuhl
94a1542782 Run Full Stack Asset Transfer Guide tests on GHA
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-11-15 16:08:24 -05:00
Josh Kneubuhl
38a36c65d3 Move the remaining sample tests from Azure to GHA
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-11-15 11:18:11 -05:00
Josh Kneubuhl
b7b06b9de3 Move Kube Test Network tests from Azure -> GHA
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-11-14 22:55:18 -05:00
Josh Kneubuhl
156f6d42fb Delete commercial paper and fabcar tests from Azure
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-11-14 16:25:27 -05:00
jkneubuh
0ce94bbb9b
Move lint and test-network-basic tests from Azure to GHA - READY FOR MERGE (#862)
* Move Test Network Basic tests from Azure to GHA

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

* Move linters from Azure to GHA

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

* Apply review comments - pin java, node, and go runtimes

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

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-11-14 13:36:55 +00:00
Josh Kneubuhl
34734cfff2 Add FSAT appdev E2E test
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-11-11 13:18:29 -05:00
jkneubuh
60a61b8241
Only run GHA on PRs targeting the mainline (#860)
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-11-11 10:16:58 -05:00
jkneubuh
e908a30d3a
Activate GHA on the fabric-samples project (#859)
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-11-11 13:21:26 +00:00
Ry Jones
2c5ce16f0b Default branch
Add issues

Signed-off-by: Ry Jones <ry@linux.com>
2022-11-10 10:03:03 -08:00
jkneubuh
a299e18e26
Moves the Full Stack Asset Transfer Development Guide to fabric-samples (#852)
* Import Full Stack Asset Transfer Guide at commit fb554befdbbeff9e69159b54fce0b811603f29c7

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

* Update the workshop with a new WORKSHOP_PATH under fabric-samples

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

* Update the workshop with a new WORKSHOP_PATH under fabric-samples

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

* missed a .git ignored directory on add

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

* Updates to run the workshop on the Apple M1

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

* Workaround for https://github.com/eslint/eslint/issues/15299 in the contract tslinter

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

* Build an arch-specific CC images on M1

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

* empty commit - force a build

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

* revert an accidental commit that was building the top-level asset-transfer as arm64

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

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-11-10 10:40:27 -05:00
Tatsuya Sato
49749c6584
Minor fixes and improvements to test-network-k8s (#849)
Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2022-10-26 05:43:26 -04:00
Mark S. Lewis
63cc77bdc3
Avoid usage of deprecated ioutil Go package (#843)
* Refactor Go files
1. replace deprecated ioutil functions (ioutil is deprecated since Go 1.16)
2. fix variable names that collide with imported package name
3. fix typos

Also update Go version specified by Go modules to ensure a Go version is used in which ioutil is deprecated and replacement functions are available in os and io packages.

Signed-off-by: Tommy TIAN <xtianae@connect.ust.hk>
Co-authored-by: Mark S. Lewis <mark_lewis@uk.ibm.com>

* Specify go 1.18 instead of go 1.19 in go.mod files

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>

Signed-off-by: Tommy TIAN <xtianae@connect.ust.hk>
Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
Co-authored-by: Tommy TIAN <xtianae@connect.ust.hk>
2022-10-25 07:04:39 -04:00
Mark S. Lewis
c323c95807
Update samples to use fabric-gateway v1.1.1 (#842)
Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
2022-10-20 17:43:55 +01:00
yjwxfq
6b989299e0
Fix chaincode/abstore, add parameter judgment when the transaction makes payment. (#825)
Signed-off-by: yjwxfq <yjwxfq@163.com>

Signed-off-by: yjwxfq <yjwxfq@163.com>
2022-10-20 15:49:47 +01:00
James Taylor
0aa853e0c3 Update go chaincode samples
Update to the latest github.com/hyperledger/fabric-contract-api-go

Signed-off-by: James Taylor <jamest@uk.ibm.com>
2022-10-18 15:28:20 -04:00
dependabot[bot]
ea533d61b9
Bump passport in /asset-transfer-basic/rest-api-typescript (#828)
Bumps [passport](https://github.com/jaredhanson/passport) from 0.4.1 to 0.6.0.
- [Release notes](https://github.com/jaredhanson/passport/releases)
- [Changelog](https://github.com/jaredhanson/passport/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jaredhanson/passport/compare/v0.4.1...v0.6.0)

---
updated-dependencies:
- dependency-name: passport
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-09-09 17:48:14 +02:00