Commit graph

746 commits

Author SHA1 Message Date
Kurt Seifried
013162df0d
ORG6 setup 2021-03-16 20:49:00 -06:00
Kurt Seifried
7b5ae169e7
Corrected 5-6 typo and ports 2021-03-16 20:40:27 -06:00
Kurt Seifried
b6220f4ce8
ORG5 should work 2021-03-16 20:34:40 -06:00
Kurt Seifried
de74a9c0ae
removed comments 2021-03-16 20:34:13 -06:00
Kurt Seifried
96a015da88
ORG 5 and 6 scripts 2021-03-16 19:55:32 -06:00
Kurt Seifried
9dd8bc8fc4
ORG4 typo 2021-03-15 14:04:47 -06:00
Kurt Seifried
6f3cf986cc
ORG4 README 2021-03-15 12:35:35 -06:00
Kurt Seifried
f2d2e86a08
ORG4 crypto 2021-03-15 12:35:24 -06:00
Kurt Seifried
7dd4d0e4fb
ORG4 certs 2021-03-15 12:35:16 -06:00
Kurt Seifried
df7be11b42
ORG4 docker 2021-03-15 12:35:03 -06:00
Kurt Seifried
61d9fc95f2
ORG4 configtx.yaml 2021-03-15 12:34:54 -06:00
Kurt Seifried
c79fc8d5b9
ORG4 cleanup 2021-03-15 12:21:35 -06:00
Kurt Seifried
9177617fe9
ORG4 crypto.yaml 2021-03-13 16:47:36 -07:00
Kurt Seifried
9106de0430
ORG4 CCP 2021-03-10 20:31:14 -07:00
Kurt Seifried
5d9ef2f5e5
ORG4 fabric ca server 2021-03-10 20:31:06 -07:00
Kurt Seifried
07e3fcff04
ORG4 docker 2021-03-10 11:18:02 -07:00
Kurt Seifried
312c4563a8
ORG4 docker couch 2021-03-10 11:17:41 -07:00
Kurt Seifried
e39db3aac5
ORG4 docker ca 2021-03-10 11:17:25 -07:00
Kurt Seifried
81a3be3ca4
ORG4 scripts 2021-03-10 09:54:45 -07:00
Kurt Seifried
40cc5e29f6
ORG4 scripts dir 2021-03-10 09:51:44 -07:00
Kurt Seifried
8320010b8c
addOrg4.sh 2021-03-10 09:43:04 -07:00
Kurt Seifried
862b7a86cd
ORG4 file rename 2021-03-10 09:34:28 -07:00
Kurt Seifried
d031a6d905
ORG4 initial copy 2021-03-10 09:32:48 -07:00
Kurt Seifried
353f4fc13b
setAnchorPeer.sh 2021-03-09 23:40:17 -07:00
Kurt Seifried
1986aa44bf
envVar.sh 2021-03-09 23:40:08 -07:00
Kurt Seifried
3b99448f83
network.sh 2021-03-09 23:30:24 -07:00
Simon Stone
365172ddb3
Stop ERC-20 transfer bug when to/from accounts are the same (#425)
Using the ERC-20 sample, you can submit a transfer to and from
the same account. Because the code doesn't handle this, it ends
up minting new tokens into that account.

The correct behaviour is not specified by the ERC-20 specification,
although the OpenZeppelin implementation seems to permit it.

IMO we should just block it with an error because I can't see a use
case for allowing it and it is most likely a user error.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
2021-02-24 15:07:06 -05:00
Baran Kılıç
651f2235aa
Fix empty event in token-erc-20 example (#424)
Signed-off-by: Baran Kılıç <baran.kilic@boun.edu.tr>
2021-02-24 08:58:13 -05:00
Yuki Kondo
b88ec9f4b4
Add ERC721 non-fungible token sample for javascript Chaincode (#406)
This PR adds a new non-fungible token sample using ERC721
functionalities. It includes javascript Chaincode and the README
explaining how to mint and transfer a non-fungible token in the
Fabric's test-network.

Signed-off-by: Yuki Kondo <yuki.kondo.ob@hitachi.com>
2021-02-24 13:51:24 +00:00
nikhil550
b4db1f53a0
Updates to external chaincode readme (#422)
Signed-off-by: Nikhil Gupta <ngupta@symbridge.com>
2021-02-22 02:47:56 +01: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
bblwbtd
15275a0d4d
Change docker compose file version (#421)
Signed-off-by: bblwbtd <gmyxgmyx@outlook.com>
2021-02-14 18:48:35 -05:00
Brett Logan
8eb97d92a1 Remove Stray IMAGE_TAG
Signed-off-by: Brett Logan <lindluni@github.com>
2021-02-11 18:39:26 -05:00
Brett Logan
c30ceaa675 Remove Image Tag Override
The `-i` flag was originally added to support an
upgrade sample. Since that sample is no longer available
remove the `-i` flag to clean up the network.sh options
and avoid confusion as it's possible now to specify
an image version that is no longer backwards compatible
with the new test-network with osnadmin.

Signed-off-by: Brett Logan <lindluni@github.com>
2021-02-11 18:20:43 -05:00
Brett Logan
c81ba4c411 Use Dynamic Linter
The new lint.sh script no longer requires the use
of a matrix and instead dynamically finds and lints
directories.

Signed-off-by: Brett Logan <lindluni@github.com>
2021-02-11 18:11:17 -05: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
Brett Logan
41bb1d0b5c Fix Linting Issues
Signed-off-by: Brett Logan <lindluni@github.com>
2021-02-11 18:11:17 -05:00
Brett Logan
2907329c20 Fix Linting and Enable ES6 Syntax
Fix a small linting issue and add the es6 tag to handle
the return of a Promise as it is not defined in the ECMA
spec.

Signed-off-by: Brett Logan <lindluni@github.com>
2021-02-11 18:11:17 -05:00
Brett Logan
65b3741a93 Additional Auction Cleanup
Remove unused orgMSP vars and replace `==`
with `===`.

Signed-off-by: Brett Logan <lindluni@github.com>
2021-02-11 18:11:17 -05:00
Brett Logan
9b071d0463 Add ESLinte to Auction Example
The auction example had no ESLint configuration.
This change adds a .eslintrc.js file that matches
the rest of the projects.

This change also fixes all the linting issue in
the auction example.

Signed-off-by: Brett Logan <lindluni@github.com>
2021-02-11 18:11:17 -05:00
Brett Logan
37513c3c2b Add Service Labels and Cleanup Using Standard Tools
Add a service label to all containers launch by compose.
This allows us to filter on the label for removing running
containers.

Use filtering for querying running containers and
images to make sure we only target the containers
and images we want to remove.

Signed-off-by: Brett Logan <lindluni@github.com>
2021-02-11 17:34:49 -05:00
Brett Logan
ae81e8b296 Remove Unused Variable
Signed-off-by: Brett Logan <lindluni@github.com>
2021-02-11 17:34:49 -05:00
Brett Logan
49bf79909d
Remove .env Files and Explicitly Name Network (#417)
There have been lots of changes and quirks with the
docker-compose .env file, this change removes the file
and explicitly creates and assigns the networks in the
compose yaml files.

Signed-off-by: Brett Logan <lindluni@github.com>
2021-02-10 21:38:35 -05:00
SamYuan1990
f67079584e try to fix CI error
Signed-off-by: SamYuan1990 <yy19902439@126.com>
2021-02-08 10:52:35 -05:00
Julian Castrence
51f76977b0 Rename --channel-id to --channelID in osadmin
Signed-off-by: Julian Castrence <juliancastrence@ibm.com>
2021-02-03 13:33:19 -05:00
nikhil550
6875049c8d
Auction sample clean up (#408)
Signed-off-by: Nikhil Gupta <ngupta@symbridge.com>

Co-authored-by: Nikhil Gupta <nikhilgupta@macbook-air.lan>
2021-02-01 10:19:45 +01: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
Julian Castrence
aa7287e1e3 Update Test Network to Use osadmin
FAB-18369

Signed-off-by: Julian Castrence <juliancastrence@ibm.com>
2021-01-19 20:55:19 -05:00