Commit graph

537 commits

Author SHA1 Message Date
john-craig
6da96f88a4 changes at 1:40 2020-02-22 20:40:33 +02:00
JCraig
c42c87bad3 Merge branch 'master' of https://github.com/JonathanMurphy2/fabric-samples into release-1.4 2020-02-22 13:13:36 -05:00
JCraig
156559b0ef Added library-tracker folder 2020-02-22 11:50:16 -05:00
JCraig
e111da1363 Added library-tracker folder 2020-02-22 11:49:56 -05:00
JonathanMurphy2
b85d581644 Update package.json 2020-02-22 09:33:00 -05:00
JonathanMurphy2
3bfb1b1824 Update Contract 2020-02-22 09:03:43 -05: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
Arnaud J Le Hors
337f82c513 Fixes Fabcar Java chaincode build dependency (#107)
This change updates build.gradle to fabric 1.4.4.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2020-01-24 14:13:33 +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
Brett Logan
2c1d2ad5b9 [FABCI-482] Update Nexus URL's to Artifactory (#93)
Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-01-20 15:30:21 +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
562791dd2b Add support for versioning NodeJS (#105)
Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-01-17 21:38:31 +01: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
Brett Logan
d015ca1f82 Update fabric version (#94)
Signed-off-by: Brett Logan <brett.t.logan@ibm.com>
2020-01-16 22:25:40 +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
Arnaud J Le Hors
0d7c7a1643
Merge pull request #74 from danipisca07/release-1.4
Fix port numbers for peers in high-throughput.
The test build failed for some unrelated reason that needs to be investigated independently.
2019-11-30 07:46:32 +01:00
Arnaud J Le Hors
ba63e6533d
Merge pull request #64 from LF-Certification/release-1.4
Added stop script to remove `fabcar` chaincode containers and images.
I note that the test build failed but it clearly has nothing to do with this change. Fabcar java doesn't seem to be working. This will need to be addressed independently.
2019-11-29 21:32:19 +01: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
Daniele Piscaglia
cd5b68d040 Fix port numbers for peers in high-throughput
Signed-off-by: danipisca07 <danielepiscaglia@libero.it>
2019-11-15 12:58:01 +01: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