Commit graph

456 commits

Author SHA1 Message Date
woodyjon
9e466bab04 init function does not exist, it is actually the initLedger the correct one
It was actually the other way around, it is the no TLS line which was wrong and should have ready `initLedger` instead of `init`.

Signed-off-by: Jonathan Gross <woodyjon@gmail.com>
Signed-off-by: Jon <woodyjon@gmail.com>
Signed-off-by: Jonathan Gross <woodyjon@gmail.com>
2020-03-23 09:21:45 +01:00
Jon
0fcc443b1a test-network deployCC.sh invoke chaincode inconsistency
Keep consistency of the function called in the "no TLS" and "with TLS" cases

Signed-off-by: Jonathan Gross <woodyjon@gmail.com>
Signed-off-by: Jon <woodyjon@gmail.com>
Signed-off-by: Jonathan Gross <woodyjon@gmail.com>
2020-03-23 09:21:45 +01:00
woodyjon
1426592e7b init function does not exist, it is actually the initLedger the correct one
It was actually the other way around, it is the no TLS line which was wrong and should have ready `initLedger` instead of `init`.

Signed-off-by: Jon <woodyjon@gmail.com>
Signed-off-by: Jonathan Gross <woodyjon@gmail.com>
2020-03-23 09:21:45 +01:00
Jon
e02e9f4d12 test-network deployCC.sh invoke chaincode inconsistency
Keep consistency of the function called in the "no TLS" and "with TLS" cases

Signed-off-by: Jon <woodyjon@gmail.com>
Signed-off-by: Jonathan Gross <woodyjon@gmail.com>
2020-03-23 09:21:45 +01:00
Matthew B White
5b294deceb [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>
Signed-off-by: Jon <woodyjon@gmail.com>
Signed-off-by: Jonathan Gross <woodyjon@gmail.com>
2020-03-23 09:21:45 +01:00
nikhil550
2de668794a [FAB-17495] Remove Basic Network sample (#120)
Signed-off-by: NIKHIL E GUPTA <negupta@us.ibm.com>
Signed-off-by: Jon <woodyjon@gmail.com>
2020-03-23 09:20:46 +01: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
Ry Jones
0e200ab61e
Merge branch 'master' into FAB-16284-remove-E2E-file-BYFN 2019-10-28 01:02:51 -07:00
Arnaud J Le Hors
c4d8bb74cf
Merge pull request #70 from hyperledger/samples_stalebot
Change stalebot settings
2019-10-27 17:20:21 +01:00
Brett Logan
6af43bfdab Change stalebot settings
Signed-off-by: Brett Logan <Brett.T.Logan@ibm.com>
2019-10-26 11:51:16 -04:00
Arnaud J Le Hors
48804014d3 [FAB-16284] Remove E2E file and -f option from BYFN
Remove leftover call to removed ReplacePrivateKey function which
makes calling ./byfn.sh up fail if cryptogen hasn't been run first.

Signed-off-by: Arnaud J Le Hors <lehors@us.ibm.com>
2019-10-25 22:41:38 +02:00
Simon Stone
fe96f60311 [FAB-16850] Set up CI with Azure Pipelines
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I3821a329ec5eb439ce0f27cfbc71b28e6b0b8a09
2019-10-17 09:53:11 +01:00
Simon Stone
81aabf4c0b [FAB-16849] Various updates for Java version of FabCar
- Update .gitignore
- Use builds on Sonatype, not Nexus
- Enable new discovery as localhost flag

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: Ia0904cedf953b5ecbf6aaf859245a9bb431d3f76
2019-10-16 17:12:48 +01:00
Simon Stone
a42b858bc4 Update FabCar to reflect wallet API changes
Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I845aa7af376b9a21da9f285079c025c71c43a2cf
2019-10-07 05:18:16 -04:00
Simon Stone
890f9eab9f [FAB-16713] Fix npm audit warnings
Also add .gitignore files for abstore/marbles02, as these are
currently missing.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I9f9da3e5289a275dd26c1021ea8de80def605e36
2019-10-07 04:16:39 -04:00