Commit graph

464 commits

Author SHA1 Message Date
YasongLi
4c7bab0c86
fix: package seletor REGEX (#135)
Signed-off-by: 李亚松 <liyasong1987x@gmail.com>
2020-03-27 14:36:30 +01:00
James Taylor
db69c6ff19
Add fabcar external service sample (#136)
Add sample which can be used with the builder scripts described in
the "Chaincode as an external service" documentation

Signed-off-by: James Taylor <jamest@uk.ibm.com>
2020-03-20 15:06:01 +00:00
xu wu
7f5f5e6c66
[FAB-17504] add Organizations.<Org>.OrdererEndpoints and remove Orderer.Addresses (#125)
Description

The use of Orderer.Addresses in configtx.yaml is deprecated, and Organizations.<Org>.OrdererEndpoints should be used instead. Therefore, update all the fabric-samples configtx.yaml files.

Related issues

https://jira.hyperledger.org/browse/FAB-17504

Signed-off-by: xu wu <wuxu1103@163.com>
2020-03-20 16:02:44 +01:00
nikhil550
f3fc08d95f
Remove solo and kafka from test net configtx.yaml (#137)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-03-20 15:54:35 +01:00
Brett Logan
e17574d28c
Add CA's to docker test network (#124)
The CA's are not part of the `test` docker network. So
applications written and hosted on the `test` network
cannot interact with the CA

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-03-20 14:24:56 +00:00
nikhil550
faac18e6da
[FAB-17461] Move off_chain_data sample to test network (#122)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-03-20 14:23:54 +00:00
nikhil550
121a44a1d1
[FAB-17460] Move High Throughput sample to test network (#112)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>

Co-authored-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-03-20 14:23:00 +00:00
Brett Logan
a2f3a66f58 Update docker image version
Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-03-10 00:04:39 -04:00
Brett Logan
e5b898c08d
Revert "first-network/scripts/*: Make Chaincode name configurable (#118)" (#131)
This reverts commit 9ef61e2d72.

Introduced regressions when running without explicitly specifying
a chaincode label

Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-02-26 01:22:13 -05:00
Anoop Vijayan Maniankara
9ef61e2d72
first-network/scripts/*: Make Chaincode name configurable (#118)
Signed-off-by: Anoop Vijayan Maniankara <anoop@tuxera.com>
2020-02-23 07:35:41 +01:00
nikhil550
e204ebb3b2
Remove reference to 2.0 beta (#111)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-02-23 07:18:29 +01: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
nikhil550
403019e684
[FAB-17495] Remove Basic Network sample (#120)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-02-11 16:35:21 +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
Andrew Hurt
0df5ed9269
[FAB-17477] Update fabcar to use go api v1.0.0 (#116)
Signed-off-by: Andrew Hurt <andrew.hurt1@ibm.com>
2020-02-07 10:42:47 +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
nikhil550
67b4ee757b Add Org3 bugs in test network (#108)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-01-24 14:14:16 +00: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
NIKHIL E GUPTA
1488fbbe01 Add 1.x versions of fabric to blacklisted versions
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-01-19 17:42:22 -05:00
Brett Logan
8ca279d53d Add Support for Versioning NodeJS (#106)
Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-01-17 21:37:09 +01:00
nikhil550
b3b526728f FAB-17243 Add support for Fabric CA for Org3 on the (#91)
test network.

Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-01-16 22:32:12 +01:00
nikhil550
ce41ff7733 Remove references to vendoring chaincode from your gopath (#96)
in the interest rate sample README

Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2020-01-16 22:11:17 +01:00
Tatsuya Sato
4235d30cdb [FAB-17306] Fix artifact names in test-network (#97)
This patch fixes some wrong artifact names for fabric-ca in
`fabric-samples/test-network/network.sh`.

Artifacts names which include `issuerPublicKey` and `issuerRevocationPublicKey`
should start with capital letters.

Due to the wrong names, some files remain even after running the command to
bring down networks using fabric-ca.

Signed-off-by: Tatsuya Sato <Tatsuya.Sato@hal.hitachi.com>
2020-01-16 22:04:00 +01: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
Ry Jones
6d9fd6f7e1 Remove Gerrit reference
Signed-off-by: Ry Jones <ry@linux.com>
2020-01-10 11:21:22 -05: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
Arnaud J Le Hors
b565448a70
Merge pull request #85 from nikhil550/testNetFixes
Fix test network bugs for adding org3
2019-12-13 15:49:50 +01:00
Arnaud J Le Hors
7b0534a70a
Merge pull request #87 from mbwhite/byfn-cc-name
[FAB-16844] Correct BYFN CC name
2019-12-13 15:32:17 +01:00
Matthew B White
d84863340c [FAB-16844] Correct BYFN CC name
Correct chaincode name regexp in byfn.sh so it is not restricted
to one named chaincode.

Signed-off-by: Matthew B White <whitemat@uk.ibm.com>
2019-12-13 13:53:35 +00:00
NIKHIL E GUPTA
73267e1f7f Fix test network bugs for adding org3
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2019-12-12 12:34:59 -05:00
Arnaud J Le Hors
66ac1adcdf
Merge pull request #80 from nikhil550/FAB-17145
[FAB-17145] Add test network to Fabric Samples
2019-12-12 11:12:28 +01:00
NIKHIL E GUPTA
5d58254280 [FAB-17145] Add test network to Fabric Samples
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
2019-12-11 10:28:39 -05:00
Arnaud J Le Hors
28d357b814
Merge pull request #82 from satota2/FAB-17062
[FAB-17062] Fix typos in Commercial Paper readme
2019-12-04 07:20:55 +01: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
Simon Stone
4c0cc56e01
Merge pull request #78 from awjh-ibm/fabcar-go
[FAB-17139] Update fabcar go to new programming model
2019-12-03 22:09:55 +00:00
Simon Stone
ac121774fc
Merge pull request #75 from hyperledger/dependabot/npm_and_yarn/commercial-paper/organization/magnetocorp/application/eslint-utils-1.4.3
Bump eslint-utils from 1.4.0 to 1.4.3 in /commercial-paper/organization/magnetocorp/application
2019-11-27 09:55:14 +00:00
Simon Stone
1b9749af3f
Merge pull request #77 from yeasy/FAB-17121
[FAB-17121] Use new bootstrap config in orderer
2019-11-27 09:54:46 +00:00
Baohua Yang
36694d08e5 [FAB-17121] Use new bootstrap config in orderer
It includes two config changes in fabric recently:

* GenesisMethod --> BootstrapMethod
* GenesisFile --> BootstrapFile

Signed-off-by: Baohua Yang <yangbaohua@gmail.com>
Signed-off-by: Baohua Yang <baohua.yang@oracle.com>
2019-11-26 11:41:19 -08:00
Andrew Hurt
429f087c5a
update fabcar go to new programming model
Signed-off-by: Andrew Hurt <andrew.hurt1@ibm.com>
2019-11-25 16:57:20 +00:00
Simon Stone
f1a86435a0
Merge branch 'master' into dependabot/npm_and_yarn/commercial-paper/organization/magnetocorp/application/eslint-utils-1.4.3 2019-11-15 09:42:38 +00:00
Simon Stone
118fe07e9e
Merge pull request #69 from lehors/FAB-16284-remove-E2E-file-BYFN
[FAB-16284] Remove E2E file and -f option from BYFN
2019-11-15 09:40:12 +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
3a8c3170ed
Merge branch 'master' into FAB-16284-remove-E2E-file-BYFN 2019-11-13 15:28:36 +00:00
Ry Jones
33f349a5f5 Remove Stalebot
Signed-off-by: Ry Jones <ry@linux.com>
2019-11-04 22:44:53 -05:00