Commit graph

1087 commits

Author SHA1 Message Date
ofgarzon2662
3f33ce6c28 Solved Conflict Issues 2023-03-01 11:17:33 -08:00
ofgarzon2662
dde6397b13 Merge remote-tracking branch 'upstream/main'
Update of local Forked main branch with Upstream to keep everything up to date
2023-03-01 10:32:54 -08:00
FernandoGarzon
80087195ef
Merge pull request #2 from StevenYeu/unit-tests
added unit test for createuser, working on testing write and read schema to pdc
2023-03-01 10:06:56 -08:00
Steven Yeu
da0fd95fc7 removed tests for functions that don't exist 2023-03-01 09:50:07 -08:00
Steven Yeu
c22b54286a added unit test for createuser, working on testing write and read schema to pdc functions 2023-03-01 09:42:37 -08: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
ofgarzon2662
5e885e3583 GetAllAssets fix 2023-02-28 15:04:30 -08:00
ofgarzon2662
7f9350659e Update February 28th 2023-02-28 14:24:30 -08:00
ofgarzon2662
67e44ce293 IPDC Testings 2023-02-27 15:05:05 -08:00
Fernando Garzon
dc1deb4bc9 PDCs to be tested in OSC-Test Network 2023-02-24 10:33:08 -08:00
Fernando Garzon
4aa12017bf Project, groups and Users being implemented in PDC2 2023-02-24 10:16:32 -08:00
ofgarzon2662
ea2bd84eb8 Schema validation working for submitting data to Ledger 2023-02-23 11:02:17 -08: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
Fernando Garzon
4d589074ba Update Feb 22 2023 - Testing PDC functionalities 2023-02-22 16:46:40 -08:00
Fernando Garzon
4918ef433b Writing of Schema Struct to PDC working 2023-02-22 09:25:56 -08:00
Fernando Garzon
e1169e061e PDC Testing ongoing 2023-02-21 17:08:41 -08:00
Fernando Garzon
2d940bcdc6 Tests on PDCs ongoing 2023-02-21 16:27:48 -08: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
Fernando Garzon
4d42997eb8 Still developing the PDC function. Update JAN 30 - 2023 2023-01-30 09:16:16 -08: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
Fernando Garzon
449c10f6ed PDCs test in progress Jan 24 2023 2023-01-24 15:33:59 -08:00
Fernando Garzon
e87473cefb NewUserUUID Function added - Need to be tested with policy change 2023-01-24 13:44:50 -08:00
Fernando Garzon
6dce395fdf Test Chaincode January 14 2023 2023-01-24 09:16:18 -08: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
Fernando Garzon
35f98ea842 Chaincode ready for tests on OSC-IS Test network 2022-12-15 09:13:34 -08: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