Commit graph

61 commits

Author SHA1 Message Date
Mark S. Lewis
0f877fad4d
Remove JCenter as a Gradle package repository (#589)
JCenter is deprecated, can no longer be published to, and is scheduled for removal. It is now causing build failures. Replace with Maven Central.

Also remove mavenLocal() as this is not recommended practice:

- https://docs.gradle.org/current/userguide/declaring_repositories.html#sec:case-for-maven-local

Note that Jitpack still needs to be included as a package repository for Java chaincode since it has dependencies on an old version of com.github.everit-org.json-schema:org.everit.json.schema that is only published there.

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
2022-01-26 16:29:09 -05:00
Mark S. Lewis
f151039f8a
Updates to asset-transfer-basic Gateway sample to align with docs (#553)
Also install goimports globally to run the linting check rather than installing to each gomodule, which was causing dependency conflicts.

Signed-off-by: Mark S. Lewis <mark_lewis@uk.ibm.com>
2021-12-09 10:20:52 +00:00
sapthasurendran
e963ddc726
lint Fix (#555)
Signed-off-by: sapthasurendran <saptha.surendran@ibm.com>
2021-12-09 09:44:25 +00:00
Matthew B White
cc8123bdc5 Remove temporary buildfiles
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2021-11-01 16:12:58 -04:00
Matthew B White
3ba63b15d6
Update go.mod (#500)
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2021-10-06 11:35:43 -04:00
denyeart
ee959a2eb0
Update to Go 1.16.7 (#491)
Update Go to 1.16.7 and run "go mod tidy"
to clean up go modules in samples.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2021-10-01 09:16:56 +01:00
Luciano da Silva Ribas
bd559c81c8
Fixed state deserialize which is an uint enum in contract definition. (#467)
Signed-off-by: Luciano da Silva Ribas <luciano.ribas+git@gmail.com>

Co-authored-by: Matthew B White <mbwhite@users.noreply.github.com>
2021-09-03 08:16:35 +00:00
Arnaud J Le Hors
6d043af487 Add repolinter support
Fix link in SECURITY file, and add missing copyright and license
notices.

To check, run: repolinter --rulesetUrl https://github.com/hyperledger-labs/hyperledger-community-management-tools/raw/main/repo_structure/repolint.json

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2021-04-23 15:35:20 -04:00
Kurt Seifried
9f7a5e8d99 Fixed information leak
Signed-off-by: Kurt Seifried <kurt@seifried.org>
Signed-off-by: Ry Jones <ry@linux.com>
2021-04-19 11:50:02 -07:00
nikhil550
3714bd5ad5
Update test network docker compose network name (#423)
Signed-off-by: Nikhil Gupta <ngupta@symbridge.com>
2021-02-20 10:26:04 +01:00
Brett Logan
855c8e4db3 Update Go Modules
Signed-off-by: Brett Logan <lindluni@github.com>
2021-02-11 18:11:17 -05:00
Brett Logan
221203fbb4 Lock Chaincode Java Dep Version
There is a dependency conflict when using newer versions of fabric-chaincode-java

Signed-off-by: Brett Logan <lindluni@github.com>
2021-02-11 18:11:17 -05:00
Andrei Lebedev
822c4c4c25
Fix crypto materials copy in commercial-paper network-starter (#410)
Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
2021-01-29 10:12:59 +01:00
Waleed Mortaja
14dc7e1316
Fix creating channel when ${PWD} contains space. (#402)
* Fix creating channel when ${PWD} contains space.

If the path of the project contains spaces, the "test-network/scripts/envVar.sh" script sets the value of "$ORDERER_CA" to a value containg "${PWD}" which, in turn, contains space(s).

When the variable used in "test-network/scripts/createChannel.sh", The first part of the value (before the first space) is handled as the whole value for "--cafile". Other parts are considered to be part of the command!

I tried putting (escaped) quotes in the "test-network/scripts/envVar.sh" definition for the variable "$ORDERER_CA" to make the fix more general, but the quotation marks were sometime interpreted to be part of the path that consisted of concatenated parts somewhere and it did not work.

While this edit will fix this issue, I belive this is just a work around. I expect that there is a better way to solve the root cause of the problem instead of just fixing it in one place. Moreover, All variables/paths that may include spaces should be properly handled as well.

Thanks

Signed-off-by: Waleed Mortaja <waleedmortaja@protonmail.com>

* Double quote variables evaluations that depends on $PWD

I tried to handle most (if not all) of the variables evaluations in the project that depends on $PWD by wrapping them in double-quotations to avoid values that contains white spaces.

Some lines I was not sure if they are Okay or not but I left them as they are. Samples (not all lines) as follows:
- commercial-paper/network-clean.sh:15:DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
- commercial-paper/network-starter.sh:15:DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
- asset-transfer-basic/chaincode-javascript/node_modules/fabric-shim/coverage/fabric-shim/lib/chaincode.js.html:997: optsCpy.pem = fs.readFileSync(process.env.CORE_PEER_TLS_ROOTCERT_FILE).toString();
- commercial-paper/organization/digibank/digibank.sh:29:export PEER_PARMS="${PEER_CONN_PARMS##*( )}"

The next sample I was not really sure, but still edited it:
- test-network/addOrg3/fabric-ca/registerEnroll.sh:68:  cp ${PWD}/../organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/tlscacerts/* ${PWD}/../organizations/peerOrganizations/org3.example.com/peers/peer0.org3.example.com/tls/ca.crt

I deliberately ignored some lines because I think they are not problem. These lines include:
- `export` sentences
- assignment sentences like: test-network/scripts/createChannel.sh:48:  FABRIC_CFG_PATH=$PWD/../config/
- gradlew files: the line SAVED="`pwd`"
- gradlew files: the line APP_HOME="`pwd -P`"
- gradlew files: the line CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

Signed-off-by: Waleed Mortaja <waleedmortaja@protonmail.com>

* remove unnecessary leading space trimming

Signed-off-by: Waleed Mortaja <waleedmortaja@protonmail.com>

* resolved conflict with master

Co-authored-by: Arnaud J Le Hors <lehors@us.ibm.com>
2021-01-20 16:32:38 +01:00
Brett Logan
08aaaf0313
Update Javascript and Typescript Deps (#403)
Update all of the Node deps to 2.2.<latest>
and regenerate existing package-lock.json files

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>

Co-authored-by: Brett Logan <brett.t.logan@ibm.com>
2021-01-13 12:19:31 -05:00
Brett Logan
df752bfc7b
Explicitly Mount the Docker Unix Socket (#397)
Instead of mounted the entire /var/run directory
explicitly mount the unix socket. Mounting the entire
directory causes issues with future versions of Docker
on some platforms.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2021-01-04 13:47:57 -05:00
Arnaud J Le Hors
b1e848e93c
Fix link anchor "here" in sample README (#378)
This is a pet peeve of mine: 'here' is a very poor choice for a link
anchor.
See https://lehors.wordpress.com/2009/01/29/linking-the-proper-way/

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2020-11-23 08:23:16 -05:00
Paul O'M
d2e2a8b683
Commercial Paper 2.x sample - enhancements and documentation (#335)
* commercial paper enhancements

Signed-off-by: Paul O'M <mahoney@uk.ibm.com>

* commercial paper enhancements

Signed-off-by: Paul O'M <mahoney@uk.ibm.com>

* commercial paper enhancements

Signed-off-by: Paul O'M <mahoney@uk.ibm.com>

* Add further README changes from #335

Signed-off-by: Paul O'M <mahoney@uk.ibm.com>

* Add further README changes from #335

Signed-off-by: Paul O'M <mahoney@uk.ibm.com>

* Add further README changes from #335

Signed-off-by: Paul O'M <mahoney@uk.ibm.com>
2020-11-23 09:56:36 +01:00
Arnaud J Le Hors
3fbce62c01
Fix commercial paper org scripts (#362)
The current scripts given to setup the user environment do not work
on Mac:

$ . ./magnetocorp.sh
-bash: cd: /Users/lehors/Projects/Go/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp
Saving session...
...copying shared history...
...saving history...truncating history files...
...completed./../../../test-network: No such file or directory
-bash: ./scripts/envVar.sh: No such file or directory
[...truncated...]
export FABRIC_CFG_PATH="/Users/lehors/Projects/Go/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp"
export PATH="/Users/lehors/Projects/Go/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp"
export PEER_PARMS=""
Saving session...
Saving session...

The session history related output is actually captured when setting the environment variables:

$ echo $FABRIC_CFG_PATH
/Users/lehors/Projects/Go/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp
Saving session...
...copying shared history...
...saving history...truncating history files...
...completed./../../../config

With this simple change the scripts work:

$ echo $FABRIC_CFG_PATH
/Users/lehors/Projects/Go/src/github.com/hyperledger/fabric-samples/commercial-paper/organization/magnetocorp/../../../config

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2020-10-27 12:07:49 -04:00
Jonas Kreusch
f9bd0097b9 Update buy.js
Fixed a typo. It should be "buy" instead of "issue"

Signed-off-by: Jonas Kreusch <krejon@googlemail.com>
2020-10-22 15:31:56 -04:00
Arnaud J Le Hors
7771b4f216
Revert "Remove Typescript References (#258)" (#261)
This reverts commit 7a23d7872a.
2020-07-23 17:06:57 +02:00
Brett Logan
7a23d7872a
Remove Typescript References (#258)
As the Typescript examples are essentially just reiterations
of the same Javascript code, there is no benefit to having
providing examples in both languages. The functional code
was exactly the same in both languages. On the contrary it
meant we widened the surface of maitainence and thus we are
removing due to the limited benefit provided by the example
chaincode and applications.

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-07-22 21:57:54 +02:00
Arnaud J Le Hors
2e3683c419
Add missing Copyright in some files (#163)
Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2020-05-19 15:50:48 +01:00
heatherlp
6f853b56a4 FABCAG-27 Update fabric-samples to use latest contract-api-go@v1.1.0
Signed-off-by: heatherlp <heatherpollard0@gmail.com>
2020-05-01 09:47:36 -04:00
heatherlp
ab371d3985
FGJ-81 Update to use latest v2.1.0 of gateway-java (#166)
Signed-off-by: heatherlp <heatherpollard0@gmail.com>
2020-04-23 21:52:41 +02:00
charlielin
d53c1ef3b3
making commercial-paper application-java to fit 2.0.0 (#160)
Signed-off-by: linqili <charlielin06@gmail.com>

Co-authored-by: linqili <charlielin06@gmail.com>
2020-04-17 15:58:17 +02:00
denyeart
11e4c23a35
Update samples to use v2.0 or later dependencies (#161)
Update application and chaincode dependendencies to use v2.0 or
later versions in package.json, build.gradle, pom.xml files.

Signed-off-by: David Enyeart <enyeart@us.ibm.com>
2020-04-17 14:29:37 +02:00
Arnaud J Le Hors
8820d2ff3a Fix commercial-paper README
Fixes several errors, typos, and clarifies some of the instructions.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2020-04-16 14:29:21 -04:00
nikhil550
851933b33e
Add enrollUser files to commercial paper (#140)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-03-30 21:38:40 +02:00
Zak
9397788fe1
Wrong groupId on hyperledger fabric dependencies for java-application (#134)
Signed-off-by: zakariahere <zakariabouazza@fastmail.com>
Signed-off-by: Ry Jones <ry@linux.com>

Co-authored-by: Ry Jones <ry@linux.com>
2020-03-30 19:36:05 +02:00
buxiangshui
92555fb4a4
Update README.md (#133)
the path miss organization

Signed-off-by: buxiangshui <286010056@qq.com>
Signed-off-by: Ry Jones <ry@linux.com>
2020-03-30 19:24:39 +02:00
harrisob
3dbe116a30
FAB-17456 fabric-samples read ccp (#117)
Have the application read the common connection profile to
build a JSON object used for the gateway connect and for
a fabric-ca client instance.

Signed-off-by: Bret Harrison <beharrison@nc.rr.com>
2020-02-18 14:05:50 +00:00
Matthew B White
965ed1fa84
[FAB-17498] Beta Images removal, test test-network (#121)
Change 2.0.0-beta to 2.0.0 when CommercialPaper uses the test network
Add test network to the azure pipelines
Correct test network envvar script

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2020-02-12 15:18:17 +00:00
Matthew B White
883ef995fd
[FAB-17457] Script correction (#119)
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2020-02-11 13:57:36 +00:00
Matthew B White
b89ee34ff7
Update Commercial Paper to v2.0 Lifecycle (#109)
* WIP Commercial Paper -> Test network

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

* Update Commercial Paper to v2.0 lifecycle

- move to using the test-network
- updating README.md to include commands to use v2.0 lifecylce
- update Contracts and Applications to use 2.0 libraries

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2020-02-11 09:38:52 +00:00
Andrew Hurt
4208644416
[FAB-17478] Update commercial paper to use go api v1.0.0 (#115)
Signed-off-by: Andrew Hurt <andrew.hurt1@ibm.com>
2020-02-07 10:53:14 +00:00
Matthew B White
571733f7b9 [FAB-17447] Update to 2.0.0 Libraries
NodeSDK has not been released at 2.0.0 to date

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2020-01-29 00:26:12 -05:00
Andrew Hurt
5b93dd0cc0 [FAB-17140] Add go commercial paper contract (#102)
Signed-off-by: Andrew Hurt <andrew.hurt1@ibm.com>
2020-01-24 14:12:30 +00:00
Brett Logan
4fe6a2507e [FABCI-482] Update Nexus URL's to Artifactory (#92)
Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-01-20 15:33:02 +00:00
Matthew B White
4c2a0a4a49 [FAB-16147] Update Commercial Paper to work with v2 (#98)
Update the applications and scripts to use the new v2
SDKs and the new lifecycle

Add in a basic script based on the readme.md that does
a basic run of the scenario

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2020-01-14 16:44:31 +00:00
Arnaud J Le Hors
a026a4ffbf Fixed typo (#90)
Originally submitted as PR81 by https://github.com/ArkiZh

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2019-12-16 08:33:58 +00:00
Fábio Nogueira de Lucena
cdb0e8b40c TYPO (#89)
magentocorp.sh instead of magnetocorp.sh

Signed-off-by: kyriosdata <fabio@inf.ufg.br>
2019-12-16 07:22:39 +01:00
Matthew B White
94ac8b6050 Update to use beta levels of modules (#88)
Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2019-12-13 20:20:58 +00:00
Tatsuya Sato
e9f2957afe [FAB-17062] Fix typos in Commercial Paper readme
This patch fixes some typos in Commercial Paper readme.

Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
2019-12-04 01:54:45 +00:00
dependabot[bot]
1467086f30
Bump eslint-utils
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.4.0 to 1.4.3.
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.4.0...v1.4.3)

Signed-off-by: dependabot[bot] <support@github.com>
2019-11-14 16:27:21 +00:00
Simon Stone
f2939e29c6 [FAB-6415] Java 11 support for Commercial Paper sample
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I3de1927a67723044899dce7ec22d4e46e4c6b944
2019-09-24 09:41:02 +01:00
Ry Jones
a6ce915106 [FAB-16487] Update eslint
Signed-off-by: Ry Jones <ry@linux.com>
Change-Id: I69233df8716f0bc081b67c771fb7eeaac6fc9d52
2019-08-30 12:09:52 -07:00
Matthew B. White
9b1452508f [FAB-15213] Update Commercial Paper for Java
Update with Java Contract

Change-Id: Iced5568a248c1474ae4b6fb0352d23e49ebfc252
Signed-off-by: Matthew B. White <whitemat@uk.ibm.com>
Signed-off-by: James Taylor <jamest@uk.ibm.com>
2019-08-07 11:18:37 +01:00
Cefold
6ae711cf7b [FAB-15717] fix Error Unexpected end of JSON input
Change-Id: If5700abbe8315ece19e488e2d1ee0e0a7f0b8f49
Signed-off-by: Huida Liu <cefold@gmail.com>
2019-06-18 14:56:18 +00:00
Gari Singh
e9c36499b6 FAB-15276 Fix license statements
Update from ISC to Apache-2.0

FAB-15276 #done

Change-Id: Icb4fb6bcc26c283463472ecb1a47062c799be548
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
2019-04-25 05:36:37 -04:00