Commit graph

986 commits

Author SHA1 Message Date
Stefan Obermeier
cd4db0bc8b
use existing const instead of local string (#815)
Signed-off-by: Stefan Obermeier <st.obermeier@seeburger.de>

Signed-off-by: Stefan Obermeier <st.obermeier@seeburger.de>
2022-08-19 15:50:56 -04:00
jkneubuh
1e8fd5cd56
Update k8s CC builder to v7.2; Use *.localho.st loopback domain; Optionally bind docker reg to 0.0.0.0 (#811)
* Update k8s builder to v0.7.1

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

* Add LOCAL_REGISTRY_INTERFACE option to bind the insecure docker registry to alternate NICs

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

* Switch from *.vcap.me -> *.localho.st for the default loopback domain name

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-08-08 12:05:48 +01:00
jkneubuh
9f9cec7195
Run RCAADMIN registration on the host OS, not in k8s (#809)
* Run RCAADMIN registration on the host OS, not in k8s

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

* Fix a typo that caused the log trailer to not exit cleanly on error

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

* allow a node registration to have been previously created.  This allows for multiple 'network up' targets to be run.

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-08-05 13:17:05 +01:00
Arnaud J Le Hors
a1b7d20ebe Clarifies podman instructions for test-network
Also reverts to using install-fabric.sh which is preferred over bootstrap.sh.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2022-08-03 13:38:06 -04:00
Arnaud J Le Hors
6ede244d2b Use alpine based gradle image to build basic transfer java CC container
This changes the base image used to build the chaincode-as-a-service
java container to the alpine version which is sufficient and less
taxing than using the full gradle:jdk11 one.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2022-08-03 12:07:20 -04:00
Arnaud J Le Hors
bfe8f6e04d Update podman support information
This change updates the test-network README with up-to-date information
about using podman on Mac and improves support for podman in deployCCAAS.sh

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2022-08-03 12:06:39 -04:00
Arnaud J Le Hors
8403da7386 Fix vulnerabilities in typescript chaincode deps
npm audit reveals several high and one critical vulnerabilities in the dependencies:

ansi-regex  4.0.0 - 4.1.0
Severity: high
Inefficient Regular Expression Complexity in chalk/ansi-regex - https://github.com/advisories/GHSA-93q8-gq69-wqmw
fix available via `npm audit fix`
node_modules/nyc/node_modules/ansi-regex

minimist  <=1.2.5
Severity: critical
Prototype Pollution in minimist - https://github.com/advisories/GHSA-xvch-5gv4-984h
Prototype Pollution in minimist - https://github.com/advisories/GHSA-vh95-rmgr-6w4m
fix available via `npm audit fix --force`
Will install mocha@10.0.0, which is a breaking change
node_modules/minimist
node_modules/ts-node/node_modules/minimist
  mkdirp  0.4.1 - 0.5.1
  Depends on vulnerable versions of minimist
  node_modules/mkdirp
    mocha  1.21.5 - 6.2.2 || 7.0.0-esm1 - 7.1.0
    Depends on vulnerable versions of mkdirp
    node_modules/mocha

protobufjs  6.11.0 - 6.11.2
Severity: high
Prototype Pollution in protobufjs - https://github.com/advisories/GHSA-g954-5hwp-pp24
fix available via `npm audit fix`
node_modules/protobufjs

5 vulnerabilities (2 moderate, 2 high, 1 critical)

This change (from running npm audit fix --force) removes all of them:
npm audit
found 0 vulnerabilities

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2022-08-03 12:00:58 -04:00
Mark S. Lewis
51397fe78a
Add getCreator() to parsed transaction in off_chain_data sample (#806)
Example of how the client identity that submitted a transaction can be obtained.

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
2022-08-03 11:35:31 +01:00
jkneubuh
cb4355125f
Feature/ca v1.5.5 (#788)
* bump CA to v1.5.5; Fabric to v2.4.4

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

* Reorganizes the kube test network environment default parameters to align on column boundaries.

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

* Run k8s sample network tests against latest MAJOR.MINOR release of fabric, CA docker hub images.

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-08-01 14:58:12 +01:00
Matthew B White
4bbffdf2f2
Update Node.js dockerfile (#805)
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2022-08-01 11:50:47 +00:00
Mark S. Lewis
41717d76f2
Fix link in off_chain_data README (#793)
Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
2022-07-18 08:56:17 +01:00
Saptha Surendran
6aa3017ccb
Added hsm samples using Gateway (#759)
* Added hsmm Samples using Gateway

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

* Used asset-transfer-basic chaincode

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

* moved samples under asset-transfer-basic

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

* ci pipeline changes

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

* HSM config path changed

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

* added pkcs11 enabled ca

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

* HSM template added

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

* moved  binaries to fabric  samples bin
added go mod and go sum
Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>

* Gopath reverrted back to localDirectory

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

* go mod added and cleanup

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

* test file directory

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

* test file directory

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

* migrate to latest gateway and go version

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

* hsm script changes
Readme changes
Added npm prepare

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

* moved samples out of asset-transfer-basic

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

* Name changes

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

* code refactor

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

* go vet by tag

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

* pkcs11 tag added to lint script

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

* Readme updates

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

* application-typescript code refactor

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

* readme note added

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
2022-07-15 09:18:30 -04:00
Dave Enyeart
f32f77b129
Update secured asset transfer sample (#781)
A recent commit added the potential buyer to an asset's state based endorsement policy.
That change was problematic because if the transfer fell through, the buyer lost control of the asset,
in that they could no longer update the asset or change the sell price or sell to somebody else.

The asset state based endorsement policy is now based on the seller only, and we document
that additional parties could be added such as a trusted third party (although no
such party exists in test network at this time).

This commit also re-adds some necessary verifications, and make other minor edits and
comments to help users understand the sample.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2022-07-13 14:09:14 -04:00
destinysky
9f844e5de3
Fix namespace in k8s configuration files (#784)
Issues:
1. When the name of NETWORK_NAME or NS in file "network" (i.e., the namespace in k8s) is changed from "test-network", the resources in the k8s cluster cannot be created successfully when the command "./network up" is executed.
Error message: error: the namespace from the provided object "test-network" does not match the namespace "xxxxxx". You must pass '--namespace=test-network' to perform this operation.
2. org2-cc.yaml is not completed.

Fix:
1. Replace "test-network" in yaml files in folder "kube" with "${NS}".
2. Complete "org2-cc-template.yaml" by referring to "org1-cc-template.yaml".

Signed-off-by: destinysky <kangrui10@126.com>
2022-07-04 08:36:36 -04:00
Mark S. Lewis
12f59398ba
Fix asset-transfer-events sample Java chaincode (#782)
- chaincode-java Gradle project name did not match the instructions or the chaincode name used by the sample application code.
- Added test of Java chaincode to CI pipeline.

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
2022-07-01 12:28:52 +01:00
Mark S. Lewis
f8e7bfe803
Update Gateway samples for v1.1 release (#779)
- Updated build to use Go 1.18 since Go 1.16 is no longer supported.
- Use Java 11 in updated samples, and take advantage of new language features.

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
2022-06-30 15:46:32 +01:00
Satoshi Ito
3d3f15ce30
Fix test-network-k8s docs (#776)
This patch fixes errors in the document.
Fix errors as follows:

- Change shell script arguments
- Correct display results

Signed-off-by: Satoshi Ito <satoshi.ito.tf@hitachi.com>
2022-06-24 12:21:24 -04:00
Rajat Sharma
d270488450 minor documentation updated
Signed-off-by: Rajat Sharma <connecttorajat@outlook.com>
2022-06-23 07:44:44 -04:00
Rajat Sharma
654335ebd4 readme updated to resolve minor issues.
Signed-off-by: Rajat Sharma <connecttorajat@outlook.com>
2022-06-23 07:44:44 -04:00
Josh Kneubuhl
15a4772493 Bump chaincode builder to v0.6.0 : +couchdb indexes
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-06-22 16:19:12 -04:00
dependabot[bot]
05c1a1459f
Bump protobufjs in /asset-transfer-basic/rest-api-typescript (#755)
Bumps [protobufjs](https://github.com/protobufjs/protobuf.js) from 6.11.2 to 6.11.3.
- [Release notes](https://github.com/protobufjs/protobuf.js/releases)
- [Changelog](https://github.com/protobufjs/protobuf.js/blob/v6.11.3/CHANGELOG.md)
- [Commits](https://github.com/protobufjs/protobuf.js/compare/v6.11.2...v6.11.3)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-06-21 18:13:38 -04:00
fraVlaca
a26eae23e1
added fixes to documentation and readmes + small fix to erc721 and erc 20 java chaincode gradle.settings (#773)
Signed-off-by: fraVlaca <ocsenarf@outlook.com>
2022-06-21 17:40:25 -04:00
fraVlaca
d65bcf8ad1
added last fixes for asset-transfer-secured-agreement (#772)
Signed-off-by: fraVlaca <ocsenarf@outlook.com>
2022-06-21 13:10:06 -04:00
Rajat Sharma
8c3534baa3 ERC20: changes made to prevent subtraction overflow
Signed-off-by: Rajat Sharma <connecttorajat@outlook.com>
2022-06-20 08:54:33 -04:00
Rajat Sharma
dc015eb3eb ERC1155: subtraction overflow issue resolved
Signed-off-by: Rajat Sharma <connecttorajat@outlook.com>
2022-06-20 08:54:33 -04:00
Rajat Sharma
fc2494aebd ERC20: check for token initialized changed
Signed-off-by: Rajat Sharma <connecttorajat@outlook.com>
2022-06-15 11:06:03 -04:00
Rajat Sharma
194aff808d ERC:721 check for key already present changed
Signed-off-by: Rajat Sharma <connecttorajat@outlook.com>
2022-06-15 11:06:03 -04:00
Rajat Sharma
e00841bd10 function CheckInitialized renamed
Signed-off-by: Rajat Sharma <connecttorajat@outlook.com>
2022-06-15 11:06:03 -04:00
Rajat Sharma
ef42c0a094 check for Intitialized changed
Signed-off-by: Rajat Sharma <connecttorajat@outlook.com>
2022-06-15 11:06:03 -04:00
Mark S. Lewis
adfd850e64 Use new default call options API in Java off_chain_data sample
Also use hyperlinks for easier navigation to code mentioned in the README.

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
2022-06-14 11:34:10 -04:00
Zakaria Hossain Foysal
8ca50df4ff
Update setOrgEnv.sh (#748)
Type found in line 36 of setOrgEnv.sh file

Signed-off-by: Zakaria Hossain Foysal <zakaria15-9556@diu.edu.bd>
2022-05-26 13:55:02 +01:00
jkneubuh
525ff9f590
Feature/fabric builder k8s (#739)
* Support the fabric-builder-k8s for the chaincode "easy button."

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

* Run the CI/CD test suite using the correct matrix env for k8s builder

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

* Incorporate review feedback : remove zz_unused and pkgk8scc routines

Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-05-26 13:52:25 +01:00
Mark S. Lewis
636a273a48
Java off-chain data store sample using Fabric Gateway (#749)
Also minor implementation changes to TypeScript sample for better consistency between implementations.

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
2022-05-26 13:42:41 +01:00
fraVlaca
94867dd517
updated and improved asset-transfer-secured-agreement sample (#751)
Signed-off-by: fraVlaca <ocsenarf@outlook.com>
2022-05-26 13:42:01 +01:00
sapthasurendran
4681fe7865
Secured agreement samples using gateway (#630)
* initial commit

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

Code refactor

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

* readme

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

* lint fix

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

* adopted best practises

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

* code refactor

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

* updated azure pipeline to include the app

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

* mapped json and client object

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

* Moved contract interactions to contractWrapper

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

* salt value unexported

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

* moved try catch from contract wrapper to app

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

* contract wrapper refactor
moved interfaces from utils to contract wrapper

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

* exported data objects

Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
2022-05-23 14:17:10 +01:00
fiadanza
8662b10c58
fix to replace 443 with NGINX_HTTPS_PORT (#745)
Signed-off-by: fiadanza <francesco.iadanza@gmail.com>
2022-05-19 06:16:39 -04:00
Ry Jones
eb0a616261 Remove commercial paper reference
Fixes #740

Signed-off-by: Ry Jones <ry@linux.com>
2022-05-18 12:10:00 -07:00
Tommy TIAN
9d04fc9a2e
fix typo in asset-transfer-basic (#744)
Signed-off-by: Tommy TIAN <xtianae@connect.ust.hk>
2022-05-18 12:27:08 -04:00
fraVlaca
67a1166396 added fixes to erc token samples and documentation
Signed-off-by: fraVlaca <ocsenarf@outlook.com>
2022-05-18 07:54:36 -04:00
Mark S. Lewis
05791d30bc
Off-chain data sample using Fabric Gateway client API (#736)
Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
2022-05-17 12:49:22 +01:00
D
17d5b96493 fix error message in deployCC
Signed-off-by: D <d_kelsey@uk.ibm.com>
2022-05-13 06:28:31 -04:00
fraVlaca
5f71466295
updated erc tokens samples (#731)
Signed-off-by: fraVlaca <ocsenarf@outlook.com>
2022-05-11 10:35:10 -04:00
Tatsuya Sato
2d32a8e7e3
test-network-k8s: Add CC debugging procedures for Linux (#735)
In chaincode debugging guidance, using the Docker host alias
`host.docker.internal` is assumed.
But, the alias is not yet supported for Linux.
So, this patch adds its alternate procedure for Linux.

Signed-off-by: Tatsuya Sato <tatsuya.sato.so@hitachi.com>
2022-05-11 10:25:31 -04:00
Obadah Hammoud
d3a61e1d4f Update marbles_chaincode.go
Signed-off-by: Obadah Hammoud <obadah.hammoud@outlook.com>
2022-05-09 17:41:43 -04:00
Josh Kneubuhl
fd205a1ac0 fix two README / doc bugs
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-05-09 13:43:13 -04:00
Josh Kneubuhl
0322313a9a Includes new 'cluster init' target; Prints errors to the STDOUT
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-05-09 13:43:13 -04:00
Josh Kneubuhl
f730b804cd Refine README with CPU/RAM/Docker/Rancher limits; Adds a 10s effort to delivery client connection
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-05-09 13:43:13 -04:00
Josh Kneubuhl
3a12817c4f test network runs on containerd AND mobyd
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-05-09 13:43:13 -04:00
Josh Kneubuhl
b8a6d8efbb fix a whitespace error in the OSX resolver section
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-05-09 13:43:13 -04:00
Josh Kneubuhl
366d162453 Add a note / workaround section to address slow DNS resolution on Mac
Signed-off-by: Josh Kneubuhl <jkneubuh@us.ibm.com>
2022-05-09 13:43:13 -04:00