Commit graph

938 commits

Author SHA1 Message Date
Josh Kneubuhl
088e1d51b4 Use the SDKs contract router Main, not a local entrypoint
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-26 09:34:43 -04:00
Josh Kneubuhl
f7a2eb38f8 Address some PR review feedback points - README reorg
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-26 09:32:09 -04:00
Josh Kneubuhl
81748831e7 Provide clear instructions for debugging Java CCaaS
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-25 07:20:52 -04:00
Tatsuya Sato
5b72281114
test-network-k8s: Remove kubectl binary (#720)
Since kubectl binary is mistakenly added again in PR#714,
this patch removes it.

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2022-04-20 10:20:08 -04:00
Renjith K N
2ac6902996
Java chaincode implementation of ERC-20 token standard. (#714)
* Java erc20 chaincode implementation Signed-off-by: renjithpta <renjithkn@gmail.com>

Signed-off-by: renjithpta <renjithkn@gmail.com>

* Java erc20 chaincode implementation Signed-off-by: renjithpta <renjithkn@gmail.com>

Signed-off-by: renjithpta <renjithkn@gmail.com>

* Java erc20 chaincode implementation Signed-off-by: renjithpta <renjithkn@gmail.com>

Signed-off-by: renjithpta <renjithkn@gmail.com>

* Java erc20 token standard chaincode implementation Signed-off-by: renjithpta <renjithkn@gmail.com>

Signed-off-by: renjithpta <renjithkn@gmail.com>
2022-04-19 07:39:53 -04:00
Tatsuya Sato
92c6916223
test-network-k8s: Remove kubectl binary (#719)
Since kubectl binary is mistakenly added in PR#713,
this patch removes it.

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2022-04-19 07:30:42 -04:00
Tatsuya Sato
5f88d951cf
test-network-k8s: Some minor improvements (#718)
This patch includes some minor improvements, such as:
- Fix typos and broken links
- Correct chaincode type of asset-transfer-basic-debug
  (seems it should be ccaas)

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2022-04-19 07:29:52 -04:00
dependabot[bot]
c4886eda11
Bump moment in /asset-transfer-basic/rest-api-typescript (#711)
Bumps [moment](https://github.com/moment/moment) from 2.29.1 to 2.29.2.
- [Release notes](https://github.com/moment/moment/releases)
- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/moment/moment/compare/2.29.1...2.29.2)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-04-18 09:40:29 -04:00
Tatsuya Sato
2df09e554d
Fix typos and broken links in docs (#712)
Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2022-04-18 09:36:49 -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
Tatsuya Sato
f8df5452d8
test-network-k8s: Support for Loading images for rest sample to KIND (#713)
This patch supports for pulling all images to the local docker cache
and loading to KIND.

Also, this adds the missing docker image pulling (couchdb) for Fabric.

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2022-04-18 06:13:20 -04:00
jkneubuh
5414889399
fixes #708 : ca enrollments should be made with the ROOT CA cert (#710)
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-08 17:05:42 +01:00
renjithpta
1617406795
Java erc721 token standard chaincode implementation. (#709)
* Java ERC721 token standard chaincode implementation Signed-off-by: renjithpta <renjithkn@gmail.com>

Signed-off-by: renjithpta <renjithkn@gmail.com>

* Java erc20 nft token standard chaincode implementation. Signed-off-by: renjithpta <renjithkn@gmail.com>

Signed-off-by: renjithpta <renjithkn@gmail.com>
2022-04-08 11:49:52 -04:00
Josh Kneubuhl
184f9a7317 remove (obsolete) test-net chaincode/ folder
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-05 11:55:37 -04:00
Josh Kneubuhl
bef68f326a Run basic-asset transfer CI tests with Java + golang CC in Azure
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-05 10:40:52 -04:00
Josh Kneubuhl
a02b945faf Update test-network-k8s README with updated cc deploy commands
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-05 10:00:35 -04:00
Josh Kneubuhl
3ed7be8197 Fix CI test - Azure mounts git checkout at a different folder root path
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-05 09:14:25 -04:00
Josh Kneubuhl
827e30cf30 move ccpackage/ contents into network script
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-04 17:01:38 -04:00
Josh Kneubuhl
a48aa0a46f resolve merge conflicts from main (README)
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-04 04:39:51 -04:00
jkneubuh
40bfa49a80
Updates the README and documentation guide for the Kube test network's usage of Nginx ingress (#697)
* Update test-network-k8s README and docs with new Nginx Ingress

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

* Update cert paths in application_connection target

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-04 04:25:59 -04:00
Josh Kneubuhl
2235c66c24 Add metadata and activate examples to the CC README
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-03 13:49:19 -04:00
Josh Kneubuhl
b616efeaab missed a couple of bash syntax errors
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-03 07:34:45 -04:00
Josh Kneubuhl
41c0cdce64 merge chaincode java sample into remote peer exec
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-04-03 07:17:23 -04:00
Matthew B White
99e7ae8536
CORS Enablement (#696)
After feedback from the community, this PR adds CORS support in, but as an option
to enable.

Along with warnings that the default wildcard origin might not be applicable
in a production use case

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2022-04-01 09:35:57 -04:00
Matthew B White
0262d264d8
Add in a -not -path option to find to prevent the command finding (#699)
hidden directories (typically .git) to lint

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2022-04-01 08:40:28 -04:00
jkneubuh
a3ae179efb
test-network-k8s : Connect to Fabric services via Nginx Ingress - READY FOR MERGE (#692)
* Access the test network services via a local Nginx ingress controller.

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

* Run E2E / CI test suite against the Ingress based k8s test network

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

* Improved wait for Nginx Ingress - this was causing some test flakes

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-03-31 17:12:51 +01:00
Matthew B White
9fa171f824
Update the REST Example (#689)
1. The default chaincode use Capitalized JSON Names, whereas for new asset the REST validation didn't.. Adjusted
so it matches the chaincode

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2022-03-31 08:19:34 -04:00
Dave Kelsey
57919f528d
fix chaincode breakage in asset-transfer-basic (#694)
only broken in main branch, not in release-2.2

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

Co-authored-by: D <d_kelsey@uk.ibm.com>
2022-03-31 08:38:05 +01:00
Josh Kneubuhl
f0808196c8 Addresses Issue #548 by providing a simple guide for running Java chaincode as a service with a local debugger.
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-03-24 15:01:36 -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
Charalampos Argyriou
bb57b3cf8f
Override default port of CA connection (#678)
Signed-off-by: Charalarg <charalarg@gmail.com>
2022-03-16 15:28:25 -04:00
sapthasurendran
f01eeab663
Private data samples migration (#574)
Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

Updated application flow

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

Add grpc dependency in package.json

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

Update CI pipelines to run new app
Updated application description in package.json
Fixed chaincode name
Code Refactor
Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
2022-03-09 08:51:48 +00: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
Dave Enyeart
2f3e9ffe3e
Fix ledger queries sample (#655)
-Go chaincode - Paginated range query should return the bookmark so that next page can be requested
-Javascript chaincode - Make query return JSON consistent with Go chaincode
-Javascript app was broken at bookmark query due to invalid JSON parsing from inconsistent chaincode responses
-Javascript and Java app had incorrect comments

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2022-03-09 08:49:03 +00:00
Arnaud J Le Hors
8d7f3ca037
Fix sample external chaincode Dockerfile (#645)
Podman isn't as lenient as docker when it comes to the syntax of the
Dockerfile and insists on getting the ARG command properly scoped.
This fixes this error:
...
[2/2] STEP 12/15: EXPOSE $CC_SERVER_PORT
Error: error building at STEP "EXPOSE $CC_SERVER_PORT": EXPOSE requires at least one argument

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2022-03-09 08:47:59 +00:00
Arnaud J Le Hors
daf08981dd
Add external chaincode service for Nano Test Network (#650)
This addresses Issue #504. This extends the test-network-nano-bash
sample to offer an option to run a fabric network without using any
containers at all. The chaincode is running as an external service
directly on the host machine.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2022-03-09 08:47:31 +00:00
James Taylor
4d2d51214c
Remove bash dependency from test network nano (#671)
The scripts do not require bash so switch to sh and add shellcheck linting

Signed-off-by: James Taylor <jamest@uk.ibm.com>
2022-03-09 08:46:56 +00:00
Dave Enyeart
67d3c65847
Update test-network-k8s to use two digit version (#668)
Instead of using the Fabric and Fabric CA three digit version (2.4.3),
utilize the two digit version (2.4).
Each time a Fabric/FabricCA release is pushed to dockerhub the two digit version tag is updated.
This approach simplifies maintenance so that scripts don't have to be updated for every
third digit release.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2022-03-03 18:16:19 -05: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
jkneubuh
dcc5e5650c
Update test network to fabric 2.4.3 (#660)
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-02-28 08:07:14 -05:00
Dave Enyeart
f50b52ad56
Remove duplicate erc-721 Go chaincode sample (#656)
erc-721 Go chaincode was delivered to both /go and /chaincode-go directories.
This commit removes the /go implementation.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2022-02-23 09:34:40 +01:00
Matias Salimbene
5b480ce597
refactor folder structure to match other token samples (#652)
* go port to token-erc-721

Signed-off-by: Matias Salimbene <matias.saimbene@gmail.com>
Signed-off-by: Matias Salimbene <matias.salimbene@gmail.com>

* refactor folder structure

Signed-off-by: Matias Salimbene <matias.salimbene@gmail.com>

* refactor folder structure

Signed-off-by: Matias Salimbene <matias.salimbene@gmail.com>

* refactor chaincode go folder structure

Signed-off-by: Matias Salimbene <matias.salimbene@gmail.com>

* refactor folder struncture

Signed-off-by: Matias Salimbene <matias.salimbene@gmail.com>

Co-authored-by: Matias Salimbene <matias.saimbene@gmail.com>
2022-02-21 13:10:18 +00:00
Sam Yuan
2457b387c4
impl for couchdb supports in test0network8s as hardcode (#651)
* impl for couchdb supports in test0network8s as hardcode

Signed-off-by: Sam Yuan <yy19902439@126.com>

* fix up according to pr review comments

Signed-off-by: Sam Yuan <yy19902439@126.com>
2022-02-21 06:07:24 -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
Arnaud J Le Hors
75bdde97cd
Improve REST sample README (#647)
Add that one needs to have the ledger initialized for the sample to
work.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2022-02-17 16:55:26 +00:00
Matias Salimbene
c309c364ce
go port to token-erc-721 (#625)
Signed-off-by: Matias Salimbene <matias.saimbene@gmail.com>

Co-authored-by: Matias Salimbene <matias.saimbene@gmail.com>
2022-02-15 14:58:51 +00:00
dependabot[bot]
6739199db2
Bump follow-redirects in /asset-transfer-basic/rest-api-typescript (#643)
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-02-15 15:36:23 +01:00
Charalampos Argyriou
f3db0572d0
test-network-k8s: High availability on application connection profiles (#639)
* Add peer gateway-svc as dnsNames on each peer's certificate

Signed-off-by: Charalarg <charalarg@gmail.com>

* Replace peer1 connections with gateway-svc in connection profiles of applications

Signed-off-by: Charalarg <charalarg@gmail.com>

* Update the org2 peer Gateway CSR host aliases to reference org2

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

Co-authored-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-02-14 04:54:09 -05:00
Mark S. Lewis
bee24a7615
Add README to asset-transfer-basic sample (#638)
Also:
- Refactor application-gateway-java slightly to reflect more idiomatic Java class structure, in line with asset-transfer-events sample.
- Correctly handle unexpected error case where key file is missing.
- Update Gradle wrapper for application-gateway-java.

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
2022-02-10 13:52:46 +00:00
Mark S. Lewis
58606efc06
Java gateway application sample for asset-transfer-events (#628)
Co-authored-by: deeptiraom <41100100+deeptiraom@users.noreply.github.com>
Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>

Co-authored-by: deeptiraom <41100100+deeptiraom@users.noreply.github.com>
2022-02-09 09:59:14 +00:00