From b6ae0851735ccbed57ea7ccdad22ac73b61b2155 Mon Sep 17 00:00:00 2001 From: Michal Bajer Date: Tue, 11 Jan 2022 11:49:44 +0100 Subject: [PATCH] refactor(connector-fabric-socketio): migrate to fabric-all-in-one from fabric14-fabcar-testnet Remove obsolete fabric fabric14-fabcar-testnet fabric14-testnet, use only fabric-all-in-one for all purposes for all test / sample app purposes. Add helper scripts from fabric-sample that are used during cartrade setup phase (I've decided it's better to keep them in repo than increasing the size of fabric-all-in-one image). Upgrade of fabcar network (from 1.4.1 to 1.4.8) triggered multiple changes in fabric-socketio validator, since fabcar nodes (peers, orderer) use TLS and require different setup, additionaly done some refactors and fixes in the validator. Update the cartrade and discounted-cartrade sample apps to work with the new setup, refreshed scripts can be used to ease up the setup process. Closes: #1753 Signed-off-by: Michal Bajer --- examples/cartrade/.gitignore | 10 + examples/cartrade/README.md | 11 - examples/cartrade/TransactionFabric.ts | 20 +- examples/cartrade/config/default.yaml | 7 +- examples/cartrade/package.json | 4 +- examples/cartrade/script-build-all.sh | 13 +- examples/cartrade/script-build-cartrade.sh | 7 +- examples/cartrade/script-build-get-app.sh | 14 +- examples/cartrade/script-get-app.sh | 12 +- .../cartrade/script-post-cartrade-sample.sh | 4 +- examples/cartrade/script-start-cartrade.sh | 9 - examples/cartrade/script-start-ledgers.sh | 38 +- .../script-start-validator-ethereum.sh | 7 - .../cartrade/script-start-validator-fabric.sh | 7 - examples/cartrade/script-stop-cartrade.sh | 9 - .../fabric/config/connection.json | 52 -- .../fabric/package.json | 10 - .../fabric/queryCar.js | 78 --- examples/discounted-cartrade/.gitignore | 9 + .../discounted-cartrade/TransactionFabric.ts | 20 +- .../discounted-cartrade/config/default.yaml | 7 +- examples/discounted-cartrade/package.json | 8 +- .../discounted-cartrade/script-build-all.sh | 22 +- .../script-build-cartrade.sh | 6 - .../script-build-discounted-cartrade.sh | 10 + .../script-build-get-app.sh | 14 +- .../discounted-cartrade/script-get-app.sh | 12 +- .../script-post-cartrade-sample.sh | 3 - .../script-start-cartrade.sh | 9 - .../script-start-ledgers.sh | 38 +- .../script-start-validator-ethereum.sh | 7 - .../script-start-validator-fabric.sh | 7 - .../script-stop-cartrade.sh | 9 - .../fabric/config/connection.json | 52 -- .../fabric/package.json | 10 - .../fabric/queryCar.js | 78 --- .../package.json | 11 +- .../script-build-validator.sh | 3 - .../script-start-validator.sh | 3 +- .../main/typescript/connector/PluginConfig.ts | 20 +- .../connector/ServerMonitorPlugin.ts | 150 ++--- .../main/typescript/connector/ServerPlugin.ts | 147 ++--- .../main/typescript/connector/fabricaccess.ts | 175 +++--- .../script-build-validator.sh | 4 +- .../script-start-validator.sh | 2 +- .../script-build-validator.sh | 4 +- .../script-start-validator.sh | 2 +- .../fabcar-cli-1.4/.gitignore | 13 + .../fabcar-cli-1.4/README.md | 16 + .../fabcar-cli-1.4/enrollAdmin.js | 63 ++ .../fabcar-cli-1.4/package.json | 16 + .../fabric-all-in-one/fabcar-cli-1.4/query.js | 60 ++ .../fabcar-cli-1.4/registerUser.js | 84 +++ .../fabric-all-in-one/fabcar-cli-1.4/setup.sh | 25 + .../fabric-all-in-one/run-fabric-network.sh | 7 +- .../script-run-docker-1.4.sh | 50 ++ .../docker/fabric14-fabcar-testnet/.gitignore | 4 - .../docker/fabric14-fabcar-testnet/README.md | 30 - .../fabric-samples_dockerize.patch | 133 ----- .../how_to_containerize_fabcar.md | 557 ------------------ .../script-start-docker.sh | 24 - .../script-start-docker_newer.patch | 43 -- tools/docker/fabric14-testnet/README.md | 30 - .../fabric14-testnet/config/Org1MSPanchors.tx | Bin 284 -> 0 bytes .../docker/fabric14-testnet/config/channel.tx | Bin 320 -> 0 bytes .../fabric14-testnet/config/configtx.yaml | 65 -- .../fabric14-testnet/config/genesis.block | Bin 6516 -> 0 bytes .../example.com/ca/ca.example.com-cert.pem | 15 - ...6d615fdf573a9cf029b9a4a06a51564d3c7fc92_sk | 5 - .../msp/admincerts/Admin@example.com-cert.pem | 13 - .../msp/cacerts/ca.example.com-cert.pem | 15 - .../msp/tlscacerts/tlsca.example.com-cert.pem | 15 - .../msp/admincerts/Admin@example.com-cert.pem | 13 - .../msp/cacerts/ca.example.com-cert.pem | 15 - ...e3d5def2c99cfaa83c5380701d701123d432adf_sk | 5 - .../signcerts/orderer.example.com-cert.pem | 14 - .../msp/tlscacerts/tlsca.example.com-cert.pem | 15 - .../orderers/orderer.example.com/tls/ca.crt | 15 - .../orderer.example.com/tls/server.crt | 15 - .../orderer.example.com/tls/server.key | 5 - ...a652175ba3796188a90478dff56e142aac8f7d9_sk | 5 - .../tlsca/tlsca.example.com-cert.pem | 15 - .../msp/admincerts/Admin@example.com-cert.pem | 13 - .../msp/cacerts/ca.example.com-cert.pem | 15 - ...6781eb78d583d59e6c36b0b66829d706eaa1101_sk | 5 - .../msp/signcerts/Admin@example.com-cert.pem | 13 - .../msp/tlscacerts/tlsca.example.com-cert.pem | 15 - .../users/Admin@example.com/tls/ca.crt | 15 - .../users/Admin@example.com/tls/client.crt | 14 - .../users/Admin@example.com/tls/client.key | 5 - ...0bb522d5caa857bdc2551d03510305e925528d8_sk | 5 - .../ca/ca.org1.example.com-cert.pem | 15 - .../Admin@org1.example.com-cert.pem | 14 - .../msp/cacerts/ca.org1.example.com-cert.pem | 15 - .../tlsca.org1.example.com-cert.pem | 15 - .../Admin@org1.example.com-cert.pem | 14 - .../msp/cacerts/ca.org1.example.com-cert.pem | 15 - ...4a4c278f79c199439a6e1bb3e169b03e5b97960_sk | 5 - .../signcerts/peer0.org1.example.com-cert.pem | 14 - .../tlsca.org1.example.com-cert.pem | 15 - .../peers/peer0.org1.example.com/tls/ca.crt | 15 - .../peer0.org1.example.com/tls/server.crt | 15 - .../peer0.org1.example.com/tls/server.key | 5 - ...6731bbe233973ddab12505465f585df276bcbe4_sk | 5 - .../tlsca/tlsca.org1.example.com-cert.pem | 15 - .../Admin@org1.example.com-cert.pem | 14 - .../msp/cacerts/ca.org1.example.com-cert.pem | 15 - ...b07fa9d032ac91d0d2b7b687efa0fdeb7e7350f_sk | 5 - .../signcerts/Admin@org1.example.com-cert.pem | 14 - .../tlsca.org1.example.com-cert.pem | 15 - .../users/Admin@org1.example.com/tls/ca.crt | 15 - .../Admin@org1.example.com/tls/client.crt | 14 - .../Admin@org1.example.com/tls/client.key | 5 - .../User1@org1.example.com-cert.pem | 14 - .../msp/cacerts/ca.org1.example.com-cert.pem | 15 - ...32277dfd03f0329a1af3848a2416aa47692b78b_sk | 5 - .../signcerts/User1@org1.example.com-cert.pem | 14 - .../tlsca.org1.example.com-cert.pem | 15 - .../users/User1@org1.example.com/tls/ca.crt | 15 - .../User1@org1.example.com/tls/client.crt | 14 - .../User1@org1.example.com/tls/client.key | 5 - .../fabric14-testnet/docker-compose.yml | 115 ---- .../docker/indy-testnet/indy_pool/.gitignore | 1 + .../docker/indy-testnet/validator/.gitignore | 1 + yarn.lock | 350 +++++++---- 125 files changed, 998 insertions(+), 2494 deletions(-) create mode 100644 examples/cartrade/.gitignore delete mode 100755 examples/cartrade/script-start-cartrade.sh delete mode 100755 examples/cartrade/script-start-validator-ethereum.sh delete mode 100755 examples/cartrade/script-start-validator-fabric.sh delete mode 100755 examples/cartrade/script-stop-cartrade.sh delete mode 100644 examples/cartrade/script-test-getFunctions/fabric/config/connection.json delete mode 100644 examples/cartrade/script-test-getFunctions/fabric/package.json delete mode 100644 examples/cartrade/script-test-getFunctions/fabric/queryCar.js create mode 100644 examples/discounted-cartrade/.gitignore mode change 100644 => 100755 examples/discounted-cartrade/script-build-all.sh delete mode 100644 examples/discounted-cartrade/script-build-cartrade.sh create mode 100755 examples/discounted-cartrade/script-build-discounted-cartrade.sh mode change 100644 => 100755 examples/discounted-cartrade/script-build-get-app.sh mode change 100644 => 100755 examples/discounted-cartrade/script-get-app.sh delete mode 100644 examples/discounted-cartrade/script-post-cartrade-sample.sh delete mode 100644 examples/discounted-cartrade/script-start-cartrade.sh mode change 100644 => 100755 examples/discounted-cartrade/script-start-ledgers.sh delete mode 100644 examples/discounted-cartrade/script-start-validator-ethereum.sh delete mode 100644 examples/discounted-cartrade/script-start-validator-fabric.sh delete mode 100644 examples/discounted-cartrade/script-stop-cartrade.sh delete mode 100644 examples/discounted-cartrade/script-test-getFunctions/fabric/config/connection.json delete mode 100644 examples/discounted-cartrade/script-test-getFunctions/fabric/package.json delete mode 100644 examples/discounted-cartrade/script-test-getFunctions/fabric/queryCar.js create mode 100644 tools/docker/fabric-all-in-one/fabcar-cli-1.4/.gitignore create mode 100644 tools/docker/fabric-all-in-one/fabcar-cli-1.4/README.md create mode 100644 tools/docker/fabric-all-in-one/fabcar-cli-1.4/enrollAdmin.js create mode 100644 tools/docker/fabric-all-in-one/fabcar-cli-1.4/package.json create mode 100644 tools/docker/fabric-all-in-one/fabcar-cli-1.4/query.js create mode 100644 tools/docker/fabric-all-in-one/fabcar-cli-1.4/registerUser.js create mode 100755 tools/docker/fabric-all-in-one/fabcar-cli-1.4/setup.sh create mode 100755 tools/docker/fabric-all-in-one/script-run-docker-1.4.sh delete mode 100644 tools/docker/fabric14-fabcar-testnet/.gitignore delete mode 100644 tools/docker/fabric14-fabcar-testnet/README.md delete mode 100644 tools/docker/fabric14-fabcar-testnet/fabric-samples_dockerize.patch delete mode 100644 tools/docker/fabric14-fabcar-testnet/how_to_containerize_fabcar.md delete mode 100755 tools/docker/fabric14-fabcar-testnet/script-start-docker.sh delete mode 100644 tools/docker/fabric14-fabcar-testnet/script-start-docker_newer.patch delete mode 100644 tools/docker/fabric14-testnet/README.md delete mode 100644 tools/docker/fabric14-testnet/config/Org1MSPanchors.tx delete mode 100644 tools/docker/fabric14-testnet/config/channel.tx delete mode 100644 tools/docker/fabric14-testnet/config/configtx.yaml delete mode 100644 tools/docker/fabric14-testnet/config/genesis.block delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/ca/e3050c27bf9b1ebf8580c235c6d615fdf573a9cf029b9a4a06a51564d3c7fc92_sk delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/5265a2599df3d02ad11ab15c5e3d5def2c99cfaa83c5380701d701123d432adf_sk delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/tlsca/e92ffdcf4976b7e17d49ed48ea652175ba3796188a90478dff56e142aac8f7d9_sk delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/2eb7e1c76a1f33c8eba62fcc26781eb78d583d59e6c36b0b66829d706eaa1101_sk delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt delete mode 100644 tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/ca/078afe32f7ab661cdf884926e0bb522d5caa857bdc2551d03510305e925528d8_sk delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/38c2102aea4043d808b8780eb4a4c278f79c199439a6e1bb3e169b03e5b97960_sk delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/tlsca/3d434c0757d4d79bc6e71687e6731bbe233973ddab12505465f585df276bcbe4_sk delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/c8866a4cd76ed76536afd2f0ab07fa9d032ac91d0d2b7b687efa0fdeb7e7350f_sk delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/553c9f7541165a45f9efb06c132277dfd03f0329a1af3848a2416aa47692b78b_sk delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt delete mode 100644 tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key delete mode 100644 tools/docker/fabric14-testnet/docker-compose.yml create mode 100644 tools/docker/indy-testnet/indy_pool/.gitignore create mode 100644 tools/docker/indy-testnet/validator/.gitignore diff --git a/examples/cartrade/.gitignore b/examples/cartrade/.gitignore new file mode 100644 index 0000000000..1e010e2cd5 --- /dev/null +++ b/examples/cartrade/.gitignore @@ -0,0 +1,10 @@ + +# Fabric TLSCA local dir +crypto-config/ + +# BLP artifacts +TransactionInfo.json +wallet/ + +# don't commit package-lock +package-lock.json diff --git a/examples/cartrade/README.md b/examples/cartrade/README.md index 9ee988aec0..e5f6c541ad 100644 --- a/examples/cartrade/README.md +++ b/examples/cartrade/README.md @@ -45,17 +45,6 @@ Cactus **car-trade** is a sample application where users can exchange car owners ./script-start-ledgers.sh ``` - (NOTICE: Before executing the above, your account needs to be added to the docker group (`usermod -a -G docker YourAccount` from root user)) - - If the following containers are started when displaying the container list with the docker ps command, it will be fine. - ``` - CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES - 14b98ba40b66 dev-peer0.org1.example.com-fabcar-1.0-5c906e402ed29f20260ae42283216aa75549c571e2e380f3615826365d8269ba "chaincode -peer.add…" 42 seconds ago Up 40 seconds dev-peer0.org1.example.com-fabcar-1.0 - d0efd7479bdd hyperledger/fabric-tools "/bin/bash" About a minute ago Up 56 seconds cli - c9bd7ddfde7e hyperledger/fabric-peer "peer node start" About a minute ago Up About a minute 0.0.0.0:7051->7051/tcp, 0.0.0.0:7053->7053/tcp peer0.org1.example.com - d4f2b1a76626 hyperledger/fabric-couchdb "tini -- /docker-ent…" About a minute ago Up About a minute 4369/tcp, 9100/tcp, 0.0.0.0:5984->5984/tcp couchdb - 53a79780f564 hyperledger/fabric-ca "sh -c 'fabric-ca-se…" About a minute ago Up About a minute 0.0.0.0:7054->7054/tcp ca.example.com - aceb0e52e9c7 hyperledger/fabric-orderer "orderer" About a minute ago Up About a minute 0.0.0.0:7050->7050/tcp orderer.example.com - ec57c9f78d0d ethereum/client-go:v1.8.27 "geth --rpc --networ…" 2 minutes ago Up 2 minutes 8546/tcp, 0.0.0.0:8545->8545/tcp, 30303/tcp, 30303/udp geth1 - ``` 1. Please prepare the three consoles on your machine as the following: - **console 1**: console for launching `cactus-plugin-ledger-connector-go-ethereum-socketio` diff --git a/examples/cartrade/TransactionFabric.ts b/examples/cartrade/TransactionFabric.ts index c363c80f7f..02c4c794eb 100644 --- a/examples/cartrade/TransactionFabric.ts +++ b/examples/cartrade/TransactionFabric.ts @@ -21,9 +21,11 @@ import { Verifier } from "../../packages/cactus-cmd-socketio-server/src/main/typ const fs = require("fs"); const path = require("path"); const yaml = require("js-yaml"); +import { FileSystemWallet } from "fabric-network"; + //const config: any = JSON.parse(fs.readFileSync("/etc/cactus/default.json", 'utf8')); const config: any = yaml.safeLoad( - fs.readFileSync("/etc/cactus/default.yaml", "utf8") + fs.readFileSync("/etc/cactus/default.yaml", "utf8"), ); import { getLogger } from "log4js"; const moduleName = "TransactionFabric"; @@ -33,7 +35,7 @@ logger.level = config.logLevel; export function makeSignedProposal( ccFncName: string, ccArgs: string[], - verifierFabric: Verifier + verifierFabric: Verifier, ): Promise<{ data: {}; txId: string }> { // exports.Invoke = async function(reqBody, isWait){ // let eventhubs = []; // For the time being, give up the eventhub connection of multiple peers. @@ -54,8 +56,18 @@ export function makeSignedProposal( logger.debug(transactionProposalReq); // Get certificate and key acquisition - const certPem = config.cartradeInfo.fabric.submitter.certificate; - const privateKeyPem = config.cartradeInfo.fabric.submitter.pkey; + let certPem = undefined; + let privateKeyPem = undefined; + const submitter = config.cartradeInfo.fabric.submitter.name; + const wallet = new FileSystemWallet(config.cartradeInfo.fabric.keystore); + logger.debug(`Wallet path: ${config.cartradeInfo.fabric.keystore}`); + + const submitterExists = await wallet.exists(submitter); + if (submitterExists) { + const submitterIdentity = await wallet.export(submitter); + certPem = (submitterIdentity as any).certificate; + privateKeyPem = (submitterIdentity as any).privateKey; + } // const signedTx = await TransactionSigner.signTxFabric(transactionProposalReq, certPem, privateKeyPem); const contract = { channelName: config.cartradeInfo.fabric.channelName }; diff --git a/examples/cartrade/config/default.yaml b/examples/cartrade/config/default.yaml index a17584d586..e9b4b34d95 100644 --- a/examples/cartrade/config/default.yaml +++ b/examples/cartrade/config/default.yaml @@ -2,11 +2,11 @@ cartradeInfo: fabric: validatorID: r9IS4dDf mspID: Org1MSP - keystore: "./wallet/admin" + keystore: "./wallet" connUserName: user1 contractName: fabcar peers: - - + - name: peer0.org1.example.com requests: grpc://localhost:7051 orderer: @@ -19,9 +19,6 @@ cartradeInfo: submitter: name: admin - secret: adminpw - certificate: "-----BEGIN CERTIFICATE-----\nMIICATCCAaigAwIBAgIUPku4qKIQbtGFDlnZnOT4wuprCrowCgYIKoZIzj0EAwIw\nczELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh\nbiBGcmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMT\nE2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMjEwNzMwMDUwMjAwWhcNMjIwNzMwMDUw\nNzAwWjAhMQ8wDQYDVQQLEwZjbGllbnQxDjAMBgNVBAMTBWFkbWluMFkwEwYHKoZI\nzj0CAQYIKoZIzj0DAQcDQgAEcsvU2r+Td7dtCuZbzW5i6g9YZ5I99/PsbhBajl81\nP6Q7LUp0yG4KPP+RM1QP7Vq17rxTT/8jfdQGHBmyjNCGZKNsMGowDgYDVR0PAQH/\nBAQDAgeAMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFBgBGL/ubLTHr5xcQNQtQ2X/\nrxEeMCsGA1UdIwQkMCKAIEI5qg3NdtruuLoM2nAYUdFFBNMarRst3dusalc2Xkl8\nMAoGCCqGSM49BAMCA0cAMEQCIC2DR+8I1YzjtpVZartsZIvzkcUBTEkWPHu8lPoS\nXlOMAiBawCF3lIBzs/mi9kCL58M6SkddfKievhfi0/obf0sGEw==\n-----END CERTIFICATE-----\n" - pkey: "-----BEGIN PRIVATE KEY-----\nMIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgMNMJbHDw6+FcclPa\nzGWYItb0g+VnXAAVMCv1RFILciOhRANCAARyy9Tav5N3t20K5lvNbmLqD1hnkj33\n8+xuEFqOXzU/pDstSnTIbgo8/5EzVA/tWrXuvFNP/yN91AYcGbKM0IZk\n-----END PRIVATE KEY-----\n" channelName: mychannel chaincodeID: fabcar diff --git a/examples/cartrade/package.json b/examples/cartrade/package.json index 9c26bb86f2..29d8474bc6 100644 --- a/examples/cartrade/package.json +++ b/examples/cartrade/package.json @@ -20,8 +20,8 @@ "ethereumjs-common": "^1.5.1", "ethereumjs-tx": "^2.1.2", "express": "~4.16.1", - "fabric-ca-client": "2.2.10", - "fabric-network": "2.2.10", + "fabric-ca-client": "~1.4.0", + "fabric-network": "~1.4.0", "http-errors": "~1.6.3", "jsonwebtoken": "^8.5.1", "log4js": "^3.0.6", diff --git a/examples/cartrade/script-build-all.sh b/examples/cartrade/script-build-all.sh index 59672dbee8..cfa766cd39 100755 --- a/examples/cartrade/script-build-all.sh +++ b/examples/cartrade/script-build-all.sh @@ -1,11 +1,12 @@ +#!/usr/bin/env bash # Copyright 2020-2021 Hyperledger Cactus Contributors # SPDX-License-Identifier: Apache-2.0 + cd ../.. ## Build validator for Fabric cd ./packages/cactus-plugin-ledger-connector-fabric-socketio ./script-build-validator.sh -cp -a ../../examples/cartrade/build/wallet ./dist/connector cd ../.. ## build validator for Ethereum @@ -13,11 +14,9 @@ cd ./packages/cactus-plugin-ledger-connector-go-ethereum-socketio ./script-build-validator.sh cd ../.. -## build packages -cd ./packages/cactus-plugin-ledger-connector-fabric-socketio -./script-build-packages.sh -cd ../.. - ## build cartrade apps cd ./examples/cartrade -./script-build-cartrade.sh \ No newline at end of file +./script-build-cartrade.sh + +## build getter apps +./script-build-get-app.sh diff --git a/examples/cartrade/script-build-cartrade.sh b/examples/cartrade/script-build-cartrade.sh index 7b4ed67527..1e2fedff8b 100755 --- a/examples/cartrade/script-build-cartrade.sh +++ b/examples/cartrade/script-build-cartrade.sh @@ -1,6 +1,11 @@ +#!/usr/bin/env bash # Copyright 2020-2021 Hyperledger Cactus Contributors # SPDX-License-Identifier: Apache-2.0 + ## Build a cartrade app echo "[process] Build a cartrade app" +rm -fr ./crypto-config +rm -fr ./wallet +rm -fr ../../dist/node_modules npm install -npm run build \ No newline at end of file +npm run build diff --git a/examples/cartrade/script-build-get-app.sh b/examples/cartrade/script-build-get-app.sh index d7b259d096..e20edefe20 100755 --- a/examples/cartrade/script-build-get-app.sh +++ b/examples/cartrade/script-build-get-app.sh @@ -1,9 +1,15 @@ +#!/usr/bin/env bash # Copyright 2020-2021 Hyperledger Cactus Contributors # SPDX-License-Identifier: Apache-2.0 -## Build a getting app + +## Build ethereum app echo "[process] Build an app for getting Balance on Ethereum" -cd script-test-getFunctions/go-ethereum +pushd script-test-getFunctions/go-ethereum npm install +popd + +## Build fabric app echo "[process] Build an app for getting ownership on Fabcar" -cd ../fabric -npm install \ No newline at end of file +pushd ../../tools/docker/fabric-all-in-one/fabcar-cli-1.4 +npm install +popd diff --git a/examples/cartrade/script-get-app.sh b/examples/cartrade/script-get-app.sh index 6a08c81382..b1e8591f63 100755 --- a/examples/cartrade/script-get-app.sh +++ b/examples/cartrade/script-get-app.sh @@ -1,9 +1,15 @@ +#!/usr/bin/env bash # Copyright 2020-2021 Hyperledger Cactus Contributors # SPDX-License-Identifier: Apache-2.0 + ## Execute a getting app echo "[process] Execute an app for getting Balance on Ethereum" -cd script-test-getFunctions/go-ethereum +pushd script-test-getFunctions/go-ethereum node getBalance.js +popd + echo "[process] Execute an app for getting ownership on Fabcar" -cd ../fabric -node queryCar.js CAR1 \ No newline at end of file +pushd ../../tools/docker/fabric-all-in-one/fabcar-cli-1.4 +./setup.sh >/dev/null +node query.js +popd diff --git a/examples/cartrade/script-post-cartrade-sample.sh b/examples/cartrade/script-post-cartrade-sample.sh index cd1021b9cd..115d3faecc 100755 --- a/examples/cartrade/script-post-cartrade-sample.sh +++ b/examples/cartrade/script-post-cartrade-sample.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash # Copyright 2020-2021 Hyperledger Cactus Contributors # SPDX-License-Identifier: Apache-2.0 -curl localhost:5034/api/v1/bl/trades/ -XPOST -H "Content-Type: application/json" -d '{"businessLogicID":"guks32pf","tradeParams":["0x06fc56347d91c6ad2dae0c3ba38eb12ab0d72e97", "0x9d624f7995e8bd70251f8265f2f9f2b49f169c55", "Brad", "Cathy", 50, "CAR1"],"authParams":["none"]}' \ No newline at end of file + +curl localhost:5034/api/v1/bl/trades/ -XPOST -H "Content-Type: application/json" -d '{"businessLogicID":"guks32pf","tradeParams":["0x06fc56347d91c6ad2dae0c3ba38eb12ab0d72e97", "0x9d624f7995e8bd70251f8265f2f9f2b49f169c55", "Brad", "Cathy", 50, "CAR1"],"authParams":["none"]}' diff --git a/examples/cartrade/script-start-cartrade.sh b/examples/cartrade/script-start-cartrade.sh deleted file mode 100755 index 4d10f5fac8..0000000000 --- a/examples/cartrade/script-start-cartrade.sh +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2020-2021 Hyperledger Cactus Contributors -# SPDX-License-Identifier: Apache-2.0 -cd ../.. - -## Start cartrade app -echo "[process] Start the routing interface and the cartrade app" -cd ./examples/cartrade -npm run init-cartrade # for making a symbolic link for node_modules. This command only needs to be run once. -npm run start \ No newline at end of file diff --git a/examples/cartrade/script-start-ledgers.sh b/examples/cartrade/script-start-ledgers.sh index 77110631dc..09c884c686 100755 --- a/examples/cartrade/script-start-ledgers.sh +++ b/examples/cartrade/script-start-ledgers.sh @@ -1,12 +1,36 @@ +#!/usr/bin/env bash # Copyright 2020-2021 Hyperledger Cactus Contributors # SPDX-License-Identifier: Apache-2.0 -cd ../.. -## Start docker environment for Go-Ethereum testnet -cd ./tools/docker/geth-testnet +# Exit on error +set -e + +FABRIC_CONTAINER_NAME=fabcar14_sample_setup + +pushd ../.. + +## Run Go-Ethereum Ledger +pushd ./tools/docker/geth-testnet ./script-start-docker.sh -cd ../../.. +popd + +## RunFabric Ledger +pushd ./tools/docker/fabric-all-in-one +./script-run-docker-1.4.sh +popd + +popd + +# Copy TLSCAs to connect peer and orderer +mkdir -p ./crypto-config/ +rm -fr ./crypto-config/* +docker cp ${FABRIC_CONTAINER_NAME}:/fabric-samples/first-network/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem ./crypto-config/ +docker cp ${FABRIC_CONTAINER_NAME}:/fabric-samples/first-network/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem ./crypto-config/ + +# Enroll users and copy wallet +pushd ../../tools/docker/fabric-all-in-one/fabcar-cli-1.4 +./setup.sh +popd +cp -ar ../../tools/docker/fabric-all-in-one/fabcar-cli-1.4/wallet . -## Start docker environment for Fabric testnet -cd ./tools/docker/fabric14-fabcar-testnet -./script-start-docker.sh \ No newline at end of file +echo "All Done." diff --git a/examples/cartrade/script-start-validator-ethereum.sh b/examples/cartrade/script-start-validator-ethereum.sh deleted file mode 100755 index 4b01060498..0000000000 --- a/examples/cartrade/script-start-validator-ethereum.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2020-2021 Hyperledger Cactus Contributors -# SPDX-License-Identifier: Apache-2.0 -cd ../.. - -echo "[process] Start the validator for Go-Ethereum" -cd ./packages/cactus-plugin-ledger-connector-go-ethereum-socketio -npm run start \ No newline at end of file diff --git a/examples/cartrade/script-start-validator-fabric.sh b/examples/cartrade/script-start-validator-fabric.sh deleted file mode 100755 index f9664a0983..0000000000 --- a/examples/cartrade/script-start-validator-fabric.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2020-2021 Hyperledger Cactus Contributors -# SPDX-License-Identifier: Apache-2.0 -cd ../.. - -echo "[process] Start the validator for Fabric" -cd ./packages/cactus-plugin-ledger-connector-fabric-socketio -npm run start \ No newline at end of file diff --git a/examples/cartrade/script-stop-cartrade.sh b/examples/cartrade/script-stop-cartrade.sh deleted file mode 100755 index 785e2074aa..0000000000 --- a/examples/cartrade/script-stop-cartrade.sh +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2020-2021 Hyperledger Cactus Contributors -# SPDX-License-Identifier: Apache-2.0 -echo "[process] Stop the validators and the cartrade app" -# stop the validator for Ethereum -kill -9 $(lsof -t -i:5050) -# stop the validator for Fabric -kill -9 $(lsof -t -i:5040) -# stop the cartrade app -kill -9 $(lsof -t -i:5034) \ No newline at end of file diff --git a/examples/cartrade/script-test-getFunctions/fabric/config/connection.json b/examples/cartrade/script-test-getFunctions/fabric/config/connection.json deleted file mode 100644 index 4991bc7794..0000000000 --- a/examples/cartrade/script-test-getFunctions/fabric/config/connection.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "name": "basic-network", - "version": "1.0.0", - "client": { - "organization": "Org1", - "connection": { - "timeout": { - "peer": { - "endorser": "300" - }, - "orderer": "300" - } - } - }, - "channels": { - "mychannel": { - "orderers": [ - "orderer.example.com" - ], - "peers": { - "peer0.org1.example.com": {} - } - } - }, - "organizations": { - "Org1": { - "mspid": "Org1MSP", - "peers": [ - "peer0.org1.example.com" - ], - "certificateAuthorities": [ - "ca.example.com" - ] - } - }, - "orderers": { - "orderer.example.com": { - "url": "grpc://localhost:7050" - } - }, - "peers": { - "peer0.org1.example.com": { - "url": "grpc://localhost:7051" - } - }, - "certificateAuthorities": { - "ca.example.com": { - "url": "http://localhost:7054", - "caName": "ca.example.com" - } - } -} \ No newline at end of file diff --git a/examples/cartrade/script-test-getFunctions/fabric/package.json b/examples/cartrade/script-test-getFunctions/fabric/package.json deleted file mode 100644 index bc50d4f3fc..0000000000 --- a/examples/cartrade/script-test-getFunctions/fabric/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "validatorDriver", - "version": "0.0.0", - "private": true, - "dependencies": { - "config": "^1.26.1", - "fabric-ca-client": "2.2.10", - "fabric-network": "2.2.10" - } -} \ No newline at end of file diff --git a/examples/cartrade/script-test-getFunctions/fabric/queryCar.js b/examples/cartrade/script-test-getFunctions/fabric/queryCar.js deleted file mode 100644 index 8e18206432..0000000000 --- a/examples/cartrade/script-test-getFunctions/fabric/queryCar.js +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2021 Hyperledger Cactus Contributors - * SPDX-License-Identifier: Apache-2.0 - * - * queryCar.js - */ - -"use strict"; - -const { FileSystemWallet, Gateway } = require("fabric-network"); -const fs = require("fs"); -const path = require("path"); - -const ccpPath = path.resolve(__dirname, "config", "connection.json"); -const ccpJSON = fs.readFileSync(ccpPath, "utf8"); -const ccp = JSON.parse(ccpJSON); - -// TODO: -const walletPath = path.resolve(__dirname, "wallet"); - -const userName = "user1"; -const channelName = "mychannel"; - -async function main() { - try { - // Create a new file system based wallet for managing identities. - const wallet = new FileSystemWallet(walletPath); - console.log(`Wallet path: ${walletPath}`); - - // Check to see if we've already enrolled the user. - const userExists = await wallet.exists(userName); - if (!userExists) { - console.log( - 'An identity for the user "' + - userName + - '" does not exist in the wallet' - ); - console.log("Run the registerUser.js application before retrying"); - return; - } - - // Create a new gateway for connecting to our peer node. - const gateway = new Gateway(); - await gateway.connect(ccp, { - wallet, - identity: userName, - discovery: { enabled: false }, - }); - - // Get the network (channel) our contract is deployed to. - const network = await gateway.getNetwork("mychannel"); - - // Get the contract from the network. - const contract = network.getContract("fabcar"); - - // Evaluate the specified transaction. - if (process.argv.length > 2) { - const key = process.argv[2]; - //console.log('##queryCar Params: ' + key); - console.log(`##queryCar Params: ${key}`); - const result = await contract.evaluateTransaction("queryCar", key); - console.log( - `Transaction has been evaluated, result is: ${result.toString()}` - ); - } else { - console.log("##queryAllCars: "); - const result = await contract.evaluateTransaction("queryAllCars"); - console.log( - `Transaction has been evaluated, result is: ${result.toString()}` - ); - } - } catch (error) { - console.error(`Failed to evaluate transaction: ${error}`); - process.exit(1); - } -} - -main(); diff --git a/examples/discounted-cartrade/.gitignore b/examples/discounted-cartrade/.gitignore new file mode 100644 index 0000000000..600ff4c95c --- /dev/null +++ b/examples/discounted-cartrade/.gitignore @@ -0,0 +1,9 @@ +# Fabric TLSCA local dir +crypto-config/ + +# BLP artifacts +TransactionInfo.json +wallet/ + +# don't commit package-lock +package-lock.json diff --git a/examples/discounted-cartrade/TransactionFabric.ts b/examples/discounted-cartrade/TransactionFabric.ts index c363c80f7f..02c4c794eb 100644 --- a/examples/discounted-cartrade/TransactionFabric.ts +++ b/examples/discounted-cartrade/TransactionFabric.ts @@ -21,9 +21,11 @@ import { Verifier } from "../../packages/cactus-cmd-socketio-server/src/main/typ const fs = require("fs"); const path = require("path"); const yaml = require("js-yaml"); +import { FileSystemWallet } from "fabric-network"; + //const config: any = JSON.parse(fs.readFileSync("/etc/cactus/default.json", 'utf8')); const config: any = yaml.safeLoad( - fs.readFileSync("/etc/cactus/default.yaml", "utf8") + fs.readFileSync("/etc/cactus/default.yaml", "utf8"), ); import { getLogger } from "log4js"; const moduleName = "TransactionFabric"; @@ -33,7 +35,7 @@ logger.level = config.logLevel; export function makeSignedProposal( ccFncName: string, ccArgs: string[], - verifierFabric: Verifier + verifierFabric: Verifier, ): Promise<{ data: {}; txId: string }> { // exports.Invoke = async function(reqBody, isWait){ // let eventhubs = []; // For the time being, give up the eventhub connection of multiple peers. @@ -54,8 +56,18 @@ export function makeSignedProposal( logger.debug(transactionProposalReq); // Get certificate and key acquisition - const certPem = config.cartradeInfo.fabric.submitter.certificate; - const privateKeyPem = config.cartradeInfo.fabric.submitter.pkey; + let certPem = undefined; + let privateKeyPem = undefined; + const submitter = config.cartradeInfo.fabric.submitter.name; + const wallet = new FileSystemWallet(config.cartradeInfo.fabric.keystore); + logger.debug(`Wallet path: ${config.cartradeInfo.fabric.keystore}`); + + const submitterExists = await wallet.exists(submitter); + if (submitterExists) { + const submitterIdentity = await wallet.export(submitter); + certPem = (submitterIdentity as any).certificate; + privateKeyPem = (submitterIdentity as any).privateKey; + } // const signedTx = await TransactionSigner.signTxFabric(transactionProposalReq, certPem, privateKeyPem); const contract = { channelName: config.cartradeInfo.fabric.channelName }; diff --git a/examples/discounted-cartrade/config/default.yaml b/examples/discounted-cartrade/config/default.yaml index a17584d586..e9b4b34d95 100644 --- a/examples/discounted-cartrade/config/default.yaml +++ b/examples/discounted-cartrade/config/default.yaml @@ -2,11 +2,11 @@ cartradeInfo: fabric: validatorID: r9IS4dDf mspID: Org1MSP - keystore: "./wallet/admin" + keystore: "./wallet" connUserName: user1 contractName: fabcar peers: - - + - name: peer0.org1.example.com requests: grpc://localhost:7051 orderer: @@ -19,9 +19,6 @@ cartradeInfo: submitter: name: admin - secret: adminpw - certificate: "-----BEGIN CERTIFICATE-----\nMIICATCCAaigAwIBAgIUPku4qKIQbtGFDlnZnOT4wuprCrowCgYIKoZIzj0EAwIw\nczELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNh\nbiBGcmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHDAaBgNVBAMT\nE2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMjEwNzMwMDUwMjAwWhcNMjIwNzMwMDUw\nNzAwWjAhMQ8wDQYDVQQLEwZjbGllbnQxDjAMBgNVBAMTBWFkbWluMFkwEwYHKoZI\nzj0CAQYIKoZIzj0DAQcDQgAEcsvU2r+Td7dtCuZbzW5i6g9YZ5I99/PsbhBajl81\nP6Q7LUp0yG4KPP+RM1QP7Vq17rxTT/8jfdQGHBmyjNCGZKNsMGowDgYDVR0PAQH/\nBAQDAgeAMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFBgBGL/ubLTHr5xcQNQtQ2X/\nrxEeMCsGA1UdIwQkMCKAIEI5qg3NdtruuLoM2nAYUdFFBNMarRst3dusalc2Xkl8\nMAoGCCqGSM49BAMCA0cAMEQCIC2DR+8I1YzjtpVZartsZIvzkcUBTEkWPHu8lPoS\nXlOMAiBawCF3lIBzs/mi9kCL58M6SkddfKievhfi0/obf0sGEw==\n-----END CERTIFICATE-----\n" - pkey: "-----BEGIN PRIVATE KEY-----\nMIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgMNMJbHDw6+FcclPa\nzGWYItb0g+VnXAAVMCv1RFILciOhRANCAARyy9Tav5N3t20K5lvNbmLqD1hnkj33\n8+xuEFqOXzU/pDstSnTIbgo8/5EzVA/tWrXuvFNP/yN91AYcGbKM0IZk\n-----END PRIVATE KEY-----\n" channelName: mychannel chaincodeID: fabcar diff --git a/examples/discounted-cartrade/package.json b/examples/discounted-cartrade/package.json index dd025098aa..75c8af7dec 100644 --- a/examples/discounted-cartrade/package.json +++ b/examples/discounted-cartrade/package.json @@ -4,7 +4,7 @@ "scripts": { "start": "node ../../dist/packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/www.js", "debug": "nodemon --inspect ../../dist//packages/cactus-cmd-socketio-server/src/main/typescript/routing-interface/www.js", - "build": "npm run build-ts && npm run copy-static-assets && npm run copy-blp-config && npm run replace-blp-config-path", + "build": "npm run build-ts && npm run copy-static-assets && npm run copy-blp-config && npm run replace-blp-config-path && npm run init-discounted-cartrade", "build-ts": "tsc -p ./tsconfig.json", "tslint": "tslint -c tslint.json -p tsconfig.json './*.ts'", "copy-static-assets": "ts-node copyStaticAssets.ts", @@ -20,9 +20,9 @@ "ethereumjs-common": "^1.5.1", "ethereumjs-tx": "^2.1.2", "express": "~4.16.1", - "fabric-ca-client": "2.2.10", - "fabric-network": "2.2.10", - "fabric-client": "^1.4.0", + "fabric-ca-client": "~1.4.0", + "fabric-network": "~1.4.0", + "fabric-client": "~1.4.0", "http-errors": "~1.6.3", "indy-sdk": "^1.16.0-dev-1636", "jsonwebtoken": "^8.5.1", diff --git a/examples/discounted-cartrade/script-build-all.sh b/examples/discounted-cartrade/script-build-all.sh old mode 100644 new mode 100755 index 36a82fedc8..423a465320 --- a/examples/discounted-cartrade/script-build-all.sh +++ b/examples/discounted-cartrade/script-build-all.sh @@ -1,23 +1,27 @@ +#!/usr/bin/env bash # Copyright 2020-2021 Hyperledger Cactus Contributors # SPDX-License-Identifier: Apache-2.0 + cd ../.. ## Build validator for Fabric cd ./packages/cactus-plugin-ledger-connector-fabric-socketio ./script-build-validator.sh -cp -a ../../examples/discounted-cartrade/build/wallet ./dist/connector -cd ../../ +cd ../.. ## build validator for Ethereum cd ./packages/cactus-plugin-ledger-connector-go-ethereum-socketio ./script-build-validator.sh -cd ../../ - -## build packages -cd ./packages/cactus-cmd-socketio-server -./script-build-packages.sh cd ../.. -## build cartrade apps +# Build Indy testnet +cd ./tools/docker/indy-testnet +docker-compose build +cd ../../.. + +## build discounted-cartrade apps cd ./examples/discounted-cartrade -./script-build-cartrade.sh \ No newline at end of file +./script-build-discounted-cartrade.sh + +## build getter apps +./script-build-get-app.sh diff --git a/examples/discounted-cartrade/script-build-cartrade.sh b/examples/discounted-cartrade/script-build-cartrade.sh deleted file mode 100644 index 7b4ed67527..0000000000 --- a/examples/discounted-cartrade/script-build-cartrade.sh +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 2020-2021 Hyperledger Cactus Contributors -# SPDX-License-Identifier: Apache-2.0 -## Build a cartrade app -echo "[process] Build a cartrade app" -npm install -npm run build \ No newline at end of file diff --git a/examples/discounted-cartrade/script-build-discounted-cartrade.sh b/examples/discounted-cartrade/script-build-discounted-cartrade.sh new file mode 100755 index 0000000000..f501899714 --- /dev/null +++ b/examples/discounted-cartrade/script-build-discounted-cartrade.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +# Copyright 2020-2021 Hyperledger Cactus Contributors +# SPDX-License-Identifier: Apache-2.0 +## Build a cartrade app +echo "[process] Build a discounted-cartrade app" +rm -fr ./crypto-config +rm -fr ./wallet +rm -fr ../../dist/node_modules +npm install +npm run build diff --git a/examples/discounted-cartrade/script-build-get-app.sh b/examples/discounted-cartrade/script-build-get-app.sh old mode 100644 new mode 100755 index d7b259d096..e20edefe20 --- a/examples/discounted-cartrade/script-build-get-app.sh +++ b/examples/discounted-cartrade/script-build-get-app.sh @@ -1,9 +1,15 @@ +#!/usr/bin/env bash # Copyright 2020-2021 Hyperledger Cactus Contributors # SPDX-License-Identifier: Apache-2.0 -## Build a getting app + +## Build ethereum app echo "[process] Build an app for getting Balance on Ethereum" -cd script-test-getFunctions/go-ethereum +pushd script-test-getFunctions/go-ethereum npm install +popd + +## Build fabric app echo "[process] Build an app for getting ownership on Fabcar" -cd ../fabric -npm install \ No newline at end of file +pushd ../../tools/docker/fabric-all-in-one/fabcar-cli-1.4 +npm install +popd diff --git a/examples/discounted-cartrade/script-get-app.sh b/examples/discounted-cartrade/script-get-app.sh old mode 100644 new mode 100755 index 6a08c81382..b1e8591f63 --- a/examples/discounted-cartrade/script-get-app.sh +++ b/examples/discounted-cartrade/script-get-app.sh @@ -1,9 +1,15 @@ +#!/usr/bin/env bash # Copyright 2020-2021 Hyperledger Cactus Contributors # SPDX-License-Identifier: Apache-2.0 + ## Execute a getting app echo "[process] Execute an app for getting Balance on Ethereum" -cd script-test-getFunctions/go-ethereum +pushd script-test-getFunctions/go-ethereum node getBalance.js +popd + echo "[process] Execute an app for getting ownership on Fabcar" -cd ../fabric -node queryCar.js CAR1 \ No newline at end of file +pushd ../../tools/docker/fabric-all-in-one/fabcar-cli-1.4 +./setup.sh >/dev/null +node query.js +popd diff --git a/examples/discounted-cartrade/script-post-cartrade-sample.sh b/examples/discounted-cartrade/script-post-cartrade-sample.sh deleted file mode 100644 index cd1021b9cd..0000000000 --- a/examples/discounted-cartrade/script-post-cartrade-sample.sh +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 2020-2021 Hyperledger Cactus Contributors -# SPDX-License-Identifier: Apache-2.0 -curl localhost:5034/api/v1/bl/trades/ -XPOST -H "Content-Type: application/json" -d '{"businessLogicID":"guks32pf","tradeParams":["0x06fc56347d91c6ad2dae0c3ba38eb12ab0d72e97", "0x9d624f7995e8bd70251f8265f2f9f2b49f169c55", "Brad", "Cathy", 50, "CAR1"],"authParams":["none"]}' \ No newline at end of file diff --git a/examples/discounted-cartrade/script-start-cartrade.sh b/examples/discounted-cartrade/script-start-cartrade.sh deleted file mode 100644 index 2eb132a488..0000000000 --- a/examples/discounted-cartrade/script-start-cartrade.sh +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2020-2021 Hyperledger Cactus Contributors -# SPDX-License-Identifier: Apache-2.0 -cd ../.. - -## Start cartrade app -echo "[process] Start the routing interface and the discounted-cartrade app" -cd ./examples/discounted-cartrade -npm run init-discounted-cartrade # for making a symbolic link for node_modules. This command only needs to be run once. -npm run start \ No newline at end of file diff --git a/examples/discounted-cartrade/script-start-ledgers.sh b/examples/discounted-cartrade/script-start-ledgers.sh old mode 100644 new mode 100755 index 77110631dc..09c884c686 --- a/examples/discounted-cartrade/script-start-ledgers.sh +++ b/examples/discounted-cartrade/script-start-ledgers.sh @@ -1,12 +1,36 @@ +#!/usr/bin/env bash # Copyright 2020-2021 Hyperledger Cactus Contributors # SPDX-License-Identifier: Apache-2.0 -cd ../.. -## Start docker environment for Go-Ethereum testnet -cd ./tools/docker/geth-testnet +# Exit on error +set -e + +FABRIC_CONTAINER_NAME=fabcar14_sample_setup + +pushd ../.. + +## Run Go-Ethereum Ledger +pushd ./tools/docker/geth-testnet ./script-start-docker.sh -cd ../../.. +popd + +## RunFabric Ledger +pushd ./tools/docker/fabric-all-in-one +./script-run-docker-1.4.sh +popd + +popd + +# Copy TLSCAs to connect peer and orderer +mkdir -p ./crypto-config/ +rm -fr ./crypto-config/* +docker cp ${FABRIC_CONTAINER_NAME}:/fabric-samples/first-network/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem ./crypto-config/ +docker cp ${FABRIC_CONTAINER_NAME}:/fabric-samples/first-network/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem ./crypto-config/ + +# Enroll users and copy wallet +pushd ../../tools/docker/fabric-all-in-one/fabcar-cli-1.4 +./setup.sh +popd +cp -ar ../../tools/docker/fabric-all-in-one/fabcar-cli-1.4/wallet . -## Start docker environment for Fabric testnet -cd ./tools/docker/fabric14-fabcar-testnet -./script-start-docker.sh \ No newline at end of file +echo "All Done." diff --git a/examples/discounted-cartrade/script-start-validator-ethereum.sh b/examples/discounted-cartrade/script-start-validator-ethereum.sh deleted file mode 100644 index 4b01060498..0000000000 --- a/examples/discounted-cartrade/script-start-validator-ethereum.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2020-2021 Hyperledger Cactus Contributors -# SPDX-License-Identifier: Apache-2.0 -cd ../.. - -echo "[process] Start the validator for Go-Ethereum" -cd ./packages/cactus-plugin-ledger-connector-go-ethereum-socketio -npm run start \ No newline at end of file diff --git a/examples/discounted-cartrade/script-start-validator-fabric.sh b/examples/discounted-cartrade/script-start-validator-fabric.sh deleted file mode 100644 index f9664a0983..0000000000 --- a/examples/discounted-cartrade/script-start-validator-fabric.sh +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright 2020-2021 Hyperledger Cactus Contributors -# SPDX-License-Identifier: Apache-2.0 -cd ../.. - -echo "[process] Start the validator for Fabric" -cd ./packages/cactus-plugin-ledger-connector-fabric-socketio -npm run start \ No newline at end of file diff --git a/examples/discounted-cartrade/script-stop-cartrade.sh b/examples/discounted-cartrade/script-stop-cartrade.sh deleted file mode 100644 index 785e2074aa..0000000000 --- a/examples/discounted-cartrade/script-stop-cartrade.sh +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2020-2021 Hyperledger Cactus Contributors -# SPDX-License-Identifier: Apache-2.0 -echo "[process] Stop the validators and the cartrade app" -# stop the validator for Ethereum -kill -9 $(lsof -t -i:5050) -# stop the validator for Fabric -kill -9 $(lsof -t -i:5040) -# stop the cartrade app -kill -9 $(lsof -t -i:5034) \ No newline at end of file diff --git a/examples/discounted-cartrade/script-test-getFunctions/fabric/config/connection.json b/examples/discounted-cartrade/script-test-getFunctions/fabric/config/connection.json deleted file mode 100644 index 4991bc7794..0000000000 --- a/examples/discounted-cartrade/script-test-getFunctions/fabric/config/connection.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "name": "basic-network", - "version": "1.0.0", - "client": { - "organization": "Org1", - "connection": { - "timeout": { - "peer": { - "endorser": "300" - }, - "orderer": "300" - } - } - }, - "channels": { - "mychannel": { - "orderers": [ - "orderer.example.com" - ], - "peers": { - "peer0.org1.example.com": {} - } - } - }, - "organizations": { - "Org1": { - "mspid": "Org1MSP", - "peers": [ - "peer0.org1.example.com" - ], - "certificateAuthorities": [ - "ca.example.com" - ] - } - }, - "orderers": { - "orderer.example.com": { - "url": "grpc://localhost:7050" - } - }, - "peers": { - "peer0.org1.example.com": { - "url": "grpc://localhost:7051" - } - }, - "certificateAuthorities": { - "ca.example.com": { - "url": "http://localhost:7054", - "caName": "ca.example.com" - } - } -} \ No newline at end of file diff --git a/examples/discounted-cartrade/script-test-getFunctions/fabric/package.json b/examples/discounted-cartrade/script-test-getFunctions/fabric/package.json deleted file mode 100644 index bc50d4f3fc..0000000000 --- a/examples/discounted-cartrade/script-test-getFunctions/fabric/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "validatorDriver", - "version": "0.0.0", - "private": true, - "dependencies": { - "config": "^1.26.1", - "fabric-ca-client": "2.2.10", - "fabric-network": "2.2.10" - } -} \ No newline at end of file diff --git a/examples/discounted-cartrade/script-test-getFunctions/fabric/queryCar.js b/examples/discounted-cartrade/script-test-getFunctions/fabric/queryCar.js deleted file mode 100644 index 8e18206432..0000000000 --- a/examples/discounted-cartrade/script-test-getFunctions/fabric/queryCar.js +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright 2021 Hyperledger Cactus Contributors - * SPDX-License-Identifier: Apache-2.0 - * - * queryCar.js - */ - -"use strict"; - -const { FileSystemWallet, Gateway } = require("fabric-network"); -const fs = require("fs"); -const path = require("path"); - -const ccpPath = path.resolve(__dirname, "config", "connection.json"); -const ccpJSON = fs.readFileSync(ccpPath, "utf8"); -const ccp = JSON.parse(ccpJSON); - -// TODO: -const walletPath = path.resolve(__dirname, "wallet"); - -const userName = "user1"; -const channelName = "mychannel"; - -async function main() { - try { - // Create a new file system based wallet for managing identities. - const wallet = new FileSystemWallet(walletPath); - console.log(`Wallet path: ${walletPath}`); - - // Check to see if we've already enrolled the user. - const userExists = await wallet.exists(userName); - if (!userExists) { - console.log( - 'An identity for the user "' + - userName + - '" does not exist in the wallet' - ); - console.log("Run the registerUser.js application before retrying"); - return; - } - - // Create a new gateway for connecting to our peer node. - const gateway = new Gateway(); - await gateway.connect(ccp, { - wallet, - identity: userName, - discovery: { enabled: false }, - }); - - // Get the network (channel) our contract is deployed to. - const network = await gateway.getNetwork("mychannel"); - - // Get the contract from the network. - const contract = network.getContract("fabcar"); - - // Evaluate the specified transaction. - if (process.argv.length > 2) { - const key = process.argv[2]; - //console.log('##queryCar Params: ' + key); - console.log(`##queryCar Params: ${key}`); - const result = await contract.evaluateTransaction("queryCar", key); - console.log( - `Transaction has been evaluated, result is: ${result.toString()}` - ); - } else { - console.log("##queryAllCars: "); - const result = await contract.evaluateTransaction("queryAllCars"); - console.log( - `Transaction has been evaluated, result is: ${result.toString()}` - ); - } - } catch (error) { - console.error(`Failed to evaluate transaction: ${error}`); - process.exit(1); - } -} - -main(); diff --git a/packages/cactus-plugin-ledger-connector-fabric-socketio/package.json b/packages/cactus-plugin-ledger-connector-fabric-socketio/package.json index 4d1ca014a7..76c48f3311 100644 --- a/packages/cactus-plugin-ledger-connector-fabric-socketio/package.json +++ b/packages/cactus-plugin-ledger-connector-fabric-socketio/package.json @@ -6,12 +6,11 @@ "start": "cd ./dist && node common/core/bin/www.js", "debug": "nodemon --inspect ./dist/common/core/bin/www.js", "build": "npm run codegen && npm run build-ts && npm run build:dev:backend:postbuild", - "codegen": "npm run copy-utility-assets", + "codegen": "npm run copy-utility-assets && rm -fr ./dist/wallet", "build-ts": "tsc", "build:dev:backend:postbuild": "npm run copy-static-assets", "copy-utility-assets": "ts-node copyUtilityAssets.ts", - "copy-static-assets": "ts-node copyStaticAssets.ts", - "init-fabric": "ln -s ../node_modules ./dist/node_modules" + "copy-static-assets": "ts-node copyStaticAssets.ts" }, "dependencies": { "@types/node": "^14.14.5", @@ -20,9 +19,9 @@ "cookie-parser": "~1.4.3", "debug": "~4.1.1", "express": "~4.15.2", - "fabric-ca-client": "2.2.10", - "fabric-client": "^1.4.0", - "fabric-network": "2.2.10", + "fabric-ca-client": "~1.4.0", + "fabric-client": "~1.4.0", + "fabric-network": "~1.4.0", "jsonwebtoken": "^8.5.1", "log4js": "^3.0.6", "morgan": "~1.8.1", diff --git a/packages/cactus-plugin-ledger-connector-fabric-socketio/script-build-validator.sh b/packages/cactus-plugin-ledger-connector-fabric-socketio/script-build-validator.sh index 818f012033..953004b808 100755 --- a/packages/cactus-plugin-ledger-connector-fabric-socketio/script-build-validator.sh +++ b/packages/cactus-plugin-ledger-connector-fabric-socketio/script-build-validator.sh @@ -3,6 +3,3 @@ ## Build a validator for Fabric echo "[process] Build a validator for Fabric" -npm install -npm run build -npm run init-fabric # For making symbolic for node_modules, enough to be done only once. \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-fabric-socketio/script-start-validator.sh b/packages/cactus-plugin-ledger-connector-fabric-socketio/script-start-validator.sh index 9b78b5f2b0..65d399c965 100755 --- a/packages/cactus-plugin-ledger-connector-fabric-socketio/script-start-validator.sh +++ b/packages/cactus-plugin-ledger-connector-fabric-socketio/script-start-validator.sh @@ -3,4 +3,5 @@ ## Start a validator for Fabric echo "[process] Start a validator for Fabric" -npm run start \ No newline at end of file +rm -fr ./dist/wallet +npm run start diff --git a/packages/cactus-plugin-ledger-connector-fabric-socketio/src/main/typescript/connector/PluginConfig.ts b/packages/cactus-plugin-ledger-connector-fabric-socketio/src/main/typescript/connector/PluginConfig.ts index 7dca99eaa0..cc7174a014 100644 --- a/packages/cactus-plugin-ledger-connector-fabric-socketio/src/main/typescript/connector/PluginConfig.ts +++ b/packages/cactus-plugin-ledger-connector-fabric-socketio/src/main/typescript/connector/PluginConfig.ts @@ -14,30 +14,34 @@ export const SplugConfig = { fabric: { mspid: "Org1MSP", - keystore: "./wallet/admin", + keystore: "./wallet", connUserName: "user1", contractName: "fabcar", peers: [ { name: "peer0.org1.example.com", - requests: "grpc://localhost:7051", + requests: "grpcs://localhost:7051", + // WARNING - REMEMBER TO UPADATE THE PATH + tlsca: + "../../../examples/discounted-cartrade/crypto-config/tlsca.org1.example.com-cert.pem", }, ], - orderer: { name: "orderer.example.com", - url: "grpc://localhost:7050", + url: "grpcs://localhost:7050", + // WARNING - REMEMBER TO UPADATE THE PATH + tlsca: + "../../../examples/discounted-cartrade/crypto-config/tlsca.example.com-cert.pem", }, ca: { - name: "ca.example.com", - url: "http://localhost:7054", + name: "ca-org1", + url: "https://localhost:7054", }, submitter: { name: "admin", secret: "adminpw", }, channelName: "mychannel", - //"chaincodeId":"easy_sample_ec1" chaincodeId: "fabcar", }, -}; +}; \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-fabric-socketio/src/main/typescript/connector/ServerMonitorPlugin.ts b/packages/cactus-plugin-ledger-connector-fabric-socketio/src/main/typescript/connector/ServerMonitorPlugin.ts index 49c857ff67..5aabe081cc 100644 --- a/packages/cactus-plugin-ledger-connector-fabric-socketio/src/main/typescript/connector/ServerMonitorPlugin.ts +++ b/packages/cactus-plugin-ledger-connector-fabric-socketio/src/main/typescript/connector/ServerMonitorPlugin.ts @@ -15,8 +15,9 @@ // Basic package dependency declaration const process = require("process"); +import FabricClient from "fabric-client"; // IF declaration for fabric -const sdk = require("./fabricaccess.js"); +import { getClientAndChannel, getSubmitterAndEnroll } from "./fabricaccess.js"; // config file import { SplugConfig } from "./PluginConfig"; import { config } from "../common/core/config/default"; @@ -33,14 +34,12 @@ import { ValidatorAuthentication } from "./ValidatorAuthentication"; */ export class ServerMonitorPlugin { _filterTable: object; - _network; - _eh; + _eh: FabricClient.ChannelEventHub; constructor() { // Define settings specific to the dependent part // Initializing filter during monitoring this._filterTable = {}; - this._network = SplugConfig; //channelID, mspid, peer settings, etc. this._eh = null; } @@ -49,93 +48,96 @@ export class ServerMonitorPlugin { * Start monitoring * @param {string} clientId : Client ID of the monitoring start request source * @param {function} cb : Callback function that receives the monitoring result at any time + * @note Always listens on the first peer from config. */ startMonitor(clientId, cb) { logger.info("*** START MONITOR ***"); logger.info("Client ID :" + clientId); const filter = this._filterTable[clientId]; - const network = this._network; - let channel = null; + let channel: FabricClient.Channel = null; if (!filter) { - sdk - .GetClientAndChannel() + getClientAndChannel() .then((retobj) => { channel = retobj.channel; //Set the returned channel this._filterTable[clientId] = retobj.client; - return sdk.GetSubmitter(retobj.client); + return getSubmitterAndEnroll(retobj.client); }) - .then((submitter) => { - const peer = this._filterTable[clientId].newPeer( - network.fabric.peers[0].requests + .then(() => { + this._eh = channel.newChannelEventHub( + channel.getPeers()[0].getPeer(), ); - this._eh = channel.newChannelEventHub(peer); logger.info("Connecting the event hub"); - this._eh.registerBlockEvent((block) => { - const txlist = []; - logger.info("*** Block Event ***"); - console.log("##[HL-BC] Notify new block data(D2)"); - logger.info("chain id :" + network.fabric.channelName); - logger.info("blocknumber : " + block.header.number); - const len = block.data.data.length; - logger.info("data.data.length :" + len); - console.log("##[HL-BC] Validate transactions(D3)"); - console.log("##[HL-BC] digital sign on valid transaction(D4)"); - for (let i = 0; i < len; i++) { - const payload = block.data.data[i].payload; - const channel_header = payload.header.channel_header; - if (channel_header.type == 3) { - //'ENDORSER_TRANSACTION' - const txid = channel_header.tx_id; - logger.info("transaction id :" + txid); - const transaction = payload.data; - const actionPayload = transaction.actions[0].payload; - const proposalPayload = - actionPayload.chaincode_proposal_payload; - const invocationSpec = proposalPayload.input; - // Can obtain chaincode name and argument list (function name at the beginning) from invocationSpec - const ccid = invocationSpec.chaincode_spec.chaincode_id.name; - logger.info("chaincode id :" + ccid); - // Only notify transactions from the chaincode used in ServerPlugin - if (ccid == network.fabric.chaincodeId) { - const args = invocationSpec.chaincode_spec.input.args; - logger.info("args.length :" + args.length); - for (let j = 0; j < args.length; j++) { - // code must be specified for toString - args[j] = args[j].toString("utf8"); - logger.info("args[" + j + "] :" + args[j]); - } - const func = args[0]; - args.shift(); + this._eh.registerBlockEvent( + (block: FabricClient.Block) => { + const txlist = []; + logger.info("*** Block Event ***"); + console.log("##[HL-BC] Notify new block data(D2)"); + logger.info("chain id :" + SplugConfig.fabric.channelName); + logger.info("blocknumber : " + block.header.number); + const len = block.data.data.length; + logger.info("data.data.length :" + len); + console.log("##[HL-BC] Validate transactions(D3)"); + console.log("##[HL-BC] digital sign on valid transaction(D4)"); + for (let i = 0; i < len; i++) { + const payload = block.data.data[i].payload; + const channel_header = payload.header.channel_header; + if (channel_header.type == 3) { + //'ENDORSER_TRANSACTION' + const txid = channel_header.tx_id; + logger.info("transaction id :" + txid); + const transaction = payload.data; + const actionPayload = transaction.actions[0].payload; + const proposalPayload = + actionPayload.chaincode_proposal_payload; + const invocationSpec = proposalPayload.input; + // Can obtain chaincode name and argument list (function name at the beginning) from invocationSpec + const ccid = invocationSpec.chaincode_spec.chaincode_id.name; + logger.info("chaincode id :" + ccid); + // Only notify transactions from the chaincode used in ServerPlugin + if (ccid == SplugConfig.fabric.chaincodeId) { + const args = invocationSpec.chaincode_spec.input.args; + logger.info("args.length :" + args.length); + for (let j = 0; j < args.length; j++) { + // code must be specified for toString + args[j] = args[j].toString("utf8"); + logger.info("args[" + j + "] :" + args[j]); + } + const func = args[0]; + args.shift(); - // Interpretation of response - const resp = - actionPayload.action.proposal_response_payload.extension - .response.payload; - logger.info("resp :" + resp); + // Interpretation of response + const resp = + actionPayload.action.proposal_response_payload.extension + .response.payload; + logger.info("resp :" + resp); - //The transaction data should include the following. - txlist.push({ - chaincodeId: ccid, - txId: txid, - func: func, - args: args, - }); + //The transaction data should include the following. + txlist.push({ + chaincodeId: ccid, + txId: txid, + func: func, + args: args, + }); + } } } - } - logger.info("*** SEND BLOCK DATA ***"); - logger.debug(`txlist = ${JSON.stringify(txlist)}`); - const signedTxlist = ValidatorAuthentication.sign({ - blockData: txlist, - }); - logger.debug(`signedTxlist = ${signedTxlist}`); - const retObj = { - status: 200, - blockData: signedTxlist, - }; - cb(retObj); - }); + logger.info("*** SEND BLOCK DATA ***"); + logger.debug(`txlist = ${JSON.stringify(txlist)}`); + const signedTxlist = ValidatorAuthentication.sign({ + blockData: txlist, + }); + logger.debug(`signedTxlist = ${signedTxlist}`); + const retObj = { + status: 200, + blockData: signedTxlist, + }; + cb(retObj); + }, + (err) => { + logger.warn(`Monitor error for client ${clientId} - `, err); + }, + ); this._eh.connect(true); //fullBlock=true }) .catch((err) => { diff --git a/packages/cactus-plugin-ledger-connector-fabric-socketio/src/main/typescript/connector/ServerPlugin.ts b/packages/cactus-plugin-ledger-connector-fabric-socketio/src/main/typescript/connector/ServerPlugin.ts index 2cdabb9f53..503ad9d548 100644 --- a/packages/cactus-plugin-ledger-connector-fabric-socketio/src/main/typescript/connector/ServerPlugin.ts +++ b/packages/cactus-plugin-ledger-connector-fabric-socketio/src/main/typescript/connector/ServerPlugin.ts @@ -22,10 +22,10 @@ logger.level = config.logLevel; const SplugUtil = require("./PluginUtil.js"); import { ValidatorAuthentication } from "./ValidatorAuthentication"; // Read the library, SDK, etc. according to EC specifications as needed -const fabric = require("./fabricaccess.js"); -const FabricClient = require("fabric-client"); -const copService = require("fabric-ca-client"); +import { getClientAndChannel, getSubmitterAndEnroll } from "./fabricaccess.js"; +import { ProposalRequest } from "fabric-client"; + const path = require("path"); const { FileSystemWallet, Gateway } = require("fabric-network"); const fs = require("fs"); @@ -126,7 +126,7 @@ export class ServerPlugin { logger.debug(`##evaluateTransaction(B3), returnvalue: undefined`); } else if (returnvalue == "") { logger.debug( - `##evaluateTransaction(B4), returnvalue: empty string` + `##evaluateTransaction(B4), returnvalue: empty string`, ); } if (returnvalue != null) { @@ -242,8 +242,8 @@ export class ServerPlugin { * "args":[ * { * "transactionProposalReq":, - * "certPem":, - * "privateKeyPem": + * "certPem"?:, + * "privateKeyPem"?: * } * ] * }, @@ -271,7 +271,7 @@ export class ServerPlugin { channelName, transactionProposalReq, certPem, - privateKeyPem + privateKeyPem, ) .then((signedTx) => { if (signedTx != null) { @@ -356,7 +356,7 @@ async function Invoke(reqBody) { // Submit the specified transaction. logger.info( - `##fablicaccess: Invoke Params: fcn=${fcn}, args0=${args[0]}, args1=${args[1]}` + `##fablicaccess: Invoke Params: fcn=${fcn}, args0=${args[0]}, args1=${args[1]}`, ); const transaction = contract.createTransaction(fcn); @@ -429,7 +429,7 @@ async function InvokeSync(reqBody) { // Submit the specified transaction. // logger.debug(`##InvokeSync(G)`); logger.info( - `##fablicaccess: InvokeSync Params: type=${type}, fcn=${fcn}, args0=${args[0]}, args1=${args[1]}, args2=${args[2]}` + `##fablicaccess: InvokeSync Params: type=${type}, fcn=${fcn}, args0=${args[0]}, args1=${args[1]}, args2=${args[2]}`, ); // const transaction = contract.createTransaction(fcn); let result: any = null; @@ -472,7 +472,7 @@ async function InvokeSync(reqBody) { fcn, args[0], args[1], - args[2] + args[2], ); } else { logger.debug(`##InvokeSync(G1): call submitTransaction`); @@ -480,7 +480,7 @@ async function InvokeSync(reqBody) { fcn, args[0], args[1], - args[2] + args[2], ); } break; @@ -524,7 +524,7 @@ function preventMalleability(sig, curveParams) { if (!halfOrder) { throw new Error( 'Can not find the half order needed to calculate "s" value for immalleable signatures. Unsupported curve name: ' + - curveParams.name + curveParams.name, ); } @@ -572,60 +572,6 @@ function signProposal(proposalBytes, paramPrivateKeyPem) { } // END Signature process========================================================================================= -/** - * setup TLS for this client - * @param {*} client - * @param {*} enrollmentID - * @param {*} secret - */ -async function TLSSetup(client, enrollmentID, secret) { - const tlsOptions = { - trustedRoots: [], - verify: false, - }; - logger.info("tlssetup start"); - const caService = new copService( - SplugConfig.fabric.ca.url, - tlsOptions, - SplugConfig.fabric.ca.name - ); - const req = { - enrollmentID: enrollmentID, - enrollmentSecret: secret, - profile: "tls", - }; - const enrollment = await caService.enroll(req); - client.setTlsClientCertAndKey( - enrollment.certificate, - enrollment.key.toBytes() - ); -} - -/** - * Creating a channel object - * @param {string} channelName - */ -async function setupChannel(channelName) { - logger.info("setupChannel start"); - const client = new FabricClient(); - await TLSSetup( - client, - SplugConfig.fabric.submitter.name, - SplugConfig.fabric.submitter.secret - ); - const channel = client.newChannel(channelName); - - for (let i = 0; i < SplugConfig.fabric.peers.length; i++) { - const peer = client.newPeer(SplugConfig.fabric.peers[i].requests); - channel.addPeer(peer); - } - - const orderer = client.newOrderer(SplugConfig.fabric.orderer.url); - channel.addOrderer(orderer); - logger.info("setupChannel end"); - return channel; -} - /** * Function for InvokeSendSignedTransaction * @param reqBody [json object] {signedCommitProposal:, commitReq:, channelName:} @@ -637,18 +583,16 @@ async function InvokeSendSignedTransaction(reqBody) { logger.info("InvokeSendSignedTransaction start"); let invokeResponse1; // Return value from chain code - let channel1; // Channel try { //channel object generation - if (channel1 == undefined) { - channel1 = await setupChannel(reqBody.channelName); - } + let { client, channel } = await getClientAndChannel(reqBody.channelName); + await getSubmitterAndEnroll(client); // logger.debug(`##InvokeSendSignedTransaction: reqBody.signedCommitProposal: ${JSON.stringify(reqBody.signedCommitProposal)}`); // logger.debug(`##InvokeSendSignedTransaction: reqBody.commitReq: ${JSON.stringify(reqBody.commitReq)}`); // logger.debug(`##InvokeSendSignedTransaction: (A)`); - const response = await channel1.sendSignedTransaction({ + const response = await channel.sendSignedTransaction({ signedProposal: reqBody.signedCommitProposal, request: reqBody.commitReq, }); @@ -662,7 +606,7 @@ async function InvokeSendSignedTransaction(reqBody) { } else { logger.debug(`##InvokeSendSignedTransaction: (D)`); throw new Error( - "Failed to order the transaction. Error code: " + response.status + "Failed to order the transaction. Error code: " + response.status, ); } } catch (e) { @@ -675,45 +619,59 @@ async function InvokeSendSignedTransaction(reqBody) { /** * Function for InvokeSendSignedProposal * @param transactionProposalReq [json object] {signedCommitProposal:, commitReq:, channelName:} - * @param certPem [json object] {signedCommitProposal:, commitReq:, channelName:} - * @param privateKeyPem [json object] {signedCommitProposal:, commitReq:, channelName:} + * @param certPem? [json object] {signedCommitProposal:, commitReq:, channelName:} + * @param privateKeyPem? [json object] {signedCommitProposal:, commitReq:, channelName:} * @return [string] signed transaction. */ async function InvokeSendSignedProposal( channelName: string, - transactionProposalReq: object, - certPem: string, - privateKeyPem: string + transactionProposalReq: ProposalRequest, + certPem?: string, + privateKeyPem?: string, ) { logger.debug(`InvokeSendSignedProposal start`); let invokeResponse2; // Return value from chain code - let channel2; // Channel - - //channel object generation - if (channel2 == undefined) { - channel2 = await setupChannel(channelName); + let { client, channel } = await getClientAndChannel(channelName); + let user = await getSubmitterAndEnroll(client); + + // Low-level access to local-store cert and private key of submitter (in case request is missing those) + if (!certPem || !privateKeyPem) { + const wallet = new FileSystemWallet(SplugConfig.fabric.keystore); + logger.debug(`Wallet path: ${path.resolve(SplugConfig.fabric.keystore)}`); + + const submitterName = user.getName(); + const submitterExists = await wallet.exists(submitterName); + if (submitterExists) { + const submitterIdentity = await wallet.export(submitterName); + certPem = (submitterIdentity as any).certificate; + privateKeyPem = (submitterIdentity as any).privateKey; + } else { + throw new Error( + `No cert/key provided and submitter ${submitterName} is missing in validator wallet!`, + ); + } } - const { proposal, txId } = channel2.generateUnsignedProposal( + const { proposal, txId } = channel.generateUnsignedProposal( transactionProposalReq, SplugConfig.fabric.mspid, - certPem + certPem, ); - logger.debug("proposal end"); logger.debug(`##InvokeSendSignedProposal; txId: ${txId.getTransactionID()}`); const signedProposal = signProposal(proposal.toBuffer(), privateKeyPem); const targets = []; for (const peerInfo of SplugConfig.fabric.peers) { - const peer = channel2.getPeer(peerInfo.requests.split("//")[1]); + const peer = channel.getPeer(peerInfo.requests.split("//")[1]); targets.push(peer); } - const sendSignedProposalReq = { signedProposal, targets }; - const proposalResponses = await channel2.sendSignedProposal( - sendSignedProposalReq + const sendSignedProposalReq = { signedProposal, targets } as unknown; + const proposalResponses = await channel.sendSignedProposal( + sendSignedProposalReq, ); logger.debug("##InvokeSendSignedProposal: successfully send signedProposal"); + let allGood = true; for (const proposalResponse of proposalResponses) { let oneGood = false; @@ -734,10 +692,12 @@ async function InvokeSendSignedProposal( } allGood = allGood && oneGood; } + // If the return value of invoke is an empty string, store txID if (invokeResponse2 === "") { invokeResponse2 = txId.getTransactionID(); } + // Error if all peers do not return status 200 if (!allGood) { const errMsg = @@ -754,15 +714,16 @@ async function InvokeSendSignedProposal( proposalResponses, proposal, }; - const commitProposal = channel2.generateUnsignedTransaction(commitReq); + + const commitProposal = channel.generateUnsignedTransaction(commitReq); logger.debug( - `##InvokeSendSignedProposal: Successfully build commit transaction proposal` + `##InvokeSendSignedProposal: Successfully build commit transaction proposal`, ); // sign this commit proposal at local const signedCommitProposal = signProposal( commitProposal.toBuffer(), - privateKeyPem + privateKeyPem, ); const signedTx = { @@ -774,6 +735,6 @@ async function InvokeSendSignedProposal( // logger.debug(`##InvokeSendSignedProposal: signature: ${signedCommitProposal.signature}`); // logger.debug(`##InvokeSendSignedProposal: proposal_bytes: ${signedCommitProposal.proposal_bytes}`); // logger.debug(`##InvokeSendSignedProposal: signedTx: ${JSON.stringify(signedTx)}`); - logger.debug(`##InvokeSendSignedProposal: signedTx: ${signedTx}`); + logger.debug("##InvokeSendSignedProposal: signedTx:", signedTx); return signedTx; } diff --git a/packages/cactus-plugin-ledger-connector-fabric-socketio/src/main/typescript/connector/fabricaccess.ts b/packages/cactus-plugin-ledger-connector-fabric-socketio/src/main/typescript/connector/fabricaccess.ts index 92a0efc7df..85a9e71623 100644 --- a/packages/cactus-plugin-ledger-connector-fabric-socketio/src/main/typescript/connector/fabricaccess.ts +++ b/packages/cactus-plugin-ledger-connector-fabric-socketio/src/main/typescript/connector/fabricaccess.ts @@ -14,11 +14,11 @@ import { SplugConfig } from "./PluginConfig"; import { config } from "../common/core/config/default"; const path = require("path"); +import fs from "fs"; //fabric client dependent library -const FabricClient = require("fabric-client"); -const User = require("fabric-client/lib/User.js"); -const copService = require("fabric-ca-client"); +import FabricClient, { User } from "fabric-client"; +import copService, { TLSOptions } from "fabric-ca-client"; // list of fabric-client objects const clients = {}; @@ -29,70 +29,71 @@ const logger = getLogger("fabricaccess[" + process.pid + "]"); logger.level = config.logLevel; // Get user object to send Proposal to EP -function getSubmitter(cli) { +export function getSubmitterAndEnroll(cli: FabricClient): Promise { logger.info("##fabricaccess_getSubmitter"); const caUrl = SplugConfig.fabric.ca.url; const caName = SplugConfig.fabric.ca.name; const submitter = SplugConfig.fabric.submitter; - return cli.getUserContext(submitter.name, true).then((user) => { - return new Promise((resolve, reject) => { - if (user && user.isEnrolled()) { - return resolve(user); - } - const member = new User(submitter.name); - let cryptoSuite = cli.getCryptoSuite(); - if (!cryptoSuite) { - const storePath = path.join(__dirname, SplugConfig.fabric.keystore); - cryptoSuite = FabricClient.newCryptoSuite(); - cryptoSuite.setCryptoKeyStore( - FabricClient.newCryptoKeyStore({ - path: storePath, - }) - ); - cli.setCryptoSuite(cryptoSuite); - } - member.setCryptoSuite(cryptoSuite); - - const tlsOptions = { - trustedRoots: [], - verify: false, - }; - const cop = new copService(caUrl, tlsOptions, caName, cryptoSuite); - return cop - .enroll({ - enrollmentID: submitter.name, - enrollmentSecret: submitter.secret, - }) - .then((enrollment) => { - return member.setEnrollment( - enrollment.key, - enrollment.certificate, - SplugConfig.fabric.mspid + // Returns Promise when checkPersistence is true (poor typing) + return (cli.getUserContext(submitter.name, true) as Promise).then( + (user) => { + return new Promise((resolve, reject) => { + if (user && user.isEnrolled()) { + return resolve(user); + } + const member = new User(submitter.name); + let cryptoSuite = cli.getCryptoSuite(); + if (!cryptoSuite) { + const storePath = path.join( + SplugConfig.fabric.keystore, + submitter.name, ); - }) - .then(() => { - return cli.setUserContext(member, false); - }) - .then(() => { - return resolve(member); - }) - .catch((err) => { - return reject(err); - }); - }); - }); -} + cryptoSuite = FabricClient.newCryptoSuite(); + cryptoSuite.setCryptoKeyStore( + FabricClient.newCryptoKeyStore({ + path: storePath, + }), + ); + cli.setCryptoSuite(cryptoSuite); + } + member.setCryptoSuite(cryptoSuite); -// Export also for use with ServerMonitorPlugin -exports.GetSubmitter = function (cli) { - return getSubmitter(cli); -}; + const tlsOptions: TLSOptions = { + trustedRoots: Buffer.from([]), + verify: false, + }; + const cop = new copService(caUrl, tlsOptions, caName, cryptoSuite); + return cop + .enroll({ + enrollmentID: submitter.name, + enrollmentSecret: submitter.secret, + }) + .then((enrollment) => { + return member.setEnrollment( + enrollment.key, + enrollment.certificate, + SplugConfig.fabric.mspid, + ); + }) + .then(() => { + return cli.setUserContext(member, false); + }) + .then(() => { + return resolve(member); + }) + .catch((err) => { + return reject(err); + }); + }); + }, + ); +} // fabric-client and Channel object generation -function getClientAndChannel() { +export async function getClientAndChannel( + channelName = SplugConfig.fabric.channelName, +) { logger.info("##fabricaccess_getClientAndChannel"); - const retObj = { client: null, channel: null }; - const channelName = SplugConfig.fabric.channelName; // Since only one KVS can be set in the client, management in CA units as well as KVS path let isNewClient = false; let client = clients[SplugConfig.fabric.ca.name]; @@ -113,49 +114,51 @@ function getClientAndChannel() { if (channel == null) { logger.info("create new channel, name=" + channelName); channel = client.newChannel(channelName); - const orderer = client.newOrderer(SplugConfig.fabric.orderer.url); + const ordererCA = fs.readFileSync( + SplugConfig.fabric.orderer.tlsca, + "utf8", + ); + const orderer = client.newOrderer(SplugConfig.fabric.orderer.url, { + pem: ordererCA, + "ssl-target-name-override": SplugConfig.fabric.orderer.name, + }); channel.addOrderer(orderer); + logger.error(process.cwd()); // TODO - REMOVE // EP settings for (let i = 0; i < SplugConfig.fabric.peers.length; i++) { - const peer = client.newPeer(SplugConfig.fabric.peers[i].requests); - channel.addPeer(peer); + const peerCA = fs.readFileSync( + SplugConfig.fabric.peers[i].tlsca, + "utf8", + ); + const peer = client.newPeer(SplugConfig.fabric.peers[i].requests, { + pem: peerCA, + "ssl-target-name-override": SplugConfig.fabric.peers[i].name, + }); + channel.addPeer(peer, SplugConfig.fabric.mspid); } - } else { - // Exception when reflecting connection destination information difference - logger.error(e); - } - } - retObj.channel = channel; - return new Promise((resolve, reject) => { - if (isNewClient) { - //var storePath = "/tmp/" + SplugConfig.fabric.keystore; - const storePath = SplugConfig.fabric.keystore; + const storePath = path.join( + SplugConfig.fabric.keystore, + SplugConfig.fabric.submitter.name, + ); const cryptoSuite = FabricClient.newCryptoSuite(); cryptoSuite.setCryptoKeyStore( FabricClient.newCryptoKeyStore({ path: storePath, - }) + }), ); client.setCryptoSuite(cryptoSuite); // Generate enrollment information storage location - return FabricClient.newDefaultKeyValueStore({ + let store = await FabricClient.newDefaultKeyValueStore({ path: storePath, - }).then((store) => { - // Set KeyValue Store - client.setStateStore(store); - retObj.client = client; - resolve(retObj); }); + client.setStateStore(store); } else { - retObj.client = client; - resolve(retObj); + // Exception when reflecting connection destination information difference + logger.error(e); } - }); -} + } -// Export also for use with ServerMonitorPlugin -exports.GetClientAndChannel = function () { - return getClientAndChannel(); -}; + return { client, channel }; +} \ No newline at end of file diff --git a/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/script-build-validator.sh b/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/script-build-validator.sh index bae74ebfef..5673a64af3 100755 --- a/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/script-build-validator.sh +++ b/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/script-build-validator.sh @@ -2,6 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 ## Build a validator for Ethereum echo "[process] Build a validator for Ethereum" -npm install -npm run build -npm run init-ethereum # For making symbolic for node_modules, enough to be done only once. \ No newline at end of file +docker-compose -f docker-compose.yaml build diff --git a/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/script-start-validator.sh b/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/script-start-validator.sh index 3f40a59846..d1f787851c 100755 --- a/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/script-start-validator.sh +++ b/packages/cactus-plugin-ledger-connector-go-ethereum-socketio/script-start-validator.sh @@ -2,4 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 ## Start a validator for Ethereum echo "[process] Start a validator for Ethereum" -npm run start \ No newline at end of file +docker-compose -f docker-compose.yaml up diff --git a/packages/cactus-plugin-ledger-connector-sawtooth-socketio/script-build-validator.sh b/packages/cactus-plugin-ledger-connector-sawtooth-socketio/script-build-validator.sh index 23c3fcc637..cb00e8acda 100755 --- a/packages/cactus-plugin-ledger-connector-sawtooth-socketio/script-build-validator.sh +++ b/packages/cactus-plugin-ledger-connector-sawtooth-socketio/script-build-validator.sh @@ -2,6 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 ## Build a validator for Sawtooth echo "[process] Build a validator for Sawtooth" -npm install -npm run build -npm run init-sawtooth # For making symbolic for node_modules, enough to be done only once. \ No newline at end of file +docker-compose -f docker-compose.yaml build diff --git a/packages/cactus-plugin-ledger-connector-sawtooth-socketio/script-start-validator.sh b/packages/cactus-plugin-ledger-connector-sawtooth-socketio/script-start-validator.sh index 72de58da00..d41d546085 100755 --- a/packages/cactus-plugin-ledger-connector-sawtooth-socketio/script-start-validator.sh +++ b/packages/cactus-plugin-ledger-connector-sawtooth-socketio/script-start-validator.sh @@ -2,4 +2,4 @@ # SPDX-License-Identifier: Apache-2.0 ## Start a validator for Sawtooth echo "[process] Start a validator for Sawtooth" -npm run start \ No newline at end of file +docker-compose -f docker-compose.yaml up diff --git a/tools/docker/fabric-all-in-one/fabcar-cli-1.4/.gitignore b/tools/docker/fabric-all-in-one/fabcar-cli-1.4/.gitignore new file mode 100644 index 0000000000..8bacfcf5e5 --- /dev/null +++ b/tools/docker/fabric-all-in-one/fabcar-cli-1.4/.gitignore @@ -0,0 +1,13 @@ +# +# SPDX-License-Identifier: Apache-2.0 +# + +# Connection data +connection.json + +# npm +package-lock.json + +# Wallet +wallet +!wallet/.gitkeep diff --git a/tools/docker/fabric-all-in-one/fabcar-cli-1.4/README.md b/tools/docker/fabric-all-in-one/fabcar-cli-1.4/README.md new file mode 100644 index 0000000000..4cff1eec9b --- /dev/null +++ b/tools/docker/fabric-all-in-one/fabcar-cli-1.4/README.md @@ -0,0 +1,16 @@ +# fabric-cli-.14 + +Helper CLI tools for interacting with FabCar fabric deployed in `fabric-all-in-one` image. +Sources come from official fabric-samples 1.4.8 - https://github.com/hyperledger/fabric-samples/releases/tag/v1.4.8. Any modifications were marked with `// EDIT`' comment (for instance, changed location of connection info json to `./connection.json`). + +## Usage + +### Setup + - Run `npm install` + - Run `./setup.sh` before using any other script from this directory. + - Setup will copy `connection-org1.json` to `./connection.json`, and will deploy `admin` and `user1`. Wallet can later be used by other applications (sample apps, for instance) + +### Scripts + - `enrollAdmin.js` - Will enrol `admin` and store it in the wallet. + - `registerUser.js` - Will register `user1` and store it in the wallet. + - `query.js` - Will run `queryAllCars` on the fabric, all cars will be printed in verbose (formatted) way. diff --git a/tools/docker/fabric-all-in-one/fabcar-cli-1.4/enrollAdmin.js b/tools/docker/fabric-all-in-one/fabcar-cli-1.4/enrollAdmin.js new file mode 100644 index 0000000000..294ed1b781 --- /dev/null +++ b/tools/docker/fabric-all-in-one/fabcar-cli-1.4/enrollAdmin.js @@ -0,0 +1,63 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * Source: https://github.com/hyperledger/fabric-samples/releases/tag/v1.4.8 + */ + +"use strict"; + +const FabricCAServices = require("fabric-ca-client"); +const { FileSystemWallet, X509WalletMixin } = require("fabric-network"); +const fs = require("fs"); +const path = require("path"); + +// EDIT - Changed config path +const ccpPath = "./connection.json"; +const ccpJSON = fs.readFileSync(ccpPath, "utf8"); +const ccp = JSON.parse(ccpJSON); + +async function main() { + try { + // Create a new CA client for interacting with the CA. + const caInfo = ccp.certificateAuthorities["ca.org1.example.com"]; + const caTLSCACerts = caInfo.tlsCACerts.pem; + const ca = new FabricCAServices( + caInfo.url, + { trustedRoots: caTLSCACerts, verify: false }, + caInfo.caName, + ); + + // Create a new file system based wallet for managing identities. + const walletPath = path.join(process.cwd(), "wallet"); + const wallet = new FileSystemWallet(walletPath); + console.log(`Wallet path: ${walletPath}`); + + // Check to see if we've already enrolled the admin user. + const adminExists = await wallet.exists("admin"); + if (adminExists) { + console.log( + 'An identity for the admin user "admin" already exists in the wallet', + ); + return; + } + + // Enroll the admin user, and import the new identity into the wallet. + const enrollment = await ca.enroll({ + enrollmentID: "admin", + enrollmentSecret: "adminpw", + }); + const identity = X509WalletMixin.createIdentity( + "Org1MSP", + enrollment.certificate, + enrollment.key.toBytes(), + ); + await wallet.import("admin", identity); + console.log( + 'Successfully enrolled admin user "admin" and imported it into the wallet', + ); + } catch (error) { + console.error(`Failed to enroll admin user "admin": ${error}`); + process.exit(1); + } +} + +main(); diff --git a/tools/docker/fabric-all-in-one/fabcar-cli-1.4/package.json b/tools/docker/fabric-all-in-one/fabcar-cli-1.4/package.json new file mode 100644 index 0000000000..cf66976a1e --- /dev/null +++ b/tools/docker/fabric-all-in-one/fabcar-cli-1.4/package.json @@ -0,0 +1,16 @@ +{ + "name": "fabcar", + "version": "1.0.0", + "description": "FabCar application implemented in JavaScript (Modified for Cactus Hyperledger)", + "engines": { + "node": ">=8", + "npm": ">=5" + }, + "engineStrict": true, + "author": "Hyperledger", + "license": "Apache-2.0", + "dependencies": { + "fabric-ca-client": "~1.4.0", + "fabric-network": "~1.4.0" + } +} diff --git a/tools/docker/fabric-all-in-one/fabcar-cli-1.4/query.js b/tools/docker/fabric-all-in-one/fabcar-cli-1.4/query.js new file mode 100644 index 0000000000..b184697f64 --- /dev/null +++ b/tools/docker/fabric-all-in-one/fabcar-cli-1.4/query.js @@ -0,0 +1,60 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * Source: https://github.com/hyperledger/fabric-samples/releases/tag/v1.4.8 + */ + +"use strict"; + +const { FileSystemWallet, Gateway } = require("fabric-network"); +const path = require("path"); + +// EDIT - Changed config path +const ccpPath = "./connection.json"; + +async function main() { + try { + // Create a new file system based wallet for managing identities. + const walletPath = path.join(process.cwd(), "wallet"); + const wallet = new FileSystemWallet(walletPath); + console.log(`Wallet path: ${walletPath}`); + + // Check to see if we've already enrolled the user. + const userExists = await wallet.exists("user1"); + if (!userExists) { + console.log( + 'An identity for the user "user1" does not exist in the wallet', + ); + console.log("Run the registerUser.js application before retrying"); + return; + } + + // Create a new gateway for connecting to our peer node. + const gateway = new Gateway(); + await gateway.connect(ccpPath, { + wallet, + identity: "user1", + discovery: { enabled: true, asLocalhost: true }, + }); + + // Get the network (channel) our contract is deployed to. + const network = await gateway.getNetwork("mychannel"); + + // Get the contract from the network. + const contract = network.getContract("fabcar"); + + // Evaluate the specified transaction. + // queryCar transaction - requires 1 argument, ex: ('queryCar', 'CAR4') + // queryAllCars transaction - requires no arguments, ex: ('queryAllCars') + const result = await contract.evaluateTransaction("queryAllCars"); + // EDIT - More verbose result print + console.log( + "Transaction has been evaluated, result is:", + JSON.parse(result.toString()), + ); + } catch (error) { + console.error(`Failed to evaluate transaction: ${error}`); + process.exit(1); + } +} + +main(); diff --git a/tools/docker/fabric-all-in-one/fabcar-cli-1.4/registerUser.js b/tools/docker/fabric-all-in-one/fabcar-cli-1.4/registerUser.js new file mode 100644 index 0000000000..38ddba6dc3 --- /dev/null +++ b/tools/docker/fabric-all-in-one/fabcar-cli-1.4/registerUser.js @@ -0,0 +1,84 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * Source: https://github.com/hyperledger/fabric-samples/releases/tag/v1.4.8 + */ + +"use strict"; + +const { + FileSystemWallet, + Gateway, + X509WalletMixin, +} = require("fabric-network"); +const path = require("path"); + +// EDIT - Changed config path +const ccpPath = "./connection.json"; + +async function main() { + try { + // Create a new file system based wallet for managing identities. + const walletPath = path.join(process.cwd(), "wallet"); + const wallet = new FileSystemWallet(walletPath); + console.log(`Wallet path: ${walletPath}`); + + // Check to see if we've already enrolled the user. + const userExists = await wallet.exists("user1"); + if (userExists) { + console.log( + 'An identity for the user "user1" already exists in the wallet', + ); + return; + } + + // Check to see if we've already enrolled the admin user. + const adminExists = await wallet.exists("admin"); + if (!adminExists) { + console.log( + 'An identity for the admin user "admin" does not exist in the wallet', + ); + console.log("Run the enrollAdmin.js application before retrying"); + return; + } + + // Create a new gateway for connecting to our peer node. + const gateway = new Gateway(); + await gateway.connect(ccpPath, { + wallet, + identity: "admin", + discovery: { enabled: true, asLocalhost: true }, + }); + + // Get the CA client object from the gateway for interacting with the CA. + const ca = gateway.getClient().getCertificateAuthority(); + const adminIdentity = gateway.getCurrentIdentity(); + + // Register the user, enroll the user, and import the new identity into the wallet. + const secret = await ca.register( + { + affiliation: "org1.department1", + enrollmentID: "user1", + role: "client", + }, + adminIdentity, + ); + const enrollment = await ca.enroll({ + enrollmentID: "user1", + enrollmentSecret: secret, + }); + const userIdentity = X509WalletMixin.createIdentity( + "Org1MSP", + enrollment.certificate, + enrollment.key.toBytes(), + ); + await wallet.import("user1", userIdentity); + console.log( + 'Successfully registered and enrolled admin user "user1" and imported it into the wallet', + ); + } catch (error) { + console.error(`Failed to register user "user1": ${error}`); + process.exit(1); + } +} + +main(); diff --git a/tools/docker/fabric-all-in-one/fabcar-cli-1.4/setup.sh b/tools/docker/fabric-all-in-one/fabcar-cli-1.4/setup.sh new file mode 100755 index 0000000000..8b210e35cb --- /dev/null +++ b/tools/docker/fabric-all-in-one/fabcar-cli-1.4/setup.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# Copyright 2020-2021 Hyperledger Cactus Contributors +# SPDX-License-Identifier: Apache-2.0 + +# Exit on error +set -e + +FABRIC_CONTAINER_NAME=fabcar14_sample_setup + +if ! [ "$(docker inspect -f '{{.State.Running}}' ${FABRIC_CONTAINER_NAME})" == "true" ] +then + echo "ERROR: Container '${FABRIC_CONTAINER_NAME}' must be running! Exit..." + exit 1 +fi + +echo "Copy FabCar connection info from container to local storage" +echo "*********************************" +rm -fr ./connection.json +docker cp ${FABRIC_CONTAINER_NAME}:/fabric-samples/first-network/connection-org1.json ./connection.json +echo "Done!" + +echo -e "\nEnroll admin and user1" +echo "*********************************" +node ./enrollAdmin.js +node ./registerUser.js diff --git a/tools/docker/fabric-all-in-one/run-fabric-network.sh b/tools/docker/fabric-all-in-one/run-fabric-network.sh index d9fbe68523..87e61e843d 100755 --- a/tools/docker/fabric-all-in-one/run-fabric-network.sh +++ b/tools/docker/fabric-all-in-one/run-fabric-network.sh @@ -21,9 +21,6 @@ function main() tar -cC '/etc/hyperledger/fabric/fabric-ccenv/' . | docker load tar -cC '/etc/hyperledger/fabric/fabric-tools/' . | docker load tar -cC '/etc/hyperledger/fabric/fabric-ca/' . | docker load - tar -cC '/etc/hyperledger/fabric/fabric-couchdb/' . | docker load - tar -cC '/etc/couchdb/' . | docker load - echo "[FabricAIO] >>> Parsed MAJOR version of Fabric as ${MAJOR}" @@ -34,7 +31,9 @@ function main() # as well when we detect that we are running Fabric 2.x not 1.x tar -cC '/etc/hyperledger/fabric/fabric-nodeenv/' . | docker load tar -cC '/etc/hyperledger/fabric/fabric-baseos/' . | docker load - + tar -cC '/etc/hyperledger/fabric/fabric-couchdb/' . | docker load + tar -cC '/etc/couchdb/' . | docker load + /bootstrap.sh ${FABRIC_VERSION} ${CA_VERSION} -b -s cd /fabric-samples/test-network/ diff --git a/tools/docker/fabric-all-in-one/script-run-docker-1.4.sh b/tools/docker/fabric-all-in-one/script-run-docker-1.4.sh new file mode 100755 index 0000000000..39cdf9dd40 --- /dev/null +++ b/tools/docker/fabric-all-in-one/script-run-docker-1.4.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash +# Copyright 2020-2021 Hyperledger Cactus Contributors +# SPDX-License-Identifier: Apache-2.0 + +# Description: +# Helper script to run fabric-all-in-one and publish +# FabCar ports to local environment (used by example apps) + +# Exit on error +set -e + +IMAGE_NAME=faio14x +DOCKERFILE=Dockerfile_v1.4.x +FABRIC_VERSION=1.4.8 +CONTAINER_NAME=fabcar14_sample_setup + +# Start docker environment for Fabric testnets +if ! [ "$(docker inspect -f '{{.State.Running}}' ${CONTAINER_NAME})" == "true" ] +then + DOCKER_BUILDKIT=1 docker build . -f ${DOCKERFILE} -t ${IMAGE_NAME} + + rm -rf ./fabcar-cli-1.4/wallet + + ## PORTS + # 4022 - SSH + # 7051 - peer0.org1.example.com + # 8051 - peer1.org1.example.com + # 7054 - ca.org1.example.com + # 7050 - orderer.example.com + docker run --detach --privileged \ + -p 4022:22 \ + -p 7051:7051 \ + -p 8051:8051 \ + -p 7054:7054 \ + -p 7050:7050 \ + --name ${CONTAINER_NAME} \ + --env FABRIC_VERSION=${FABRIC_VERSION} \ + ${IMAGE_NAME} +fi + +# Wait for fabric cotnainer to become healthy +health_status="$(docker inspect -f '{{.State.Health.Status}}' ${CONTAINER_NAME})" +while ! [ "${health_status}" == "healthy" ] +do + echo "Waiting for fabric container... current status => ${health_status}" + sleep 30 + health_status="$(docker inspect -f '{{.State.Health.Status}}' ${CONTAINER_NAME})" +done + +echo "Fabric 1.4 FabCar started." diff --git a/tools/docker/fabric14-fabcar-testnet/.gitignore b/tools/docker/fabric14-fabcar-testnet/.gitignore deleted file mode 100644 index af7d30cd7d..0000000000 --- a/tools/docker/fabric14-fabcar-testnet/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -chaincode/hyperledger -fabcar/javascript/wallet -fabcar/javascript/node_modules - diff --git a/tools/docker/fabric14-fabcar-testnet/README.md b/tools/docker/fabric14-fabcar-testnet/README.md deleted file mode 100644 index 60627eae6f..0000000000 --- a/tools/docker/fabric14-fabcar-testnet/README.md +++ /dev/null @@ -1,30 +0,0 @@ - -# A tool to launch Hyperledger Fabric docker containers - -## Abstract -- Modules to launch Hyperledger Fabric docker containers - -## How to build -- Execute the following command, then the docker containers will be launched. - ``` - ./script-start-docker.sh - ``` -- If the following containers appear when you display the container list with the command `docker ps`, it will be fine. - ``` - CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES - 14b98ba40b66 dev-peer0.org1.example.com-fabcar-1.0-5c906e402ed29f20260ae42283216aa75549c571e2e380f3615826365d8269ba "chaincode -peer.add…" 42 seconds ago Up 40 seconds dev-peer0.org1.example.com-fabcar-1.0 - d0efd7479bdd hyperledger/fabric-tools "/bin/bash" About a minute ago Up 56 seconds cli - c9bd7ddfde7e hyperledger/fabric-peer "peer node start" About a minute ago Up About a minute 0.0.0.0:7051->7051/tcp, 0.0.0.0:7053->7053/tcp peer0.org1.example.com - d4f2b1a76626 hyperledger/fabric-couchdb "tini -- /docker-ent…" About a minute ago Up About a minute 4369/tcp, 9100/tcp, 0.0.0.0:5984->5984/tcp couchdb - 53a79780f564 hyperledger/fabric-ca "sh -c 'fabric-ca-se…" About a minute ago Up About a minute 0.0.0.0:7054->7054/tcp ca.example.com - aceb0e52e9c7 hyperledger/fabric-orderer "orderer" About a minute ago Up About a minute 0.0.0.0:7050->7050/tcp orderer.example.com - ``` - -## Note -- The details of the method for constructing the above environment are described in the following document. - - https://hyperledger-fabric.readthedocs.io/en/release-1.4/install.html \ No newline at end of file diff --git a/tools/docker/fabric14-fabcar-testnet/fabric-samples_dockerize.patch b/tools/docker/fabric14-fabcar-testnet/fabric-samples_dockerize.patch deleted file mode 100644 index ecf94bd41b..0000000000 --- a/tools/docker/fabric14-fabcar-testnet/fabric-samples_dockerize.patch +++ /dev/null @@ -1,133 +0,0 @@ -diff -uprN fabric-samples/fabcar/javascript/invoke.js fabric-samples-new/fabcar/javascript/invoke.js ---- fabric-samples/fabcar/javascript/invoke.js 2021-11-20 01:57:56.330128169 +0900 -+++ fabric-samples-new/fabcar/javascript/invoke.js 2021-11-20 02:02:43.528133958 +0900 -@@ -27,7 +27,7 @@ async function main() { - - // Create a new gateway for connecting to our peer node. - const gateway = new Gateway(); -- await gateway.connect(ccpPath, { wallet, identity: 'user1', discovery: { enabled: true, asLocalhost: true } }); -+ await gateway.connect(ccpPath, { wallet, identity: 'user1', discovery: { enabled: true, asLocalhost: false } }); - - // Get the network (channel) our contract is deployed to. - const network = await gateway.getNetwork('mychannel'); -diff -uprN fabric-samples/fabcar/javascript/query.js fabric-samples-new/fabcar/javascript/query.js ---- fabric-samples/fabcar/javascript/query.js 2021-11-20 01:57:56.330128169 +0900 -+++ fabric-samples-new/fabcar/javascript/query.js 2021-11-20 02:02:31.874133723 +0900 -@@ -27,7 +27,7 @@ async function main() { - - // Create a new gateway for connecting to our peer node. - const gateway = new Gateway(); -- await gateway.connect(ccpPath, { wallet, identity: 'user1', discovery: { enabled: true, asLocalhost: true } }); -+ await gateway.connect(ccpPath, { wallet, identity: 'user1', discovery: { enabled: true, asLocalhost: false } }); - - // Get the network (channel) our contract is deployed to. - const network = await gateway.getNetwork('mychannel'); -diff -uprN fabric-samples/fabcar/javascript/registerUser.js fabric-samples-new/fabcar/javascript/registerUser.js ---- fabric-samples/fabcar/javascript/registerUser.js 2021-11-20 01:57:56.330128169 +0900 -+++ fabric-samples-new/fabcar/javascript/registerUser.js 2021-11-20 02:02:23.468133554 +0900 -@@ -34,7 +34,7 @@ async function main() { - - // Create a new gateway for connecting to our peer node. - const gateway = new Gateway(); -- await gateway.connect(ccpPath, { wallet, identity: 'admin', discovery: { enabled: true, asLocalhost: true } }); -+ await gateway.connect(ccpPath, { wallet, identity: 'admin', discovery: { enabled: true, asLocalhost: false } }); - - // Get the CA client object from the gateway for interacting with the CA. - const ca = gateway.getClient().getCertificateAuthority(); -diff -uprN fabric-samples/first-network/ccp-template.json fabric-samples-new/first-network/ccp-template.json ---- fabric-samples/first-network/ccp-template.json 2021-11-20 01:57:56.332128169 +0900 -+++ fabric-samples-new/first-network/ccp-template.json 2021-11-20 02:04:35.739136220 +0900 -@@ -25,7 +25,7 @@ - }, - "peers": { - "peer0.org${ORG}.example.com": { -- "url": "grpcs://localhost:${P0PORT}", -+ "url": "grpcs://xx.xx.xx.xx:${P0PORT}", - "tlsCACerts": { - "pem": "${PEERPEM}" - }, -@@ -35,7 +35,7 @@ - } - }, - "peer1.org${ORG}.example.com": { -- "url": "grpcs://localhost:${P1PORT}", -+ "url": "grpcs://xx.xx.xx.xx:${P1PORT}", - "tlsCACerts": { - "pem": "${PEERPEM}" - }, -@@ -47,7 +47,7 @@ - }, - "certificateAuthorities": { - "ca.org${ORG}.example.com": { -- "url": "https://localhost:${CAPORT}", -+ "url": "https://xx.xx.xx.xx:${CAPORT}", - "caName": "ca-org${ORG}", - "tlsCACerts": { - "pem": "${CAPEM}" -diff -uprN fabric-samples/first-network/ccp-template.yaml fabric-samples-new/first-network/ccp-template.yaml ---- fabric-samples/first-network/ccp-template.yaml 2021-11-20 01:57:56.332128169 +0900 -+++ fabric-samples-new/first-network/ccp-template.yaml 2021-11-20 02:05:08.358136877 +0900 -@@ -17,7 +17,7 @@ organizations: - - ca.org${ORG}.example.com - peers: - peer0.org${ORG}.example.com: -- url: grpcs://localhost:${P0PORT} -+ url: grpcs://xx.xx.xx.xx:${P0PORT} - tlsCACerts: - pem: | - ${PEERPEM} -@@ -25,7 +25,7 @@ peers: - ssl-target-name-override: peer0.org${ORG}.example.com - hostnameOverride: peer0.org${ORG}.example.com - peer1.org${ORG}.example.com: -- url: grpcs://localhost:${P1PORT} -+ url: grpcs://xx.xx.xx.xx:${P1PORT} - tlsCACerts: - pem: | - ${PEERPEM} -@@ -34,7 +34,7 @@ peers: - hostnameOverride: peer1.org${ORG}.example.com - certificateAuthorities: - ca.org${ORG}.example.com: -- url: https://localhost:${CAPORT} -+ url: https://xx.xx.xx.xx:${CAPORT} - caName: ca-org${ORG} - tlsCACerts: - pem: | -diff -uprN fabric-samples/first-network/docker-compose-cli.yaml fabric-samples-new/first-network/docker-compose-cli.yaml ---- fabric-samples/first-network/docker-compose-cli.yaml 2021-11-20 01:57:56.333128169 +0900 -+++ fabric-samples-new/first-network/docker-compose-cli.yaml 2021-11-20 02:00:28.408131234 +0900 -@@ -92,3 +92,32 @@ services: - - peer1.org2.example.com - networks: - - byfn -+ -+ validator: -+ container_name: validator -+ image: node:14.18.1 -+ tty: true -+ stdin_open: true -+ environment: -+ - http_proxy=$http_proxy -+ - https_proxy=$https_proxy -+ - HTTP_PROXY=$HTTP_PROXY -+ - HTTPS_PROXY=$HTTPS_PROXY -+ - ftp_proxy=$ftp_proxy -+ - FTP_PROXY=$FTP_PROXY -+ - no_proxy=$no_proxy -+ - NO_PROXY=$NO_PROXY -+ volumes: -+ - ./:/app/first-network -+ - ../fabcar:/app/fabcar -+ working_dir: /app -+ command: /bin/bash -+ depends_on: -+ - cli -+ - orderer.example.com -+ - peer0.org1.example.com -+ - peer1.org1.example.com -+ - peer0.org2.example.com -+ - peer1.org2.example.com -+ networks: -+ - byfn -+ diff --git a/tools/docker/fabric14-fabcar-testnet/how_to_containerize_fabcar.md b/tools/docker/fabric14-fabcar-testnet/how_to_containerize_fabcar.md deleted file mode 100644 index 6c59510568..0000000000 --- a/tools/docker/fabric14-fabcar-testnet/how_to_containerize_fabcar.md +++ /dev/null @@ -1,557 +0,0 @@ -## How to Containerize Fabcar - -#### Background - -- You need to work fabcar to use cartrade, but it may not work outside centos. - -#### Goal - -- make fabcar work regardless of the environment by making it a docker container, where "work fabcar" means "use registerUser, query, invoke". - -#### Required patch Files - -- I create two patch files in`/cactus/tools/docker/fabric14-fabcar-testnet`. - -1. `script-start-docker_newer.patch` - - - This changes and adds the following in `script-start-docker.sh` : - - Change the fabric version from v1.4.1 to v1.4.12. - - Add a command to apply `fabric-samples_dockerize.patch`. - - Add a command to run fabcar in the container. - -2. `fabric-samples_dockerize.patch` - - - This changes and adds the following in `fabric-samples` : - - - Change values of parameter `asLocalhost` used in node APIs in `fabric-samples/fabcar/javascript` from `true` to `false`. - - - Change addresses used in `fabric-samples/first-network/ccp-template.json` from `localhost` to IP address of your environment. - - - Add a verifier container to end of `fabric-samples/first-network/docker-compose-cli.yaml` to run node APIs in the container. - - - -#### How to use these patch files - -- Do the following operations in `/cactus/tools/docker/fabric14-fabcar-testnet ` : - -1. When running fabcar under a proxy environment, - - - Uncomment lines 20--26 of `script-start-docker_newer.patch` when running fabcar under a proxy environment - - - Set the environment variables as follows: - - ``` - $ export http_proxy=http://username:password@proxyhost:port - $ export https_proxy=http://username:password@proxyhost:port - $ export HTTP_PROXY=http://username:password@proxyhost:port - $ export HTTPS_PROXY=http://username:password@proxyhost:port - $ export ftp_proxy=http://username:password@proxyhost:port - $ export FTP_PROXY=http://username:password@proxyhost:port - $ export no_proxy=localhost,127.0.0.1 - ``` - -2. Enter the IP address of your environment in `xx.xx.xx.xx` on lines 45, 54, 63, 75, 84, and 93 of `fabric-samples_dockerize.patch` - -3. `$ patch < script-start-docker_newer.patch ` - -4. `$ ./script-start-docker.sh` - - - -#### Test log - -- Test envronment : Centos7, node v14.18.0, docker version 20.10.5 under a proxy network - - ``` - [user002@earth fabric14-fabcar-testnet]$ patch < script-start-docker_newer.patch - patching file script-start-docker.sh - Hunk #2 succeeded at 19 with fuzz 2. - [user002@earth fabric14-fabcar-testnet]$ ls - README.md script-start-docker.sh.orig - fabric-samples_dockerize.patch script-start-docker_newer.patch - script-start-docker.sh - [user002@earth fabric14-fabcar-testnet]$ ./script-start-docker.sh - [process] start docker environment for Fabric testnet - - Clone hyperledger/fabric-samples repo - - ===> Cloning hyperledger/fabric-samples repo - Cloning into 'fabric-samples'... - remote: Enumerating objects: 8324, done. - remote: Counting objects: 100% (599/599), done. - remote: Compressing objects: 100% (380/380), done. - remote: Total 8324 (delta 280), reused 442 (delta 208), pack-reused 7725 - Receiving objects: 100% (8324/8324), 4.92 MiB | 8.20 MiB/s, done. - Resolving deltas: 100% (4314/4314), done. - ===> Checking out v1.4.12 of hyperledger/fabric-samples - - Pull Hyperledger Fabric binaries - - ===> Downloading version 1.4.12 platform specific fabric binaries - ===> Downloading: https://github.com/hyperledger/fabric/releases/download/v1.4.12/hyperledger-fabric-linux-amd64-1.4.12.tar.gz - % Total % Received % Xferd Average Speed Time Time Time Current - Dload Upload Total Spent Left Speed - 100 681 100 681 0 0 1368 0 --:--:-- --:--:-- --:--:-- 1370 - 100 79.0M 100 79.0M 0 0 5866k 0 0:00:13 0:00:13 --:--:-- 8058k - ==> Done. - ===> Downloading version 1.4.9 platform specific fabric-ca-client binary - ===> Downloading: https://github.com/hyperledger/fabric-ca/releases/download/v1.4.9/hyperledger-fabric-ca-linux-amd64-1.4.9.tar.gz - % Total % Received % Xferd Average Speed Time Time Time Current - Dload Upload Total Spent Left Speed - 100 683 100 683 0 0 1367 0 --:--:-- --:--:-- --:--:-- 1366 - 100 23.6M 100 23.6M 0 0 4506k 0 0:00:05 0:00:05 --:--:-- 6389k - ==> Done. - - Pull Hyperledger Fabric docker images - - FABRIC_IMAGES: peer orderer ccenv tools - ===> Pulling fabric Images - ====> hyperledger/fabric-peer:1.4.12 - 1.4.12: Pulling from hyperledger/fabric-peer - Digest: sha256:3c07486c8113415ffdb83b65c3d245397a90581c3536d5acac174d30d1ab8d77 - Status: Image is up to date for hyperledger/fabric-peer:1.4.12 - docker.io/hyperledger/fabric-peer:1.4.12 - ====> hyperledger/fabric-orderer:1.4.12 - 1.4.12: Pulling from hyperledger/fabric-orderer - Digest: sha256:1b70416ebb1286686794a74c5d87d77d3ca458a95eabb946f9684a495a986642 - Status: Image is up to date for hyperledger/fabric-orderer:1.4.12 - docker.io/hyperledger/fabric-orderer:1.4.12 - ====> hyperledger/fabric-ccenv:1.4.12 - 1.4.12: Pulling from hyperledger/fabric-ccenv - Digest: sha256:20bd9890c6de6157078adf8bda57fa6652b3456557c86ba8a7b1cbd51e984084 - Status: Image is up to date for hyperledger/fabric-ccenv:1.4.12 - docker.io/hyperledger/fabric-ccenv:1.4.12 - ====> hyperledger/fabric-tools:1.4.12 - 1.4.12: Pulling from hyperledger/fabric-tools - Digest: sha256:9b4605c1de2facc06eb0531376f698c8849f4288fc0ed4f3dad3e334af62105e - Status: Image is up to date for hyperledger/fabric-tools:1.4.12 - docker.io/hyperledger/fabric-tools:1.4.12 - ===> Pulling fabric ca Image - ====> hyperledger/fabric-ca:1.4.9 - 1.4.9: Pulling from hyperledger/fabric-ca - Digest: sha256:28f50c6aa4f4642842e706d3ae6dcee181921d03bd30ab2a8b09b66e0349d92f - Status: Image is up to date for hyperledger/fabric-ca:1.4.9 - docker.io/hyperledger/fabric-ca:1.4.9 - ===> List out hyperledger docker images - hyperledgerlabs/minifab latest 2f7e1a92b0ca 8 weeks ago 568MB - hyperledger/fabric-tools 1.4 461901e2a2c1 7 months ago 1.55GB - hyperledger/fabric-tools 1.4.12 461901e2a2c1 7 months ago 1.55GB - hyperledger/fabric-tools latest 461901e2a2c1 7 months ago 1.55GB - hyperledger/fabric-ccenv 1.4 01caec52b792 7 months ago 1.42GB - hyperledger/fabric-ccenv 1.4.12 01caec52b792 7 months ago 1.42GB - hyperledger/fabric-ccenv latest 01caec52b792 7 months ago 1.42GB - hyperledger/fabric-orderer 1.4 a4be4d4c5800 7 months ago 133MB - hyperledger/fabric-orderer 1.4.12 a4be4d4c5800 7 months ago 133MB - hyperledger/fabric-orderer latest a4be4d4c5800 7 months ago 133MB - hyperledger/fabric-peer 1.4 df5561a93137 7 months ago 141MB - hyperledger/fabric-peer 1.4.12 df5561a93137 7 months ago 141MB - hyperledger/fabric-peer latest df5561a93137 7 months ago 141MB - hyperledger/fabric-baseos amd64-0.4.22 56b3cacd110b 12 months ago 95.5MB - hyperledger/fabric-ca 1.4 dbbc768aec79 13 months ago 158MB - hyperledger/fabric-ca 1.4.9 dbbc768aec79 13 months ago 158MB - hyperledger/fabric-ca latest dbbc768aec79 13 months ago 158MB - hyperledger/fabric-ca 1.4.8 152b9082adf6 15 months ago 158MB - hyperledger/fabric-tools 1.4.8 e642eef94cae 16 months ago 1.5GB - hyperledger/fabric-orderer 1.4.8 1a326828a41f 16 months ago 127MB - hyperledger/fabric-peer 1.4.8 b31292eb8166 16 months ago 135MB - hyperledger/fabric-couchdb latest b967e8b98b6b 16 months ago 261MB - hyperledger/fabric-ca 1.4.1 3a1799cda5d7 2 years ago 252MB - hyperledger/fabric-tools 1.4.1 432c24764fbb 2 years ago 1.55GB - hyperledger/fabric-ccenv 1.4.1 d7433c4b2a1c 2 years ago 1.43GB - hyperledger/fabric-orderer 1.4.1 ec4ca236d3d4 2 years ago 173MB - hyperledger/fabric-peer 1.4.1 a1e3874f338b 2 years ago 178MB - hyperledger/fabric-baseos amd64-0.4.15 9d6ec11c60ff 2 years ago 145MB - dockerlize fabric-samples - patching file fabric-samples/fabcar/javascript/invoke.js - patching file fabric-samples/fabcar/javascript/query.js - patching file fabric-samples/fabcar/javascript/registerUser.js - patching file fabric-samples/first-network/ccp-template.json - patching file fabric-samples/first-network/ccp-template.yaml - patching file fabric-samples/first-network/docker-compose-cli.yaml - Stopping for channel 'mychannel' with CLI timeout of '10' seconds and CLI delay of '3' seconds - proceeding ... - WARNING: The BYFN_CA1_PRIVATE_KEY variable is not set. Defaulting to a blank string. - WARNING: The BYFN_CA2_PRIVATE_KEY variable is not set. Defaulting to a blank string. - Removing network net_byfn - Removing volume net_orderer.example.com - Removing volume net_peer0.org1.example.com - Removing volume net_peer1.org1.example.com - Removing volume net_peer0.org2.example.com - Removing volume net_peer1.org2.example.com - Removing volume net_orderer2.example.com - WARNING: Volume net_orderer2.example.com not found. - Removing volume net_orderer3.example.com - WARNING: Volume net_orderer3.example.com not found. - Removing volume net_orderer4.example.com - WARNING: Volume net_orderer4.example.com not found. - Removing volume net_orderer5.example.com - WARNING: Volume net_orderer5.example.com not found. - Removing volume net_peer0.org3.example.com - WARNING: Volume net_peer0.org3.example.com not found. - Removing volume net_peer1.org3.example.com - WARNING: Volume net_peer1.org3.example.com not found. - ---- No containers available for deletion ---- - Untagged: dev-peer0.org2.example.com-fabcar-1.0-264b0a1cb5efbecaac5cf8990339c24474dc8435c6e10f10f2be565d555d0e94:latest - Deleted: sha256:a28e7a8c44fdb1d24938dfc6f214ad99c60acf253f4776e19180ea6658897193 - Deleted: sha256:82b3025502a2397be06758092bf0ed33864cd1fb59d5fe2330ec5749d4b5298d - Deleted: sha256:af449fb396c96b69c0369e049995e5b7123aeb61788059568bc1da17f1ae5ae7 - Deleted: sha256:27023eb4cff6d6776ebf63a566775382ef34ce82ff13916a9a35ecb94e99c6bc - Untagged: dev-peer0.org1.example.com-fabcar-1.0-5c906e402ed29f20260ae42283216aa75549c571e2e380f3615826365d8269ba:latest - Deleted: sha256:d86881fb0c7c78f548abbbf321d8109e5a0d1973eb114158bdd8e92e7c2961dc - Deleted: sha256:71488aad0ac58969abf404951644e52dae24b4e61691c8ade985dba99e9c01cc - Deleted: sha256:1d723ca8059f135e6a426483e0fb92d762ccf8e43e2031107bc7a571372ea7d5 - Deleted: sha256:ee54978a04a0b3b18e6f2a0c7fa103384b64b17fde457a5e3264289b9b0d64c2 - - Starting for channel 'mychannel' with CLI timeout of '10' seconds and CLI delay of '3' seconds and using database 'couchdb' - proceeding ... - LOCAL_VERSION=1.4.11 - DOCKER_IMAGE_VERSION=1.4.12 - =================== WARNING =================== - Local fabric binaries and docker images are - out of sync. This may cause problems. - =============================================== - /home/user002/cactus_cp1/tools/docker/fabric14-fabcar-testnet/fabric-samples/bin/cryptogen - - ########################################################## - ##### Generate certificates using cryptogen tool ######### - ########################################################## - + cryptogen generate --config=./crypto-config.yaml - org1.example.com - org2.example.com - + res=0 - + set +x - - Generate CCP files for Org1 and Org2 - /home/user002/cactus_cp1/tools/docker/fabric14-fabcar-testnet/fabric-samples/bin/configtxgen - ########################################################## - ######### Generating Orderer Genesis block ############## - ########################################################## - CONSENSUS_TYPE=solo - + '[' solo == solo ']' - + configtxgen -profile TwoOrgsOrdererGenesis -channelID byfn-sys-channel -outputBlock ./channel-artifacts/genesis.block - 2021-11-20 07:54:44.974 JST [common.tools.configtxgen] main -> INFO 001 Loading configuration - 2021-11-20 07:54:45.063 JST [common.tools.configtxgen.localconfig] completeInitialization -> INFO 002 orderer type: solo - 2021-11-20 07:54:45.063 JST [common.tools.configtxgen.localconfig] Load -> INFO 003 Loaded configuration: /home/user002/cactus_cp1/tools/docker/fabric14-fabcar-testnet/fabric-samples/first-network/configtx.yaml - 2021-11-20 07:54:45.152 JST [common.tools.configtxgen.localconfig] completeInitialization -> INFO 004 orderer type: solo - 2021-11-20 07:54:45.152 JST [common.tools.configtxgen.localconfig] LoadTopLevel -> INFO 005 Loaded configuration: /home/user002/cactus_cp1/tools/docker/fabric14-fabcar-testnet/fabric-samples/first-network/configtx.yaml - 2021-11-20 07:54:45.154 JST [common.tools.configtxgen] doOutputBlock -> INFO 006 Generating genesis block - 2021-11-20 07:54:45.154 JST [common.tools.configtxgen] doOutputBlock -> INFO 007 Writing genesis block - + res=0 - + set +x - - ################################################################# - ### Generating channel configuration transaction 'channel.tx' ### - ################################################################# - + configtxgen -profile TwoOrgsChannel -outputCreateChannelTx ./channel-artifacts/channel.tx -channelID mychannel - 2021-11-20 07:54:45.180 JST [common.tools.configtxgen] main -> INFO 001 Loading configuration - 2021-11-20 07:54:45.275 JST [common.tools.configtxgen.localconfig] Load -> INFO 002 Loaded configuration: /home/user002/cactus_cp1/tools/docker/fabric14-fabcar-testnet/fabric-samples/first-network/configtx.yaml - 2021-11-20 07:54:45.364 JST [common.tools.configtxgen.localconfig] completeInitialization -> INFO 003 orderer type: solo - 2021-11-20 07:54:45.364 JST [common.tools.configtxgen.localconfig] LoadTopLevel -> INFO 004 Loaded configuration: /home/user002/cactus_cp1/tools/docker/fabric14-fabcar-testnet/fabric-samples/first-network/configtx.yaml - 2021-11-20 07:54:45.364 JST [common.tools.configtxgen] doOutputChannelCreateTx -> INFO 005 Generating new channel configtx - 2021-11-20 07:54:45.366 JST [common.tools.configtxgen] doOutputChannelCreateTx -> INFO 006 Writing new channel tx - + res=0 - + set +x - - ################################################################# - ####### Generating anchor peer update for Org1MSP ########## - ################################################################# - + configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ./channel-artifacts/Org1MSPanchors.tx -channelID mychannel -asOrg Org1MSP - 2021-11-20 07:54:45.391 JST [common.tools.configtxgen] main -> INFO 001 Loading configuration - 2021-11-20 07:54:45.486 JST [common.tools.configtxgen.localconfig] Load -> INFO 002 Loaded configuration: /home/user002/cactus_cp1/tools/docker/fabric14-fabcar-testnet/fabric-samples/first-network/configtx.yaml - 2021-11-20 07:54:45.580 JST [common.tools.configtxgen.localconfig] completeInitialization -> INFO 003 orderer type: solo - 2021-11-20 07:54:45.580 JST [common.tools.configtxgen.localconfig] LoadTopLevel -> INFO 004 Loaded configuration: /home/user002/cactus_cp1/tools/docker/fabric14-fabcar-testnet/fabric-samples/first-network/configtx.yaml - 2021-11-20 07:54:45.580 JST [common.tools.configtxgen] doOutputAnchorPeersUpdate -> INFO 005 Generating anchor peer update - 2021-11-20 07:54:45.580 JST [common.tools.configtxgen] doOutputAnchorPeersUpdate -> INFO 006 Writing anchor peer update - + res=0 - + set +x - - ################################################################# - ####### Generating anchor peer update for Org2MSP ########## - ################################################################# - + configtxgen -profile TwoOrgsChannel -outputAnchorPeersUpdate ./channel-artifacts/Org2MSPanchors.tx -channelID mychannel -asOrg Org2MSP - 2021-11-20 07:54:45.606 JST [common.tools.configtxgen] main -> INFO 001 Loading configuration - 2021-11-20 07:54:45.700 JST [common.tools.configtxgen.localconfig] Load -> INFO 002 Loaded configuration: /home/user002/cactus_cp1/tools/docker/fabric14-fabcar-testnet/fabric-samples/first-network/configtx.yaml - 2021-11-20 07:54:45.798 JST [common.tools.configtxgen.localconfig] completeInitialization -> INFO 003 orderer type: solo - 2021-11-20 07:54:45.798 JST [common.tools.configtxgen.localconfig] LoadTopLevel -> INFO 004 Loaded configuration: /home/user002/cactus_cp1/tools/docker/fabric14-fabcar-testnet/fabric-samples/first-network/configtx.yaml - 2021-11-20 07:54:45.798 JST [common.tools.configtxgen] doOutputAnchorPeersUpdate -> INFO 005 Generating anchor peer update - 2021-11-20 07:54:45.798 JST [common.tools.configtxgen] doOutputAnchorPeersUpdate -> INFO 006 Writing anchor peer update - + res=0 - + set +x - - Creating network "net_byfn" with the default driver - Creating volume "net_orderer.example.com" with default driver - Creating volume "net_peer0.org1.example.com" with default driver - Creating volume "net_peer1.org1.example.com" with default driver - Creating volume "net_peer0.org2.example.com" with default driver - Creating volume "net_peer1.org2.example.com" with default driver - Creating couchdb3 ... done - Creating couchdb1 ... done - Creating orderer.example.com ... done - Creating ca_peerOrg1 ... done - Creating couchdb0 ... done - Creating ca_peerOrg2 ... done - Creating couchdb2 ... done - Creating peer0.org1.example.com ... done - Creating peer1.org1.example.com ... done - Creating peer0.org2.example.com ... done - Creating peer1.org2.example.com ... done - Creating cli ... done - Creating validator ... done - CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES - f9be2ed36e76 node:14.18.1 "docker-entrypoint.s…" 1 second ago Up Less than a second validator - c1b4bbfc8910 hyperledger/fabric-tools:latest "/bin/bash" 1 second ago Up Less than a second cli - 3ebbb0edb38c hyperledger/fabric-peer:latest "peer node start" 3 seconds ago Up 1 second 0.0.0.0:10051->10051/tcp peer1.org2.example.com - e183c5844467 hyperledger/fabric-peer:latest "peer node start" 3 seconds ago Up 1 second 0.0.0.0:9051->9051/tcp peer0.org2.example.com - e448bcb0103f hyperledger/fabric-peer:latest "peer node start" 3 seconds ago Up 1 second 0.0.0.0:8051->8051/tcp peer1.org1.example.com - 135e09f7720f hyperledger/fabric-peer:latest "peer node start" 3 seconds ago Up 2 seconds 0.0.0.0:7051->7051/tcp peer0.org1.example.com - 9720ce59a2f9 hyperledger/fabric-couchdb "tini -- /docker-ent…" 5 seconds ago Up 3 seconds 4369/tcp, 9100/tcp, 0.0.0.0:7984->5984/tcp couchdb2 - db717c513c00 hyperledger/fabric-ca:latest "sh -c 'fabric-ca-se…" 5 seconds ago Up 3 seconds 7054/tcp, 0.0.0.0:8054->8054/tcp ca_peerOrg2 - 4e2ed5621573 hyperledger/fabric-couchdb "tini -- /docker-ent…" 5 seconds ago Up 3 seconds 4369/tcp, 9100/tcp, 0.0.0.0:5984->5984/tcp couchdb0 - 24eba0e94ba5 hyperledger/fabric-couchdb "tini -- /docker-ent…" 5 seconds ago Up 3 seconds 4369/tcp, 9100/tcp, 0.0.0.0:6984->5984/tcp couchdb1 - ad04b4ab54be hyperledger/fabric-orderer:latest "orderer" 5 seconds ago Up 3 seconds 0.0.0.0:7050->7050/tcp orderer.example.com - 42f655d4eb27 hyperledger/fabric-ca:latest "sh -c 'fabric-ca-se…" 5 seconds ago Up 3 seconds 0.0.0.0:7054->7054/tcp ca_peerOrg1 - 3f9ef95cbf00 hyperledger/fabric-couchdb "tini -- /docker-ent…" 5 seconds ago Up 3 seconds 4369/tcp, 9100/tcp, 0.0.0.0:8984->5984/tcp couchdb3 - - ____ _____ _ ____ _____ - / ___| |_ _| / \ | _ \ |_ _| - \___ \ | | / _ \ | |_) | | | - ___) | | | / ___ \ | _ < | | - |____/ |_| /_/ \_\ |_| \_\ |_| - - Build your first network (BYFN) end-to-end test - - Channel name : mychannel - Creating channel... - + peer channel create -o orderer.example.com:7050 -c mychannel -f ./channel-artifacts/channel.tx --tls true --cafile /opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem - + res=0 - + set +x - 2021-11-19 22:54:52.092 UTC [channelCmd] InitCmdFactory -> INFO 001 Endorser and orderer connections initialized - 2021-11-19 22:54:52.115 UTC [cli.common] readBlock -> INFO 002 Received block: 0 - ===================== Channel 'mychannel' created ===================== - - Having all peers join the channel... - + peer channel join -b mychannel.block - + res=1 - + set +x - Error: error getting endorser client for channel: endorser client failed to connect to peer0.org1.example.com:7051: failed to create new connection: connection error: desc = "transport: error while dialing: dial tcp 172.21.0.9:7051: connect: connection refused" - peer0.org1 failed to join the channel, Retry after 3 seconds - + peer channel join -b mychannel.block - + res=0 - + set +x - 2021-11-19 22:54:55.304 UTC [channelCmd] InitCmdFactory -> INFO 001 Endorser and orderer connections initialized - 2021-11-19 22:54:55.393 UTC [channelCmd] executeJoin -> INFO 002 Successfully submitted proposal to join channel - ===================== peer0.org1 joined channel 'mychannel' ===================== - - + peer channel join -b mychannel.block - + res=0 - + set +x - 2021-11-19 22:54:58.445 UTC [channelCmd] InitCmdFactory -> INFO 001 Endorser and orderer connections initialized - 2021-11-19 22:54:58.529 UTC [channelCmd] executeJoin -> INFO 002 Successfully submitted proposal to join channel - ===================== peer1.org1 joined channel 'mychannel' ===================== - - + peer channel join -b mychannel.block - + res=0 - + set +x - 2021-11-19 22:55:01.580 UTC [channelCmd] InitCmdFactory -> INFO 001 Endorser and orderer connections initialized - 2021-11-19 22:55:01.681 UTC [channelCmd] executeJoin -> INFO 002 Successfully submitted proposal to join channel - ===================== peer0.org2 joined channel 'mychannel' ===================== - - + peer channel join -b mychannel.block - + res=0 - + set +x - 2021-11-19 22:55:04.731 UTC [channelCmd] InitCmdFactory -> INFO 001 Endorser and orderer connections initialized - 2021-11-19 22:55:04.809 UTC [channelCmd] executeJoin -> INFO 002 Successfully submitted proposal to join channel - ===================== peer1.org2 joined channel 'mychannel' ===================== - - Updating anchor peers for org1... - + peer channel update -o orderer.example.com:7050 -c mychannel -f ./channel-artifacts/Org1MSPanchors.tx --tls true --cafile /opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem - + res=0 - + set +x - 2021-11-19 22:55:07.857 UTC [channelCmd] InitCmdFactory -> INFO 001 Endorser and orderer connections initialized - 2021-11-19 22:55:07.864 UTC [channelCmd] update -> INFO 002 Successfully submitted channel update - ===================== Anchor peers updated for org 'Org1MSP' on channel 'mychannel' ===================== - - Updating anchor peers for org2... - + peer channel update -o orderer.example.com:7050 -c mychannel -f ./channel-artifacts/Org2MSPanchors.tx --tls true --cafile /opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem - + res=0 - + set +x - 2021-11-19 22:55:10.914 UTC [channelCmd] InitCmdFactory -> INFO 001 Endorser and orderer connections initialized - 2021-11-19 22:55:10.930 UTC [channelCmd] update -> INFO 002 Successfully submitted channel update - ===================== Anchor peers updated for org 'Org2MSP' on channel 'mychannel' ===================== - - - ========= All GOOD, BYFN execution completed =========== - - - _____ _ _ ____ - | ____| | \ | | | _ \ - | _| | \| | | | | | - | |___ | |\ | | |_| | - |_____| |_| \_| |____/ - - + echo 'Installing smart contract on peer0.org1.example.com' - Installing smart contract on peer0.org1.example.com - + docker exec -e CORE_PEER_LOCALMSPID=Org1MSP -e CORE_PEER_ADDRESS=peer0.org1.example.com:7051 -e CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp -e CORE_PEER_TLS_ROOTCERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt cli peer chaincode install -n fabcar -v 1.0 -p github.com/chaincode/fabcar/go -l golang - 2021-11-19 22:55:14.102 UTC [chaincodeCmd] checkChaincodeCmdParams -> INFO 001 Using default escc - 2021-11-19 22:55:14.102 UTC [chaincodeCmd] checkChaincodeCmdParams -> INFO 002 Using default vscc - 2021-11-19 22:55:14.290 UTC [chaincodeCmd] install -> INFO 003 Installed remotely response: - + echo 'Installing smart contract on peer0.org2.example.com' - Installing smart contract on peer0.org2.example.com - + docker exec -e CORE_PEER_LOCALMSPID=Org2MSP -e CORE_PEER_ADDRESS=peer0.org2.example.com:9051 -e CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org2.example.com/users/Admin@org2.example.com/msp -e CORE_PEER_TLS_ROOTCERT_FILE=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt cli peer chaincode install -n fabcar -v 1.0 -p github.com/chaincode/fabcar/go -l golang - 2021-11-19 22:55:14.437 UTC [chaincodeCmd] checkChaincodeCmdParams -> INFO 001 Using default escc - 2021-11-19 22:55:14.437 UTC [chaincodeCmd] checkChaincodeCmdParams -> INFO 002 Using default vscc - 2021-11-19 22:55:14.618 UTC [chaincodeCmd] install -> INFO 003 Installed remotely response: - + echo 'Instantiating smart contract on mychannel' - Instantiating smart contract on mychannel - + docker exec -e CORE_PEER_LOCALMSPID=Org1MSP -e CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp cli peer chaincode instantiate -o orderer.example.com:7050 -C mychannel -n fabcar -l golang -v 1.0 -c '{"Args":[]}' -P 'AND('\''Org1MSP.member'\'','\''Org2MSP.member'\'')' --tls --cafile /opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem --peerAddresses peer0.org1.example.com:7051 --tlsRootCertFiles /opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt - 2021-11-19 22:55:14.754 UTC [chaincodeCmd] checkChaincodeCmdParams -> INFO 001 Using default escc - 2021-11-19 22:55:14.754 UTC [chaincodeCmd] checkChaincodeCmdParams -> INFO 002 Using default vscc - + echo 'Waiting for instantiation request to be committed ...' - Waiting for instantiation request to be committed ... - + sleep 10 - + echo 'Submitting initLedger transaction to smart contract on mychannel' - Submitting initLedger transaction to smart contract on mychannel - + echo 'The transaction is sent to the two peers with the chaincode installed (peer0.org1.example.com and peer0.org2.example.com) so that chaincode is built before receiving the following requests' - The transaction is sent to the two peers with the chaincode installed (peer0.org1.example.com and peer0.org2.example.com) so that chaincode is built before receiving the following requests - + docker exec -e CORE_PEER_LOCALMSPID=Org1MSP -e CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp cli peer chaincode invoke -o orderer.example.com:7050 -C mychannel -n fabcar -c '{"function":"initLedger","Args":[]}' --waitForEvent --tls --cafile /opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem --peerAddresses peer0.org1.example.com:7051 --peerAddresses peer0.org2.example.com:9051 --tlsRootCertFiles /opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt --tlsRootCertFiles /opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org2.example.com/peers/peer0.org2.example.com/tls/ca.crt - 2021-11-19 22:56:00.622 UTC [chaincodeCmd] ClientWait -> INFO 001 txid [aca685bffc50c66f78a97cd99eebdab37272da0bc0bada20f716392d76e368e6] committed with status (VALID) at peer0.org1.example.com:7051 - 2021-11-19 22:56:00.622 UTC [chaincodeCmd] ClientWait -> INFO 002 txid [aca685bffc50c66f78a97cd99eebdab37272da0bc0bada20f716392d76e368e6] committed with status (VALID) at peer0.org2.example.com:9051 - 2021-11-19 22:56:00.622 UTC [chaincodeCmd] chaincodeInvokeOrQuery -> INFO 003 Chaincode invoke successful. result: status:200 - + set +x - - Total setup execution time : 79 secs ... - - Next, use the FabCar applications to interact with the deployed FabCar contract. - The FabCar applications are available in multiple programming languages. - Follow the instructions for the programming language of your choice: - - JavaScript: - - Start by changing into the "javascript" directory: - cd javascript - - Next, install all required packages: - npm install - - Then run the following applications to enroll the admin user, and register a new user - called user1 which will be used by the other applications to interact with the deployed - FabCar contract: - node enrollAdmin - node registerUser - - You can run the invoke application as follows. By default, the invoke application will - create a new car, but you can update the application to submit other transactions: - node invoke - - You can run the query application as follows. By default, the query application will - return all cars, but you can update the application to evaluate other transactions: - node query - - TypeScript: - - Start by changing into the "typescript" directory: - cd typescript - - Next, install all required packages: - npm install - - Next, compile the TypeScript code into JavaScript: - npm run build - - Then run the following applications to enroll the admin user, and register a new user - called user1 which will be used by the other applications to interact with the deployed - FabCar contract: - node dist/enrollAdmin - node dist/registerUser - - You can run the invoke application as follows. By default, the invoke application will - create a new car, but you can update the application to submit other transactions: - node dist/invoke - - You can run the query application as follows. By default, the query application will - return all cars, but you can update the application to evaluate other transactions: - node dist/query - - Java: - - Start by changing into the "java" directory: - cd java - - Then, install dependencies and run the test using: - mvn test - - The test will invoke the sample client app which perform the following: - - Enroll admin and user1 and import them into the wallet (if they don't already exist there) - - Submit a transaction to create a new car - - Evaluate a transaction (query) to return details of this car - - Submit a transaction to change the owner of this car - - Evaluate a transaction (query) to return the updated details of this car - - set proxy for npm in validator container - npm install in validator container - npm WARN deprecated uuid@3.4.0: Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details. - npm WARN deprecated mkdirp@0.5.1: Legacy versions of mkdirp are no longer supported. Please update to mkdirp 1.x. (Note that the API surface has changed to use Promises in 1.x.) - npm WARN deprecated grpc@1.24.3: This library will not receive further updates other than security fixes. We recommend using @grpc/grpc-js instead. - npm WARN deprecated querystring@0.2.0: The querystring API is considered Legacy. new code should use the URLSearchParams API instead. - npm WARN deprecated node-pre-gyp@0.15.0: Please upgrade to @mapbox/node-pre-gyp: the non-scoped node-pre-gyp package is deprecated and only the @mapbox scoped package will recieve updates in the future - npm WARN deprecated request@2.88.2: request has been deprecated, see https://github.com/request/request/issues/3142 - npm WARN deprecated cloudant-follow@0.17.0: This package is no longer maintained. - npm WARN deprecated har-validator@5.1.5: this library is no longer supported - - > pkcs11js@1.2.6 install /app/fabcar/javascript/node_modules/pkcs11js - > node-gyp rebuild - - make: Entering directory '/app/fabcar/javascript/node_modules/pkcs11js/build' - CXX(target) Release/obj.target/pkcs11/src/main.o - CXX(target) Release/obj.target/pkcs11/src/dl.o - CXX(target) Release/obj.target/pkcs11/src/const.o - CXX(target) Release/obj.target/pkcs11/src/pkcs11/error.o - CXX(target) Release/obj.target/pkcs11/src/pkcs11/v8_convert.o - CXX(target) Release/obj.target/pkcs11/src/pkcs11/template.o - CXX(target) Release/obj.target/pkcs11/src/pkcs11/mech.o - CXX(target) Release/obj.target/pkcs11/src/pkcs11/param.o - CXX(target) Release/obj.target/pkcs11/src/pkcs11/param_aes.o - CXX(target) Release/obj.target/pkcs11/src/pkcs11/param_rsa.o - CXX(target) Release/obj.target/pkcs11/src/pkcs11/param_ecdh.o - CXX(target) Release/obj.target/pkcs11/src/pkcs11/pkcs11.o - CXX(target) Release/obj.target/pkcs11/src/async.o - CXX(target) Release/obj.target/pkcs11/src/node.o - SOLINK_MODULE(target) Release/obj.target/pkcs11.node - COPY Release/pkcs11.node - make: Leaving directory '/app/fabcar/javascript/node_modules/pkcs11js/build' - - > grpc@1.24.3 install /app/fabcar/javascript/node_modules/grpc - > node-pre-gyp install --fallback-to-build --library=static_library - - node-pre-gyp WARN Using request for node-pre-gyp https download - [grpc] Success: "/app/fabcar/javascript/node_modules/grpc/src/node/extension_binary/node-v83-linux-x64-glibc/grpc_node.node" is installed via remote - npm notice created a lockfile as package-lock.json. You should commit this file. - npm WARN notsup Unsupported engine for fabric-ca-client@1.4.18: wanted: {"node":"^10.15.3 || ^12.15.0","npm":"^6.4.1"} (current: {"node":"14.18.1","npm":"6.14.15"}) - npm WARN notsup Not compatible with your version of node/npm: fabric-ca-client@1.4.18 - npm WARN notsup Unsupported engine for fabric-network@1.4.18: wanted: {"node":"^10.15.3 || ^12.15.0","npm":"^6.4.1"} (current: {"node":"14.18.1","npm":"6.14.15"}) - npm WARN notsup Not compatible with your version of node/npm: fabric-network@1.4.18 - npm WARN notsup Unsupported engine for fabric-client@1.4.18: wanted: {"node":"^10.15.3 || ^12.15.0","npm":" ^6.4.1"} (current: {"node":"14.18.1","npm":"6.14.15"}) - npm WARN notsup Not compatible with your version of node/npm: fabric-client@1.4.18 - npm WARN fabcar@1.0.0 No repository field. - - added 473 packages from 1081 contributors and audited 473 packages in 52.778s - - 9 packages are looking for funding - run `npm fund` for details - - found 30 vulnerabilities (14 moderate, 10 high, 6 critical) - run `npm audit fix` to fix them, or `npm audit` for details - exec fabcar from validator container - Wallet path: /app/fabcar/javascript/wallet - Successfully enrolled admin user "admin" and imported it into the wallet - Wallet path: /app/fabcar/javascript/wallet - Successfully registered and enrolled admin user "user1" and imported it into the wallet - Wallet path: /app/fabcar/javascript/wallet - Transaction has been evaluated, result is: [{"Key":"CAR0", "Record":{"colour":"blue","make":"Toyota","model":"Prius","owner":"Tomoko"}},{"Key":"CAR1", "Record":{"colour":"red","make":"Ford","model":"Mustang","owner":"Brad"}},{"Key":"CAR2", "Record":{"colour":"green","make":"Hyundai","model":"Tucson","owner":"Jin Soo"}},{"Key":"CAR3", "Record":{"colour":"yellow","make":"Volkswagen","model":"Passat","owner":"Max"}},{"Key":"CAR4", "Record":{"colour":"black","make":"Tesla","model":"S","owner":"Adriana"}},{"Key":"CAR5", "Record":{"colour":"purple","make":"Peugeot","model":"205","owner":"Michel"}},{"Key":"CAR6", "Record":{"colour":"white","make":"Chery","model":"S22L","owner":"Aarav"}},{"Key":"CAR7", "Record":{"colour":"violet","make":"Fiat","model":"Punto","owner":"Pari"}},{"Key":"CAR8", "Record":{"colour":"indigo","make":"Tata","model":"Nano","owner":"Valeria"}},{"Key":"CAR9", "Record":{"colour":"brown","make":"Holden","model":"Barina","owner":"Shotaro"}}] - Wallet path: /app/fabcar/javascript/wallet - Transaction has been submitted - Wallet path: /app/fabcar/javascript/wallet - Transaction has been evaluated, result is: [{"Key":"CAR0", "Record":{"colour":"blue","make":"Toyota","model":"Prius","owner":"Tomoko"}},{"Key":"CAR1", "Record":{"colour":"red","make":"Ford","model":"Mustang","owner":"Brad"}},{"Key":"CAR12", "Record":{"colour":"Black","make":"Honda","model":"Accord","owner":"Tom"}},{"Key":"CAR2", "Record":{"colour":"green","make":"Hyundai","model":"Tucson","owner":"Jin Soo"}},{"Key":"CAR3", "Record":{"colour":"yellow","make":"Volkswagen","model":"Passat","owner":"Max"}},{"Key":"CAR4", "Record":{"colour":"black","make":"Tesla","model":"S","owner":"Adriana"}},{"Key":"CAR5", "Record":{"colour":"purple","make":"Peugeot","model":"205","owner":"Michel"}},{"Key":"CAR6", "Record":{"colour":"white","make":"Chery","model":"S22L","owner":"Aarav"}},{"Key":"CAR7", "Record":{"colour":"violet","make":"Fiat","model":"Punto","owner":"Pari"}},{"Key":"CAR8", "Record":{"colour":"indigo","make":"Tata","model":"Nano","owner":"Valeria"}},{"Key":"CAR9", "Record":{"colour":"brown","make":"Holden","model":"Barina","owner":"Shotaro"}}] - [user002@earth fabric14-fabcar-testnet]$ - ``` diff --git a/tools/docker/fabric14-fabcar-testnet/script-start-docker.sh b/tools/docker/fabric14-fabcar-testnet/script-start-docker.sh deleted file mode 100755 index 6ffb5b2c0a..0000000000 --- a/tools/docker/fabric14-fabcar-testnet/script-start-docker.sh +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2020-2021 Hyperledger Cactus Contributors -# SPDX-License-Identifier: Apache-2.0 -echo "[process] start docker environment for Fabric testnet" -curl -sSL https://bit.ly/2ysbOFE | bash -s -- 1.4.1 1.4.1 0.4.22 - -if [ -d fabric-samples/fabcar/javascript/wallet ]; then - rm -r fabric-samples/fabcar/javascript/wallet -fi -if [ -d ../../../packages/cactus-plugin-ledger-connector-fabric-socketio/wallet ]; then - rm -r ../../../packages/cactus-plugin-ledger-connector-fabric-socketio/wallet -fi -if [ -d ../../../examples/cartrade/script-test-getFunctions/fabric/wallet ]; then - rm -r ../../../examples/cartrade/script-test-getFunctions/fabric/wallet -fi -#cp -a wallet fabric-samples/fabcar/javascript -#cp -a wallet ../../../examples/cartrade/script-test-getFunctions/fabric -cd fabric-samples/fabcar -./startFabric.sh -cd javascript -npm install -node enrollAdmin.js -node registerUser.js -cp -a wallet ../../../../../../packages/cactus-plugin-ledger-connector-fabric-socketio -cp -a wallet ../../../../../../examples/cartrade/script-test-getFunctions/fabric/wallet \ No newline at end of file diff --git a/tools/docker/fabric14-fabcar-testnet/script-start-docker_newer.patch b/tools/docker/fabric14-fabcar-testnet/script-start-docker_newer.patch deleted file mode 100644 index 18e42fd8b6..0000000000 --- a/tools/docker/fabric14-fabcar-testnet/script-start-docker_newer.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- script-start-docker.sh 2021-11-20 07:21:21.843519314 +0900 -+++ script-start-docker-new.sh 2021-11-20 07:23:43.523522170 +0900 -@@ -1,7 +1,10 @@ - # Copyright 2020-2021 Hyperledger Cactus Contributors - # SPDX-License-Identifier: Apache-2.0 - echo "[process] start docker environment for Fabric testnet" --curl -sSL https://bit.ly/2ysbOFE | bash -s -- 1.4.1 1.4.1 0.4.22 -+curl -sSL https://bit.ly/2ysbOFE | bash -s -- 1.4.12 1.4.9 0.4.22 -+ -+echo "dockerlize fabric-samples" -+patch -p0 < fabric-samples_dockerize.patch - - if [ -d fabric-samples/fabcar/javascript/wallet ]; then - rm -r fabric-samples/fabcar/javascript/wallet -@@ -16,9 +19,25 @@ fi - #cp -a wallet ../../../examples/cartrade/script-test-getFunctions/fabric - cd fabric-samples/fabcar - ./startFabric.sh -+ -#+echo "set proxy for npm in validator container" -#+docker exec -it -w /app/fabcar/javascript validator \ -#+ npm config set proxy $http_proxy -#+docker exec -it -w /app/fabcar/javascript validator \ -#+ npm config set https-proxy $https_proxy -#+docker exec -it -w /app/fabcar/javascript validator \ -#+ npm config set no-proxy $no_proxy -+ -+echo "npm install in validator container" -+docker exec -it -w /app/fabcar/javascript validator npm install -+ -+echo "exec fabcar from validator container" -+docker exec -it -w /app/fabcar/javascript validator node enrollAdmin -+docker exec -it -w /app/fabcar/javascript validator node registerUser -+docker exec -it -w /app/fabcar/javascript validator node query -+docker exec -it -w /app/fabcar/javascript validator node invoke -+docker exec -it -w /app/fabcar/javascript validator node query -+ - cd javascript --npm install --node enrollAdmin.js --node registerUser.js - cp -a wallet ../../../../../../packages/cactus-plugin-ledger-connector-fabric-socketio - cp -a wallet ../../../../../../examples/cartrade/script-test-getFunctions/fabric/wallet diff --git a/tools/docker/fabric14-testnet/README.md b/tools/docker/fabric14-testnet/README.md deleted file mode 100644 index cae0d6f0ac..0000000000 --- a/tools/docker/fabric14-testnet/README.md +++ /dev/null @@ -1,30 +0,0 @@ -# fabric-testnet - -This package enables you to start minimal configured blockchain network with Hyperledger Fabric v1.4.x - -## Starting the network - -```sh -docker-compose up -d -``` - -## Create and joining a channel - -docker-compose starts plain fabric network first, and you need to configure a channel to use. - -* The following command will create a channel named 'mychannel' -```sh -docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/users/Admin@org1.example.com/msp" peer0.org1.example.com peer channel create -o orderer.example.com:7050 -c mychannel -f /etc/hyperledger/configtx/channel.tx -``` -* Run this command to join peer0 from Org1 to that channel -```sh -docker exec -e "CORE_PEER_LOCALMSPID=Org1MSP" -e "CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/users/Admin@org1.example.com/msp" peer0.org1.example.com peer channel join -b mychannel.block -``` - -## Reference - -Please refer to [the original guide](https://xord.one/guide-to-setting-up-your-first-hyperledger-fabric-network-part-1/) which is written by Abdul Sami for further details. - - - - diff --git a/tools/docker/fabric14-testnet/config/Org1MSPanchors.tx b/tools/docker/fabric14-testnet/config/Org1MSPanchors.tx deleted file mode 100644 index 104ee50e05f779149e3447269ac3990a264bd081..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmd;@$;8Fa#mm8@#F<-}oROH9mzpEg%EZ;g#DydfE)>ee?O0HdlbM`Yl9`_;8yp~{FU8Kq3}P@SadWW;r6#7N78OG{;YFDx5Dpg?n`26DW*$&N3(At3 z%_ua35!L7pMxfa>2(t@07~!T%nE}=2C1>Op1*C!uRTq-wlI9XC0CEiU@_~-gORY%E XEyzjLOU};~=r)&v+C!SFV6FoIk7Y?N diff --git a/tools/docker/fabric14-testnet/config/channel.tx b/tools/docker/fabric14-testnet/config/channel.tx deleted file mode 100644 index 85572889f585796a91c162d5f9d7e5f5b919fa45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 320 zcmdxUY=n2ViaXS_ii-U_L%rM>vXat*MN^WLev62!OlqDn~#K*x5R0HJ;0G$q3 z!yc5Hn37slEF><(3sl6(1rtD46JC^Af}#d008^s{HBU+j#XBNGLRCOd)$qg^HnYgO_Mv9bk>S34dQ+AcB%2fsws>Zc#{d~E=(yl}2E7T?R=&OJ9 zSCiju)qnZduKx8ezaGC;d)@nozyJJK{^R$kZ!+Ld80wE1>R%p$kGE!hZ|2RYzk5i1 z=>Y)8e_J!3`u-c2e|;Z(40qbpx9?MbdY}5n{d51W@h@(_v-=>SD#>qif~rZP#6eBi zw*o9lTwCKf=(T)EBm{j)sabZ>TuF*iK}CZee7b z^2pf=I!4lAaDbaVGYA|L&3m1~$YJTVxP=DtWdlL1@sS)fBO`Bh83LTDzO>lN0;9ai zYZAe{yOFn$ku^xLn51p^(59W+h^+}t49EM)017Z?7W4m8X-~4$fDgFH|}1_?-wfNJ|h2?eaw1G}rlX*`5$qiAxKoTk8=g zhM?YT&P`8lsfAJ9D$}EBU696cck4~1{8qC&*-|Xxaj!%;vXSYiXyI^_%PG-VWk>1c zGk{@!cNl%12q;SwVV4V&5$x}_RO{%%VgLRN`GSZPmxsP3HHd|fqSqi12;fPY2P&;W zrItldCut+fZsBDA03|O-zT)SJj_ak2Q=4T(A4|-7VHw$hv7NeQ4x~BKKvUi5$?aOU zE)i}wL(-GBBYL+Qz5^jq6)Av?<+7V&(6(6PjbJ2qTWW>R;sIEdGf09PbyXxhwzK1i z?Ns0pisnLZuV5|j#e)oQ7zM4`jJjDqs)fr6zuI!!Oh)al%Pm02XFm(}un=VaS*Ton z;e|-zwkeXF>Iq3IY>wn`oFHFsXB}UtOiGhkX6`<{w|zRMui%i6A2l7pDIY&-I)YO^ zIvVsuLT@k+b9m$uS<_PlAv_v_HJ^tV>=Rza2oA~u96^Y=`5svkQO1~S zK&gdAp7XNNx|j_to|9dtE2gyI7UMRYEN#&7?NID$+B&=GV3?c>L0b4YNc#{AIwvVS zQxw!VW<-XV8CToVVU?G;)!Z>atI`PU44%-6o zrOs3a$qRqaILqF2KEa-~BV@(Yx=yeVX9%E%53-MjJ+6vRqJisaxO`c7E>v zDR7?)>^Sy9HI>)1p}QC+@tnFi2mCa6m9rQmq~ zE*Lcpz#mCae9QSeWm1{BQGki$BmIi&|e5luB zPDgf*IX0YQ9)s6Wn7CuZ4u^evwJQ!o_d0eo z3B4yB)K}l6zV%>d3w&lL^1t@r^0(eNn1J7SgZln`>c8$k>HO{sYqY+r(F5;Pqm==( zZRf`FW`cU1uGSbdH?ZH+o^b%%AG!lbRj|7+VqAcgRC~wxDXHvef{RgdDs zyKCA~>KHuM%=xBop=Li>322~zMxp3qo^hslYL%z7sAGlG8}b5I=Y-!aQ>EJnai6+B zzZzjg?@MuAQTE0T>?eWm%$8IPGxrVU0JuNbi9l29KNA}yjl9B>6M zXO9N{^J@0hmtTmm>JDK}=8UlVsEV?Z!PkOSHWXKG!5xY31-wn)Wn)N-xy;I}mynw0++|!W$}$!X00QqtkOwhLeNO7Rk79NrKmB2;D9!Qr`soi&MF%i} zl&^SU-8d_io-^6E;mHvl~z633=8?#GE3R)*f4!2tLEA$Lkrt@ zM%vwyJJ>D@Qk16XOjTSl+wl5wthV*eI%(m!Q_&Xdf?{&^i|GiQ_~@h35jgTuMWIQ} zsAy(Xc49FZqzt~yNZW9mv*#UMRKtp84(jZxS$K+$0Q6-k#$c-k79 zvYPY)vhr~F9ORt^D033G)Xz~rnR5!XIqJN$XyI4m>!jes1RN^>I51hwdg_?W?KkzBsM^@?rKEmp$HlXAf@Y z@l739@0`X`pQbL-UEHExNqxdi;Ws|#@*VKWy@coOg!$H!kV&gE^j`1^152 ff}x+J9xjL|YIkyn>zUKSew4Q7{CWX+>Gboz?4-)} diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem deleted file mode 100644 index 4846cd430a..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/ca/ca.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICPTCCAeOgAwIBAgIQHYa6XvIQV6CrNSxmH1juuzAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTIwMDcyNzA1NTAwMFoXDTMwMDcyNTA1NTAwMFowaTELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABEP8pTyLx4luPpw2Qn7tbWHZwbnA -JLLsXeNOR5jJY80jqJEIknWzeqI4zTaS/7nFMkZ7wCwyN0m6YMlj33QmkR2jbTBr -MA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw -DwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg4wUMJ7+bHr+FgMI1xtYV/fVzqc8C -m5pKBqUVZNPH/JIwCgYIKoZIzj0EAwIDSAAwRQIhAKuuW31Bz6HDVhjNWOR9D/Mf -v8+BIAyRv6wDMa/km2S9AiAFXtUPvAH4enf+DVV5TGLmW/DmHlu9DvzCz++RWx8O -ww== ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/ca/e3050c27bf9b1ebf8580c235c6d615fdf573a9cf029b9a4a06a51564d3c7fc92_sk b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/ca/e3050c27bf9b1ebf8580c235c6d615fdf573a9cf029b9a4a06a51564d3c7fc92_sk deleted file mode 100644 index 8e2f0b41a5..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/ca/e3050c27bf9b1ebf8580c235c6d615fdf573a9cf029b9a4a06a51564d3c7fc92_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg/oH4d1ekGTDa8zBd -LzCrxNdU/PqDRf+cU2d6RAhWs2+hRANCAARD/KU8i8eJbj6cNkJ+7W1h2cG5wCSy -7F3jTkeYyWPNI6iRCJJ1s3qiOM02kv+5xTJGe8AsMjdJumDJY990JpEd ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem deleted file mode 100644 index bd5f5c747b..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/msp/admincerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICCzCCAbGgAwIBAgIRALjNlkoBgUP/bgE9p7pr+scwCgYIKoZIzj0EAwIwaTEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt -cGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBaMFYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp -c2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqG -SM49AwEHA0IABGVZ2s80rASLxRmDhRtgBQ1rRM57Ssk+nH1EME1qRThhFqwLXWMa -b3Om2DwGia8eoXtXh02Q+WowmdCV8DgP9uajTTBLMA4GA1UdDwEB/wQEAwIHgDAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIOMFDCe/mx6/hYDCNcbWFf31c6nPApua -SgalFWTTx/ySMAoGCCqGSM49BAMCA0gAMEUCIQD16ERnn1F1wX+cTz0lGDNCvsbV -O9Kha+Mp0LOLFfIJvAIge0mSG+qDXU9BinOGVaUmSjAKkuiKek14BeWXuWUo8YI= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem deleted file mode 100644 index 4846cd430a..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/msp/cacerts/ca.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICPTCCAeOgAwIBAgIQHYa6XvIQV6CrNSxmH1juuzAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTIwMDcyNzA1NTAwMFoXDTMwMDcyNTA1NTAwMFowaTELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABEP8pTyLx4luPpw2Qn7tbWHZwbnA -JLLsXeNOR5jJY80jqJEIknWzeqI4zTaS/7nFMkZ7wCwyN0m6YMlj33QmkR2jbTBr -MA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw -DwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg4wUMJ7+bHr+FgMI1xtYV/fVzqc8C -m5pKBqUVZNPH/JIwCgYIKoZIzj0EAwIDSAAwRQIhAKuuW31Bz6HDVhjNWOR9D/Mf -v8+BIAyRv6wDMa/km2S9AiAFXtUPvAH4enf+DVV5TGLmW/DmHlu9DvzCz++RWx8O -ww== ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem deleted file mode 100644 index c07cbf5015..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/msp/tlscacerts/tlsca.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRDCCAeqgAwIBAgIRALhXXzk+n4uU19foiBwyTEQwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBaMGwxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh -bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARL83zPrZ63w/YURogO -WwVg8TFF2qlsrD+ohMH1JFGfRDEPUb00kXCr9NUjIwp55qwTYaR1uNh24sOiGFB/ -qz0Lo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG -AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIOkv/c9JdrfhfUntSOpl -IXW6N5YYipBHjf9W4UKqyPfZMAoGCCqGSM49BAMCA0gAMEUCIQChY/x+p2tmo2V4 -XOPl/lvFVk5SS8YT0cQ0TejXos951AIgSQRTnHaLpEWwzBTl3paKnDqE91Br/jj0 -R0R1IbEhnT4= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem deleted file mode 100644 index bd5f5c747b..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/admincerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICCzCCAbGgAwIBAgIRALjNlkoBgUP/bgE9p7pr+scwCgYIKoZIzj0EAwIwaTEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt -cGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBaMFYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp -c2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqG -SM49AwEHA0IABGVZ2s80rASLxRmDhRtgBQ1rRM57Ssk+nH1EME1qRThhFqwLXWMa -b3Om2DwGia8eoXtXh02Q+WowmdCV8DgP9uajTTBLMA4GA1UdDwEB/wQEAwIHgDAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIOMFDCe/mx6/hYDCNcbWFf31c6nPApua -SgalFWTTx/ySMAoGCCqGSM49BAMCA0gAMEUCIQD16ERnn1F1wX+cTz0lGDNCvsbV -O9Kha+Mp0LOLFfIJvAIge0mSG+qDXU9BinOGVaUmSjAKkuiKek14BeWXuWUo8YI= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem deleted file mode 100644 index 4846cd430a..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/cacerts/ca.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICPTCCAeOgAwIBAgIQHYa6XvIQV6CrNSxmH1juuzAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTIwMDcyNzA1NTAwMFoXDTMwMDcyNTA1NTAwMFowaTELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABEP8pTyLx4luPpw2Qn7tbWHZwbnA -JLLsXeNOR5jJY80jqJEIknWzeqI4zTaS/7nFMkZ7wCwyN0m6YMlj33QmkR2jbTBr -MA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw -DwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg4wUMJ7+bHr+FgMI1xtYV/fVzqc8C -m5pKBqUVZNPH/JIwCgYIKoZIzj0EAwIDSAAwRQIhAKuuW31Bz6HDVhjNWOR9D/Mf -v8+BIAyRv6wDMa/km2S9AiAFXtUPvAH4enf+DVV5TGLmW/DmHlu9DvzCz++RWx8O -ww== ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/5265a2599df3d02ad11ab15c5e3d5def2c99cfaa83c5380701d701123d432adf_sk b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/5265a2599df3d02ad11ab15c5e3d5def2c99cfaa83c5380701d701123d432adf_sk deleted file mode 100644 index a02e3f3c2b..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/keystore/5265a2599df3d02ad11ab15c5e3d5def2c99cfaa83c5380701d701123d432adf_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgCTDgEvYLntc3HAI8 -wKZompZ3mLOYB8vEKhahMUxLcGShRANCAAQkGq9D/LpZSybGGBhcO+supMZ0yJcY -jUtw7lmuxRfauh6ebE59Hxz7LB9F6hBfdQ8B9l808c8f3PUN8XnY/xia ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem deleted file mode 100644 index 824c836d4b..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/signcerts/orderer.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICDTCCAbOgAwIBAgIRAJQa2xk/ZajPfuC6lbYXdOgwCgYIKoZIzj0EAwIwaTEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt -cGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBaMFgxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp -c2NvMRwwGgYDVQQDExNvcmRlcmVyLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYI -KoZIzj0DAQcDQgAEJBqvQ/y6WUsmxhgYXDvrLqTGdMiXGI1LcO5ZrsUX2roenmxO -fR8c+ywfReoQX3UPAfZfNPHPH9z1DfF52P8YmqNNMEswDgYDVR0PAQH/BAQDAgeA -MAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAg4wUMJ7+bHr+FgMI1xtYV/fVzqc8C -m5pKBqUVZNPH/JIwCgYIKoZIzj0EAwIDSAAwRQIhALffg0YujdfMO6C/CR8I+PHD -7BJ1lhd812TxAlKv3IDJAiBg23alB80H3uz/1aZe/usYRAjyUm4GnLowvm1YzPmL -RA== ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem deleted file mode 100644 index c07cbf5015..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/msp/tlscacerts/tlsca.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRDCCAeqgAwIBAgIRALhXXzk+n4uU19foiBwyTEQwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBaMGwxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh -bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARL83zPrZ63w/YURogO -WwVg8TFF2qlsrD+ohMH1JFGfRDEPUb00kXCr9NUjIwp55qwTYaR1uNh24sOiGFB/ -qz0Lo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG -AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIOkv/c9JdrfhfUntSOpl -IXW6N5YYipBHjf9W4UKqyPfZMAoGCCqGSM49BAMCA0gAMEUCIQChY/x+p2tmo2V4 -XOPl/lvFVk5SS8YT0cQ0TejXos951AIgSQRTnHaLpEWwzBTl3paKnDqE91Br/jj0 -R0R1IbEhnT4= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt deleted file mode 100644 index c07cbf5015..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRDCCAeqgAwIBAgIRALhXXzk+n4uU19foiBwyTEQwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBaMGwxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh -bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARL83zPrZ63w/YURogO -WwVg8TFF2qlsrD+ohMH1JFGfRDEPUb00kXCr9NUjIwp55qwTYaR1uNh24sOiGFB/ -qz0Lo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG -AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIOkv/c9JdrfhfUntSOpl -IXW6N5YYipBHjf9W4UKqyPfZMAoGCCqGSM49BAMCA0gAMEUCIQChY/x+p2tmo2V4 -XOPl/lvFVk5SS8YT0cQ0TejXos951AIgSQRTnHaLpEWwzBTl3paKnDqE91Br/jj0 -R0R1IbEhnT4= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt deleted file mode 100644 index 50316471b7..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICWTCCAf+gAwIBAgIQHB0ec2ys++nZl2ufWmTwMDAKBggqhkjOPQQDAjBsMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xGjAYBgNVBAMTEXRsc2NhLmV4 -YW1wbGUuY29tMB4XDTIwMDcyNzA1NTAwMFoXDTMwMDcyNTA1NTAwMFowWDELMAkG -A1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFu -Y2lzY28xHDAaBgNVBAMTE29yZGVyZXIuZXhhbXBsZS5jb20wWTATBgcqhkjOPQIB -BggqhkjOPQMBBwNCAARsi+5Fw1iUe7Ar9GExJCUZvUicqZAymNhHH2kZsKyc919Y -Bl/S/NoKCZ2RQtrjMRTUOYIHQwbROloyDYwdHfBmo4GWMIGTMA4GA1UdDwEB/wQE -AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIw -ADArBgNVHSMEJDAigCDpL/3PSXa34X1J7UjqZSF1ujeWGIqQR43/VuFCqsj32TAn -BgNVHREEIDAeghNvcmRlcmVyLmV4YW1wbGUuY29tggdvcmRlcmVyMAoGCCqGSM49 -BAMCA0gAMEUCIQDhKuUk2gp9i9COkBMYAj/D2W7Pg6sCqVvVcit7hHApZAIgAMXE -QqPGVJHMmtkguPoci314xCZ2wiLzyRbAXNpJiAQ= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key deleted file mode 100644 index 84eb6e46d7..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/tls/server.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg8U9ulS3jCqYeh3mI -U0D5wIexFlam840cmijj5dCBzvChRANCAARsi+5Fw1iUe7Ar9GExJCUZvUicqZAy -mNhHH2kZsKyc919YBl/S/NoKCZ2RQtrjMRTUOYIHQwbROloyDYwdHfBm ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/tlsca/e92ffdcf4976b7e17d49ed48ea652175ba3796188a90478dff56e142aac8f7d9_sk b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/tlsca/e92ffdcf4976b7e17d49ed48ea652175ba3796188a90478dff56e142aac8f7d9_sk deleted file mode 100644 index 9d33db645c..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/tlsca/e92ffdcf4976b7e17d49ed48ea652175ba3796188a90478dff56e142aac8f7d9_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg0Mg42nXabSIJDbAy -gIOKnyCUwuUZS7KbvBFtBABbdKWhRANCAARL83zPrZ63w/YURogOWwVg8TFF2qls -rD+ohMH1JFGfRDEPUb00kXCr9NUjIwp55qwTYaR1uNh24sOiGFB/qz0L ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem deleted file mode 100644 index c07cbf5015..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/tlsca/tlsca.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRDCCAeqgAwIBAgIRALhXXzk+n4uU19foiBwyTEQwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBaMGwxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh -bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARL83zPrZ63w/YURogO -WwVg8TFF2qlsrD+ohMH1JFGfRDEPUb00kXCr9NUjIwp55qwTYaR1uNh24sOiGFB/ -qz0Lo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG -AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIOkv/c9JdrfhfUntSOpl -IXW6N5YYipBHjf9W4UKqyPfZMAoGCCqGSM49BAMCA0gAMEUCIQChY/x+p2tmo2V4 -XOPl/lvFVk5SS8YT0cQ0TejXos951AIgSQRTnHaLpEWwzBTl3paKnDqE91Br/jj0 -R0R1IbEhnT4= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem deleted file mode 100644 index bd5f5c747b..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/admincerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICCzCCAbGgAwIBAgIRALjNlkoBgUP/bgE9p7pr+scwCgYIKoZIzj0EAwIwaTEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt -cGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBaMFYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp -c2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqG -SM49AwEHA0IABGVZ2s80rASLxRmDhRtgBQ1rRM57Ssk+nH1EME1qRThhFqwLXWMa -b3Om2DwGia8eoXtXh02Q+WowmdCV8DgP9uajTTBLMA4GA1UdDwEB/wQEAwIHgDAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIOMFDCe/mx6/hYDCNcbWFf31c6nPApua -SgalFWTTx/ySMAoGCCqGSM49BAMCA0gAMEUCIQD16ERnn1F1wX+cTz0lGDNCvsbV -O9Kha+Mp0LOLFfIJvAIge0mSG+qDXU9BinOGVaUmSjAKkuiKek14BeWXuWUo8YI= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem deleted file mode 100644 index 4846cd430a..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/cacerts/ca.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICPTCCAeOgAwIBAgIQHYa6XvIQV6CrNSxmH1juuzAKBggqhkjOPQQDAjBpMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEUMBIGA1UEChMLZXhhbXBsZS5jb20xFzAVBgNVBAMTDmNhLmV4YW1w -bGUuY29tMB4XDTIwMDcyNzA1NTAwMFoXDTMwMDcyNTA1NTAwMFowaTELMAkGA1UE -BhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBGcmFuY2lz -Y28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABEP8pTyLx4luPpw2Qn7tbWHZwbnA -JLLsXeNOR5jJY80jqJEIknWzeqI4zTaS/7nFMkZ7wCwyN0m6YMlj33QmkR2jbTBr -MA4GA1UdDwEB/wQEAwIBpjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw -DwYDVR0TAQH/BAUwAwEB/zApBgNVHQ4EIgQg4wUMJ7+bHr+FgMI1xtYV/fVzqc8C -m5pKBqUVZNPH/JIwCgYIKoZIzj0EAwIDSAAwRQIhAKuuW31Bz6HDVhjNWOR9D/Mf -v8+BIAyRv6wDMa/km2S9AiAFXtUPvAH4enf+DVV5TGLmW/DmHlu9DvzCz++RWx8O -ww== ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/2eb7e1c76a1f33c8eba62fcc26781eb78d583d59e6c36b0b66829d706eaa1101_sk b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/2eb7e1c76a1f33c8eba62fcc26781eb78d583d59e6c36b0b66829d706eaa1101_sk deleted file mode 100644 index 7639a0caa2..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/keystore/2eb7e1c76a1f33c8eba62fcc26781eb78d583d59e6c36b0b66829d706eaa1101_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg1LtUtqc3Vk9kmGf+ -vSx9O3zBrJ1q7JD/AkkCdwBZ6nChRANCAARlWdrPNKwEi8UZg4UbYAUNa0TOe0rJ -Ppx9RDBNakU4YRasC11jGm9zptg8BomvHqF7V4dNkPlqMJnQlfA4D/bm ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem deleted file mode 100644 index bd5f5c747b..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/signcerts/Admin@example.com-cert.pem +++ /dev/null @@ -1,13 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICCzCCAbGgAwIBAgIRALjNlkoBgUP/bgE9p7pr+scwCgYIKoZIzj0EAwIwaTEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRcwFQYDVQQDEw5jYS5leGFt -cGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBaMFYxCzAJBgNV -BAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJhbmNp -c2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEGCCqG -SM49AwEHA0IABGVZ2s80rASLxRmDhRtgBQ1rRM57Ssk+nH1EME1qRThhFqwLXWMa -b3Om2DwGia8eoXtXh02Q+WowmdCV8DgP9uajTTBLMA4GA1UdDwEB/wQEAwIHgDAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAIOMFDCe/mx6/hYDCNcbWFf31c6nPApua -SgalFWTTx/ySMAoGCCqGSM49BAMCA0gAMEUCIQD16ERnn1F1wX+cTz0lGDNCvsbV -O9Kha+Mp0LOLFfIJvAIge0mSG+qDXU9BinOGVaUmSjAKkuiKek14BeWXuWUo8YI= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem deleted file mode 100644 index c07cbf5015..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/msp/tlscacerts/tlsca.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRDCCAeqgAwIBAgIRALhXXzk+n4uU19foiBwyTEQwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBaMGwxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh -bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARL83zPrZ63w/YURogO -WwVg8TFF2qlsrD+ohMH1JFGfRDEPUb00kXCr9NUjIwp55qwTYaR1uNh24sOiGFB/ -qz0Lo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG -AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIOkv/c9JdrfhfUntSOpl -IXW6N5YYipBHjf9W4UKqyPfZMAoGCCqGSM49BAMCA0gAMEUCIQChY/x+p2tmo2V4 -XOPl/lvFVk5SS8YT0cQ0TejXos951AIgSQRTnHaLpEWwzBTl3paKnDqE91Br/jj0 -R0R1IbEhnT4= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt deleted file mode 100644 index c07cbf5015..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICRDCCAeqgAwIBAgIRALhXXzk+n4uU19foiBwyTEQwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBaMGwxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRQwEgYDVQQKEwtleGFtcGxlLmNvbTEaMBgGA1UEAxMRdGxzY2EuZXhh -bXBsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARL83zPrZ63w/YURogO -WwVg8TFF2qlsrD+ohMH1JFGfRDEPUb00kXCr9NUjIwp55qwTYaR1uNh24sOiGFB/ -qz0Lo20wazAOBgNVHQ8BAf8EBAMCAaYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG -AQUFBwMBMA8GA1UdEwEB/wQFMAMBAf8wKQYDVR0OBCIEIOkv/c9JdrfhfUntSOpl -IXW6N5YYipBHjf9W4UKqyPfZMAoGCCqGSM49BAMCA0gAMEUCIQChY/x+p2tmo2V4 -XOPl/lvFVk5SS8YT0cQ0TejXos951AIgSQRTnHaLpEWwzBTl3paKnDqE91Br/jj0 -R0R1IbEhnT4= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt deleted file mode 100644 index a2dc1340df..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICLTCCAdOgAwIBAgIRAP3b2EUn7hf+fuf3Se+X0sgwCgYIKoZIzj0EAwIwbDEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xFDASBgNVBAoTC2V4YW1wbGUuY29tMRowGAYDVQQDExF0bHNjYS5l -eGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBaMFYxCzAJ -BgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1TYW4gRnJh -bmNpc2NvMRowGAYDVQQDDBFBZG1pbkBleGFtcGxlLmNvbTBZMBMGByqGSM49AgEG -CCqGSM49AwEHA0IABEap8a/YVIL1vCabrjxohkZOptTYr+cD2H2pZiMfDgLxJAEv -AIIAjPhejM5HPOavYlsynLMEOSxpxpIJMNgUYi6jbDBqMA4GA1UdDwEB/wQEAwIF -oDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAr -BgNVHSMEJDAigCDpL/3PSXa34X1J7UjqZSF1ujeWGIqQR43/VuFCqsj32TAKBggq -hkjOPQQDAgNIADBFAiEAol18ATyAGYEzImJmrR6h/nWANvv+5SeY8vyQciiDKcEC -IEoI1RfQluD+aqfQJTI6WLsdh4YD4qyeQCZz596KJhoZ ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key b/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key deleted file mode 100644 index 718c64e72a..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/ordererOrganizations/example.com/users/Admin@example.com/tls/client.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg3sjlmOl4/VSIvrZv -dXvUPqRTQp5l0bsQzVwUnyR7MuShRANCAARGqfGv2FSC9bwmm648aIZGTqbU2K/n -A9h9qWYjHw4C8SQBLwCCAIz4XozORzzmr2JbMpyzBDksacaSCTDYFGIu ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/ca/078afe32f7ab661cdf884926e0bb522d5caa857bdc2551d03510305e925528d8_sk b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/ca/078afe32f7ab661cdf884926e0bb522d5caa857bdc2551d03510305e925528d8_sk deleted file mode 100644 index 45c942f969..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/ca/078afe32f7ab661cdf884926e0bb522d5caa857bdc2551d03510305e925528d8_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgnEqSFZyBHnuqDLfy -O/EYd3URfrQZW0Z+k+xZfCEw2hOhRANCAASxRBLmdUE7CBxYw5mG/mHQ7InrC710 -0PDpW6zFos9ZdohucB7ZfeBeBgEt2i8QF9ArnqAwPVuoypjyrQVQxAJQ ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem deleted file mode 100644 index ffa06995e2..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/ca/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUDCCAfegAwIBAgIQf1zP3kNypBZSWTKfLyAdZTAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -sUQS5nVBOwgcWMOZhv5h0OyJ6wu9dNDw6VusxaLPWXaIbnAe2X3gXgYBLdovEBfQ -K56gMD1bqMqY8q0FUMQCUKNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG -CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCAH -iv4y96tmHN+ISSbgu1ItXKqFe9wlUdA1EDBeklUo2DAKBggqhkjOPQQDAgNHADBE -AiBL9VTvMTJ1klFcWEfqG10eN9FoO/jAeSMdw5bNUBO1gwIgSKokJvTgLrDM1S+P -j+e6h287EJj5mTm0eMhC5e3ajfg= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index de6d72b1ba..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGDCCAb+gAwIBAgIQJjGB/IVDHhv/lFvc5cjFuzAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE0lBuFz0nE2cbVxsUAgUYiIJaobAqq9CA -G6mILkr/nWWpwOB8wYOcxU2aBfaxxEMzDHhKi0F3+vXJ7BR4Ccun66NNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgB4r+MverZhzf -iEkm4LtSLVyqhXvcJVHQNRAwXpJVKNgwCgYIKoZIzj0EAwIDRwAwRAIgbPYTTYk4 -O2G9nMh7hUnXKF8lr3kl4fOMBOEioE926+cCIFttmtr7N4xBqmOW8UurOI01AOJ3 -G7uw/p0c26wYFZ8p ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem deleted file mode 100644 index ffa06995e2..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUDCCAfegAwIBAgIQf1zP3kNypBZSWTKfLyAdZTAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -sUQS5nVBOwgcWMOZhv5h0OyJ6wu9dNDw6VusxaLPWXaIbnAe2X3gXgYBLdovEBfQ -K56gMD1bqMqY8q0FUMQCUKNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG -CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCAH -iv4y96tmHN+ISSbgu1ItXKqFe9wlUdA1EDBeklUo2DAKBggqhkjOPQQDAgNHADBE -AiBL9VTvMTJ1klFcWEfqG10eN9FoO/jAeSMdw5bNUBO1gwIgSKokJvTgLrDM1S+P -j+e6h287EJj5mTm0eMhC5e3ajfg= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem deleted file mode 100644 index 50f916c83e..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQKcLjRvu0PGQ5HuDmQhiVmzAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUw -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAE7aB6iK6sNKFBe7vZNXl54nYX7//kVXg1/R3PB+0EznrwPW7cfzu5Imk4 -rRQcF/KedNnRPUSxoOMnS9Ttx5QXCaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCA9Q0wHV9TXm8bnFofmcxu+Izlz3asSUFRl9YXfJ2vL5DAKBggqhkjOPQQD -AgNIADBFAiEAl+novXlKWb7DaEaa4POeUNO2pDc4aK88i6Vyc4u+Uf4CIHm0rbyM -XmeRgBNVdcIXI704WYREQeTxMXNRoZhwveMl ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index de6d72b1ba..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGDCCAb+gAwIBAgIQJjGB/IVDHhv/lFvc5cjFuzAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE0lBuFz0nE2cbVxsUAgUYiIJaobAqq9CA -G6mILkr/nWWpwOB8wYOcxU2aBfaxxEMzDHhKi0F3+vXJ7BR4Ccun66NNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgB4r+MverZhzf -iEkm4LtSLVyqhXvcJVHQNRAwXpJVKNgwCgYIKoZIzj0EAwIDRwAwRAIgbPYTTYk4 -O2G9nMh7hUnXKF8lr3kl4fOMBOEioE926+cCIFttmtr7N4xBqmOW8UurOI01AOJ3 -G7uw/p0c26wYFZ8p ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem deleted file mode 100644 index ffa06995e2..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUDCCAfegAwIBAgIQf1zP3kNypBZSWTKfLyAdZTAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -sUQS5nVBOwgcWMOZhv5h0OyJ6wu9dNDw6VusxaLPWXaIbnAe2X3gXgYBLdovEBfQ -K56gMD1bqMqY8q0FUMQCUKNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG -CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCAH -iv4y96tmHN+ISSbgu1ItXKqFe9wlUdA1EDBeklUo2DAKBggqhkjOPQQDAgNHADBE -AiBL9VTvMTJ1klFcWEfqG10eN9FoO/jAeSMdw5bNUBO1gwIgSKokJvTgLrDM1S+P -j+e6h287EJj5mTm0eMhC5e3ajfg= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/38c2102aea4043d808b8780eb4a4c278f79c199439a6e1bb3e169b03e5b97960_sk b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/38c2102aea4043d808b8780eb4a4c278f79c199439a6e1bb3e169b03e5b97960_sk deleted file mode 100644 index 8b5047b1c4..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/keystore/38c2102aea4043d808b8780eb4a4c278f79c199439a6e1bb3e169b03e5b97960_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgJWbM898ZoC5Ftgis -CjX/Q0TqNKvWRZIAkAMx4wc40LihRANCAATt6b7I32Kmb1Ys8MWPNQjiQkLgYKOn -1HXKTqidnT1MqamA8P06HZfcYNWqJfabLfoy7UajemOL+tzg6YE4YlGw ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem deleted file mode 100644 index fe49994ff8..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/signcerts/peer0.org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGDCCAb+gAwIBAgIQOKZ2F8tgGFDui/iXmH+y1DAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDExZwZWVyMC5vcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE7em+yN9ipm9WLPDFjzUI4kJC4GCjp9R1 -yk6onZ09TKmpgPD9Oh2X3GDVqiX2my36Mu1Go3pji/rc4OmBOGJRsKNNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgB4r+MverZhzf -iEkm4LtSLVyqhXvcJVHQNRAwXpJVKNgwCgYIKoZIzj0EAwIDRwAwRAIgUFun7c3z -x1OJQAImkhxvrowk3Fo6VlYkPf33yQB9CdsCIEGWz/Bj+3gMyUAOWlsjcyom3q5i -CAT5cOj/Ny4RTDoG ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem deleted file mode 100644 index 50f916c83e..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQKcLjRvu0PGQ5HuDmQhiVmzAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUw -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAE7aB6iK6sNKFBe7vZNXl54nYX7//kVXg1/R3PB+0EznrwPW7cfzu5Imk4 -rRQcF/KedNnRPUSxoOMnS9Ttx5QXCaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCA9Q0wHV9TXm8bnFofmcxu+Izlz3asSUFRl9YXfJ2vL5DAKBggqhkjOPQQD -AgNIADBFAiEAl+novXlKWb7DaEaa4POeUNO2pDc4aK88i6Vyc4u+Uf4CIHm0rbyM -XmeRgBNVdcIXI704WYREQeTxMXNRoZhwveMl ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt deleted file mode 100644 index 50f916c83e..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQKcLjRvu0PGQ5HuDmQhiVmzAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUw -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAE7aB6iK6sNKFBe7vZNXl54nYX7//kVXg1/R3PB+0EznrwPW7cfzu5Imk4 -rRQcF/KedNnRPUSxoOMnS9Ttx5QXCaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCA9Q0wHV9TXm8bnFofmcxu+Izlz3asSUFRl9YXfJ2vL5DAKBggqhkjOPQQD -AgNIADBFAiEAl+novXlKWb7DaEaa4POeUNO2pDc4aK88i6Vyc4u+Uf4CIHm0rbyM -XmeRgBNVdcIXI704WYREQeTxMXNRoZhwveMl ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt deleted file mode 100644 index 64bef99539..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICZzCCAg6gAwIBAgIRAIwL7KayztnVFlo8zKvm3rQwCgYIKoZIzj0EAwIwdjEL -MAkGA1UEBhMCVVMxEzARBgNVBAgTCkNhbGlmb3JuaWExFjAUBgNVBAcTDVNhbiBG -cmFuY2lzY28xGTAXBgNVBAoTEG9yZzEuZXhhbXBsZS5jb20xHzAdBgNVBAMTFnRs -c2NhLm9yZzEuZXhhbXBsZS5jb20wHhcNMjAwNzI3MDU1MDAwWhcNMzAwNzI1MDU1 -MDAwWjBbMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UE -BxMNU2FuIEZyYW5jaXNjbzEfMB0GA1UEAxMWcGVlcjAub3JnMS5leGFtcGxlLmNv -bTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNPs3yDijG5XWTIaP6SNl6EW0sGA -Pf6i0yczcWV6KksDDzfn4bwd6bI5zGc8+8/CQ+OheotnKUYEewd2tLrtk9WjgZcw -gZQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD -AjAMBgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAID1DTAdX1NebxucWh+ZzG74jOXPd -qxJQVGX1hd8na8vkMCgGA1UdEQQhMB+CFnBlZXIwLm9yZzEuZXhhbXBsZS5jb22C -BXBlZXIwMAoGCCqGSM49BAMCA0cAMEQCID5LHNT6+Z+I0uwTv3Yqc+7BL7anHHGF -Nzb6TANdmTUjAiBI90j1iPpJXcWpNhf3AV6ocC+8QrNbnJZelMWDp8iBCg== ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key deleted file mode 100644 index 22ec07ac8e..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/tls/server.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgqjxXio2yPHKUcGYg -GVcuoPIYTB5hb7kLBi6VS4rCEgmhRANCAATT7N8g4oxuV1kyGj+kjZehFtLBgD3+ -otMnM3FleipLAw835+G8HemyOcxnPPvPwkPjoXqLZylGBHsHdrS67ZPV ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/tlsca/3d434c0757d4d79bc6e71687e6731bbe233973ddab12505465f585df276bcbe4_sk b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/tlsca/3d434c0757d4d79bc6e71687e6731bbe233973ddab12505465f585df276bcbe4_sk deleted file mode 100644 index 85307c10b9..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/tlsca/3d434c0757d4d79bc6e71687e6731bbe233973ddab12505465f585df276bcbe4_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgLjDtW8d/+cSEWnTV -6xfge3IdBxZF1fi+cVlaQl2Q2KyhRANCAATtoHqIrqw0oUF7u9k1eXnidhfv/+RV -eDX9Hc8H7QTOevA9btx/O7kiaTitFBwX8p502dE9RLGg4ydL1O3HlBcJ ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem deleted file mode 100644 index 50f916c83e..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/tlsca/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQKcLjRvu0PGQ5HuDmQhiVmzAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUw -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAE7aB6iK6sNKFBe7vZNXl54nYX7//kVXg1/R3PB+0EznrwPW7cfzu5Imk4 -rRQcF/KedNnRPUSxoOMnS9Ttx5QXCaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCA9Q0wHV9TXm8bnFofmcxu+Izlz3asSUFRl9YXfJ2vL5DAKBggqhkjOPQQD -AgNIADBFAiEAl+novXlKWb7DaEaa4POeUNO2pDc4aK88i6Vyc4u+Uf4CIHm0rbyM -XmeRgBNVdcIXI704WYREQeTxMXNRoZhwveMl ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index de6d72b1ba..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/admincerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGDCCAb+gAwIBAgIQJjGB/IVDHhv/lFvc5cjFuzAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE0lBuFz0nE2cbVxsUAgUYiIJaobAqq9CA -G6mILkr/nWWpwOB8wYOcxU2aBfaxxEMzDHhKi0F3+vXJ7BR4Ccun66NNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgB4r+MverZhzf -iEkm4LtSLVyqhXvcJVHQNRAwXpJVKNgwCgYIKoZIzj0EAwIDRwAwRAIgbPYTTYk4 -O2G9nMh7hUnXKF8lr3kl4fOMBOEioE926+cCIFttmtr7N4xBqmOW8UurOI01AOJ3 -G7uw/p0c26wYFZ8p ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem deleted file mode 100644 index ffa06995e2..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUDCCAfegAwIBAgIQf1zP3kNypBZSWTKfLyAdZTAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -sUQS5nVBOwgcWMOZhv5h0OyJ6wu9dNDw6VusxaLPWXaIbnAe2X3gXgYBLdovEBfQ -K56gMD1bqMqY8q0FUMQCUKNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG -CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCAH -iv4y96tmHN+ISSbgu1ItXKqFe9wlUdA1EDBeklUo2DAKBggqhkjOPQQDAgNHADBE -AiBL9VTvMTJ1klFcWEfqG10eN9FoO/jAeSMdw5bNUBO1gwIgSKokJvTgLrDM1S+P -j+e6h287EJj5mTm0eMhC5e3ajfg= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/c8866a4cd76ed76536afd2f0ab07fa9d032ac91d0d2b7b687efa0fdeb7e7350f_sk b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/c8866a4cd76ed76536afd2f0ab07fa9d032ac91d0d2b7b687efa0fdeb7e7350f_sk deleted file mode 100644 index 5c4c67478c..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/keystore/c8866a4cd76ed76536afd2f0ab07fa9d032ac91d0d2b7b687efa0fdeb7e7350f_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgrftu8BDiIkcxG/Sm -SViwxpfJnzdd84LiTPzHumeyLPihRANCAATSUG4XPScTZxtXGxQCBRiIglqhsCqr -0IAbqYguSv+dZanA4HzBg5zFTZoF9rHEQzMMeEqLQXf69cnsFHgJy6fr ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem deleted file mode 100644 index de6d72b1ba..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/signcerts/Admin@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGDCCAb+gAwIBAgIQJjGB/IVDHhv/lFvc5cjFuzAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE0lBuFz0nE2cbVxsUAgUYiIJaobAqq9CA -G6mILkr/nWWpwOB8wYOcxU2aBfaxxEMzDHhKi0F3+vXJ7BR4Ccun66NNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgB4r+MverZhzf -iEkm4LtSLVyqhXvcJVHQNRAwXpJVKNgwCgYIKoZIzj0EAwIDRwAwRAIgbPYTTYk4 -O2G9nMh7hUnXKF8lr3kl4fOMBOEioE926+cCIFttmtr7N4xBqmOW8UurOI01AOJ3 -G7uw/p0c26wYFZ8p ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem deleted file mode 100644 index 50f916c83e..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQKcLjRvu0PGQ5HuDmQhiVmzAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUw -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAE7aB6iK6sNKFBe7vZNXl54nYX7//kVXg1/R3PB+0EznrwPW7cfzu5Imk4 -rRQcF/KedNnRPUSxoOMnS9Ttx5QXCaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCA9Q0wHV9TXm8bnFofmcxu+Izlz3asSUFRl9YXfJ2vL5DAKBggqhkjOPQQD -AgNIADBFAiEAl+novXlKWb7DaEaa4POeUNO2pDc4aK88i6Vyc4u+Uf4CIHm0rbyM -XmeRgBNVdcIXI704WYREQeTxMXNRoZhwveMl ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt deleted file mode 100644 index 50f916c83e..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQKcLjRvu0PGQ5HuDmQhiVmzAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUw -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAE7aB6iK6sNKFBe7vZNXl54nYX7//kVXg1/R3PB+0EznrwPW7cfzu5Imk4 -rRQcF/KedNnRPUSxoOMnS9Ttx5QXCaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCA9Q0wHV9TXm8bnFofmcxu+Izlz3asSUFRl9YXfJ2vL5DAKBggqhkjOPQQD -AgNIADBFAiEAl+novXlKWb7DaEaa4POeUNO2pDc4aK88i6Vyc4u+Uf4CIHm0rbyM -XmeRgBNVdcIXI704WYREQeTxMXNRoZhwveMl ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt deleted file mode 100644 index 25a2bf75d0..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICOzCCAeGgAwIBAgIQApWDf706gbxmhEL4B2LDXDAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUw -MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZBZG1pbkBvcmcxLmV4YW1wbGUuY29t -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEWPppcnyRiDjnn+7/+T1QJOVJcPK+ -f9b2uJj6ntnG+AAG4tM3F502I8DfXgn0GwwjtIy4ans1Kx1Um8TXKjLwyqNsMGow -DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAID1DTAdX1NebxucWh+ZzG74jOXPdqxJQ -VGX1hd8na8vkMAoGCCqGSM49BAMCA0gAMEUCIQCUcxFSDAZBI+DNTjczXKvOo8/Q -xkjD6DXmU1rAtzAOJQIgNmHqybTYid7ctfODXZZ3vjd6caKXk4oJC0uroBKdqyc= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key deleted file mode 100644 index ddcdde1fb3..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/Admin@org1.example.com/tls/client.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgu11mMqyn9dIl4fIq -vr8S7xKaZK9H7uXIM4i3oMDCTNWhRANCAARY+mlyfJGIOOef7v/5PVAk5Ulw8r5/ -1va4mPqe2cb4AAbi0zcXnTYjwN9eCfQbDCO0jLhqezUrHVSbxNcqMvDK ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem deleted file mode 100644 index 692d95569e..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/admincerts/User1@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGTCCAb+gAwIBAgIQF1u0foENLcoEbCzEj8zE9TAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE/MjAM179Iu3qos09kCBko91+Ct507UGu -iBH62a/ytFB68XK3GUSBNLzZ6R52GEFkmlmXf+DndPXxpWU4wgsdz6NNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgB4r+MverZhzf -iEkm4LtSLVyqhXvcJVHQNRAwXpJVKNgwCgYIKoZIzj0EAwIDSAAwRQIhANVmkloR -yGAhkibNh4DF/8ZGwYfgXMH4aqiZOwjeO63BAiBGUHxbkdyljyqd+iUr4KoWDyjO -5PBGm9NzJG8IsXGbVg== ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem deleted file mode 100644 index ffa06995e2..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/cacerts/ca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICUDCCAfegAwIBAgIQf1zP3kNypBZSWTKfLyAdZTAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBa -MHMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMRwwGgYDVQQD -ExNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE -sUQS5nVBOwgcWMOZhv5h0OyJ6wu9dNDw6VusxaLPWXaIbnAe2X3gXgYBLdovEBfQ -K56gMD1bqMqY8q0FUMQCUKNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1UdJQQWMBQG -CCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1UdDgQiBCAH -iv4y96tmHN+ISSbgu1ItXKqFe9wlUdA1EDBeklUo2DAKBggqhkjOPQQDAgNHADBE -AiBL9VTvMTJ1klFcWEfqG10eN9FoO/jAeSMdw5bNUBO1gwIgSKokJvTgLrDM1S+P -j+e6h287EJj5mTm0eMhC5e3ajfg= ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/553c9f7541165a45f9efb06c132277dfd03f0329a1af3848a2416aa47692b78b_sk b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/553c9f7541165a45f9efb06c132277dfd03f0329a1af3848a2416aa47692b78b_sk deleted file mode 100644 index e7823ff803..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/keystore/553c9f7541165a45f9efb06c132277dfd03f0329a1af3848a2416aa47692b78b_sk +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgwkZDLM6n7adQP+DP -TF0HokDINXsSfK8ph5rQcWyY0HehRANCAAT8yMAzXv0i7eqizT2QIGSj3X4K3nTt -Qa6IEfrZr/K0UHrxcrcZRIE0vNnpHnYYQWSaWZd/4Od09fGlZTjCCx3P ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem deleted file mode 100644 index 692d95569e..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/signcerts/User1@org1.example.com-cert.pem +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICGTCCAb+gAwIBAgIQF1u0foENLcoEbCzEj8zE9TAKBggqhkjOPQQDAjBzMQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEcMBoGA1UEAxMTY2Eu -b3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUwMDBa -MFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1T -YW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcxLmV4YW1wbGUuY29tMFkw -EwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE/MjAM179Iu3qos09kCBko91+Ct507UGu -iBH62a/ytFB68XK3GUSBNLzZ6R52GEFkmlmXf+DndPXxpWU4wgsdz6NNMEswDgYD -VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwKwYDVR0jBCQwIoAgB4r+MverZhzf -iEkm4LtSLVyqhXvcJVHQNRAwXpJVKNgwCgYIKoZIzj0EAwIDSAAwRQIhANVmkloR -yGAhkibNh4DF/8ZGwYfgXMH4aqiZOwjeO63BAiBGUHxbkdyljyqd+iUr4KoWDyjO -5PBGm9NzJG8IsXGbVg== ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem deleted file mode 100644 index 50f916c83e..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/msp/tlscacerts/tlsca.org1.example.com-cert.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQKcLjRvu0PGQ5HuDmQhiVmzAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUw -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAE7aB6iK6sNKFBe7vZNXl54nYX7//kVXg1/R3PB+0EznrwPW7cfzu5Imk4 -rRQcF/KedNnRPUSxoOMnS9Ttx5QXCaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCA9Q0wHV9TXm8bnFofmcxu+Izlz3asSUFRl9YXfJ2vL5DAKBggqhkjOPQQD -AgNIADBFAiEAl+novXlKWb7DaEaa4POeUNO2pDc4aK88i6Vyc4u+Uf4CIHm0rbyM -XmeRgBNVdcIXI704WYREQeTxMXNRoZhwveMl ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt deleted file mode 100644 index 50f916c83e..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/ca.crt +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICVzCCAf2gAwIBAgIQKcLjRvu0PGQ5HuDmQhiVmzAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUw -MDBaMHYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMRkwFwYDVQQKExBvcmcxLmV4YW1wbGUuY29tMR8wHQYD -VQQDExZ0bHNjYS5vcmcxLmV4YW1wbGUuY29tMFkwEwYHKoZIzj0CAQYIKoZIzj0D -AQcDQgAE7aB6iK6sNKFBe7vZNXl54nYX7//kVXg1/R3PB+0EznrwPW7cfzu5Imk4 -rRQcF/KedNnRPUSxoOMnS9Ttx5QXCaNtMGswDgYDVR0PAQH/BAQDAgGmMB0GA1Ud -JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAPBgNVHRMBAf8EBTADAQH/MCkGA1Ud -DgQiBCA9Q0wHV9TXm8bnFofmcxu+Izlz3asSUFRl9YXfJ2vL5DAKBggqhkjOPQQD -AgNIADBFAiEAl+novXlKWb7DaEaa4POeUNO2pDc4aK88i6Vyc4u+Uf4CIHm0rbyM -XmeRgBNVdcIXI704WYREQeTxMXNRoZhwveMl ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt deleted file mode 100644 index ca70a31f25..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.crt +++ /dev/null @@ -1,14 +0,0 @@ ------BEGIN CERTIFICATE----- -MIICOjCCAeGgAwIBAgIQARqZ0MMTMdH+3nxp0prK/zAKBggqhkjOPQQDAjB2MQsw -CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZy -YW5jaXNjbzEZMBcGA1UEChMQb3JnMS5leGFtcGxlLmNvbTEfMB0GA1UEAxMWdGxz -Y2Eub3JnMS5leGFtcGxlLmNvbTAeFw0yMDA3MjcwNTUwMDBaFw0zMDA3MjUwNTUw -MDBaMFsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQH -Ew1TYW4gRnJhbmNpc2NvMR8wHQYDVQQDDBZVc2VyMUBvcmcxLmV4YW1wbGUuY29t -MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAElhqtUjINzdHZX8N+TOoFgGqHhev3 -Npzl4wyMaO5LgNnLycVAba2o7vpT9Pfp1lfjSrMaF0Zsc2TekEWh2i2l6aNsMGow -DgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAM -BgNVHRMBAf8EAjAAMCsGA1UdIwQkMCKAID1DTAdX1NebxucWh+ZzG74jOXPdqxJQ -VGX1hd8na8vkMAoGCCqGSM49BAMCA0cAMEQCIDnENNNvtlJLOnermeypHwWnaePG -Xnpbmn6Zanc3tG67AiA4vkQ6zpveYLwpd2GFxRMmfrb2GSiqju4IoUwdifK8LQ== ------END CERTIFICATE----- diff --git a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key b/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key deleted file mode 100644 index ed0739c7cd..0000000000 --- a/tools/docker/fabric14-testnet/crypto-config/peerOrganizations/org1.example.com/users/User1@org1.example.com/tls/client.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN PRIVATE KEY----- -MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgwGXJz2Kr3T2+5k1v -qN39C4kwuESDn6pzQE55cDGEMfuhRANCAASWGq1SMg3N0dlfw35M6gWAaoeF6/c2 -nOXjDIxo7kuA2cvJxUBtraju+lP09+nWV+NKsxoXRmxzZN6QRaHaLaXp ------END PRIVATE KEY----- diff --git a/tools/docker/fabric14-testnet/docker-compose.yml b/tools/docker/fabric14-testnet/docker-compose.yml deleted file mode 100644 index 3d9d909215..0000000000 --- a/tools/docker/fabric14-testnet/docker-compose.yml +++ /dev/null @@ -1,115 +0,0 @@ -version: "2" -networks: - basic: - -services: - ca.example.com: - container_name: ca.example.com - image: hyperledger/fabric-ca:1.4 - environment: - - FABRIC_CA_HOME=/etc/hyperledger/fabric-ca-server - - FABRIC_CA_SERVER_CA_NAME=ca.example.com - - FABRIC_CA_SERVER_CA_CERTFILE=/etc/hyperledger/fabric-ca-server-config/ca.org1.example.com-cert.pem - - FABRIC_CA_SERVER_CA_KEYFILE=/etc/hyperledger/fabric-ca-server-config/078afe32f7ab661cdf884926e0bb522d5caa857bdc2551d03510305e925528d8_sk - ports: - - "7054:7054" - command: sh -c 'fabric-ca-server start -b admin:adminpw -d' - volumes: - - ./crypto-config/peerOrganizations/org1.example.com/ca/:/etc/hyperledger/fabric-ca-server-config - networks: - - basic - - orderer.example.com: - container_name: orderer.example.com - image: hyperledger/fabric-orderer:1.4 - environment: - - ORDERER_GENERAL_LOGLEVEL=debug - - ORDERER_GENERAL_LISTENADDRESS=0.0.0.0 - - ORDERER_GENERAL_GENESISMETHOD=file - - ORDERER_GENERAL_GENESISFILE=/etc/hyperledger/configtx/genesis.block - - ORDERER_GENERAL_LOCALMSPID=OrdererMSP - - ORDERER_GENERAL_LOCALMSPDIR=/etc/hyperledger/msp/orderer/msp - working_dir: /opt/gopath/src/github.com/hyperledger/fabric/orderer - command: orderer - ports: - - 7050:7050 - volumes: - - ./config/:/etc/hyperledger/configtx - - ./crypto-config/ordererOrganizations/example.com/orderers/orderer.example.com/:/etc/hyperledger/msp/orderer - - ./crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/:/etc/hyperledger/msp/peerOrg1 - networks: - - basic - - peer0.org1.example.com: - container_name: peer0.org1.example.com - image: hyperledger/fabric-peer:1.4 - environment: - - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - - CORE_PEER_ID=peer0.org1.example.com - - CORE_LOGGING_PEER=debug - - CORE_CHAINCODE_LOGGING_LEVEL=DEBUG - - CORE_PEER_LOCALMSPID=Org1MSP - - CORE_PEER_MSPCONFIGPATH=/etc/hyperledger/msp/peer/ - - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 - # # the following setting starts chaincode containers on the same - # # bridge network as the peers - # # https://docs.docker.com/compose/networking/ - - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=${COMPOSE_PROJECT_NAME}_basic - - CORE_LEDGER_STATE_STATEDATABASE=CouchDB - - CORE_LEDGER_STATE_COUCHDBCONFIG_COUCHDBADDRESS=couchdb:5984 - # The CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME and CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD - # provide the credentials for ledger to connect to CouchDB. The username and password must - # match the username and password set for the associated CouchDB. - - CORE_LEDGER_STATE_COUCHDBCONFIG_USERNAME= - - CORE_LEDGER_STATE_COUCHDBCONFIG_PASSWORD= - working_dir: /opt/gopath/src/github.com/hyperledger/fabric - command: peer node start - # command: peer node start --peer-chaincodedev=true - ports: - - 7051:7051 - - 7053:7053 - volumes: - - /var/run/:/host/var/run/ - - ./crypto-config/peerOrganizations/org1.example.com/peers/peer0.org1.example.com/msp:/etc/hyperledger/msp/peer - - ./crypto-config/peerOrganizations/org1.example.com/users:/etc/hyperledger/msp/users - - ./config:/etc/hyperledger/configtx - depends_on: - - orderer.example.com - - couchdb - networks: - - basic - - couchdb: - container_name: couchdb - image: hyperledger/fabric-couchdb:0.4.14 - # Populate the COUCHDB_USER and COUCHDB_PASSWORD to set an admin user and password - # for CouchDB. This will prevent CouchDB from operating in an "Admin Party" mode. - environment: - - COUCHDB_USER= - - COUCHDB_PASSWORD= - ports: - - 5984:5984 - networks: - - basic - - cli: - container_name: cli - image: hyperledger/fabric-tools:1.4 - tty: true - environment: - - GOPATH=/opt/gopath - - CORE_VM_ENDPOINT=unix:///host/var/run/docker.sock - - CORE_LOGGING_LEVEL=DEBUG - - CORE_PEER_ID=cli - - CORE_PEER_ADDRESS=peer0.org1.example.com:7051 - - CORE_PEER_LOCALMSPID=Org1MSP - - CORE_PEER_MSPCONFIGPATH=/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/peerOrganizations/org1.example.com/users/Admin@org1.example.com/msp - - CORE_CHAINCODE_KEEPALIVE=10 - working_dir: /opt/gopath/src/github.com/hyperledger/fabric/peer - command: /bin/bash - volumes: - - /var/run/:/host/var/run/ - - ./chaincode/:/opt/gopath/src/github.com/phr - - ./crypto-config:/opt/gopath/src/github.com/hyperledger/fabric/peer/crypto/ - networks: - - basic diff --git a/tools/docker/indy-testnet/indy_pool/.gitignore b/tools/docker/indy-testnet/indy_pool/.gitignore new file mode 100644 index 0000000000..97f3e31276 --- /dev/null +++ b/tools/docker/indy-testnet/indy_pool/.gitignore @@ -0,0 +1 @@ +sandbox/ diff --git a/tools/docker/indy-testnet/validator/.gitignore b/tools/docker/indy-testnet/validator/.gitignore new file mode 100644 index 0000000000..cedbe03443 --- /dev/null +++ b/tools/docker/indy-testnet/validator/.gitignore @@ -0,0 +1 @@ +cactus_validator_socketio/ diff --git a/yarn.lock b/yarn.lock index ceaec27c0d..4347192c48 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3872,11 +3872,6 @@ dependencies: "@sinonjs/commons" "^1.7.0" -"@socket.io/component-emitter@~3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.0.0.tgz#8863915676f837d9dad7b76f50cb500c1e9422e9" - integrity sha512-2pTGuibAXJswAPJjaKisthqS/NOK5ypG4LYT6tEAV0S/mxW0zOIvYvGK0V8w8+SHxAm6vRMSjqSalFXeBAqs+Q== - "@solidity-parser/parser@^0.11.0": version "0.11.1" resolved "https://registry.yarnpkg.com/@solidity-parser/parser/-/parser-0.11.1.tgz#fa840af64840c930f24a9c82c08d4a092a068add" @@ -3998,6 +3993,14 @@ "@types/connect" "*" "@types/node" "*" +"@types/bytebuffer@^5.0.34": + version "5.0.43" + resolved "https://registry.yarnpkg.com/@types/bytebuffer/-/bytebuffer-5.0.43.tgz#b5259fca1412106bcee0cabfbf7c104846d06738" + integrity sha512-vQnTYvy4LpSojHjKdmg4nXFI1BAiYPvZ/k3ouczZAQnbDprk1xqxJiFmFHyy8y6MuUq3slz5erNMtn6n87uVKw== + dependencies: + "@types/long" "*" + "@types/node" "*" + "@types/bytebuffer@^5.0.40": version "5.0.42" resolved "https://registry.yarnpkg.com/@types/bytebuffer/-/bytebuffer-5.0.42.tgz#1c602a77942d34c5c0879ad75c58d5d8c07dfb3b" @@ -4097,13 +4100,6 @@ dependencies: "@types/bn.js" "*" -"@types/engine.io@*": - version "3.1.7" - resolved "https://registry.yarnpkg.com/@types/engine.io/-/engine.io-3.1.7.tgz#86e541a5dc52fb7e97735383564a6ae4cfe2e8f5" - integrity sha512-qNjVXcrp+1sS8YpRUa714r0pgzOwESdW5UjHL7D/2ZFdBX0BXUXtg1LUrp+ylvqbvMcMWUy73YpRoxPN2VoKAQ== - dependencies: - "@types/node" "*" - "@types/eslint-scope@^3.7.0": version "3.7.1" resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz#8dc390a7b4f9dd9f1284629efce982e41612116e" @@ -4562,27 +4558,6 @@ "@types/mime" "^1" "@types/node" "*" -"@types/socket.io-client@^1.4.36": - version "1.4.36" - resolved "https://registry.yarnpkg.com/@types/socket.io-client/-/socket.io-client-1.4.36.tgz#e4f1ca065f84c20939e9850e70222202bd76ff3f" - integrity sha512-ZJWjtFBeBy1kRSYpVbeGYTElf6BqPQUkXDlHHD4k/42byCN5Rh027f4yARHCink9sKAkbtGZXEAmR0ZCnc2/Ag== - -"@types/socket.io-parser@*": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/socket.io-parser/-/socket.io-parser-3.0.0.tgz#9726d3ab9235757a0a30dd5ccf8975dce54e5e2c" - integrity sha512-Ry/rbTE6HQNL9eu3LpL1Ocup5VexXu1bSSGlSho/IR5LuRc8YvxwSNJ3JxqTltVJEATLbZkMQETSbxfKNgp4Ew== - dependencies: - socket.io-parser "*" - -"@types/socket.io@^2.0.4": - version "2.1.13" - resolved "https://registry.yarnpkg.com/@types/socket.io/-/socket.io-2.1.13.tgz#b6d694234e99956c96ff99e197eda824b6f9dc48" - integrity sha512-JRgH3nCgsWel4OPANkhH8TelpXvacAJ9VeryjuqCDiaVDMpLysd6sbt0dr6Z15pqH3p2YpOT3T1C5vQ+O/7uyg== - dependencies: - "@types/engine.io" "*" - "@types/node" "*" - "@types/socket.io-parser" "*" - "@types/source-list-map@*": version "0.1.2" resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" @@ -6237,7 +6212,7 @@ bn.js@4.11.6: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215" integrity sha1-UzRK2xRhehP26N0s4okF0cC6MhU= -bn.js@4.12.0, bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.0, bn.js@^4.11.1, bn.js@^4.11.6, bn.js@^4.11.8, bn.js@^4.11.9: +bn.js@4.12.0, bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.0, bn.js@^4.11.1, bn.js@^4.11.3, bn.js@^4.11.6, bn.js@^4.11.8, bn.js@^4.11.9: version "4.12.0" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== @@ -6395,6 +6370,11 @@ browser-readablestream-to-it@^1.0.1, browser-readablestream-to-it@^1.0.3: resolved "https://registry.yarnpkg.com/browser-readablestream-to-it/-/browser-readablestream-to-it-1.0.3.tgz#ac3e406c7ee6cdf0a502dd55db33bab97f7fba76" integrity sha512-+12sHB+Br8HIh6VAMVEG5r3UXCyESIgDW7kzk3BjIXa43DVqVwL7GC5TW3jeh+72dtcH99pPVpw0X8i0jt+/kw== +browser-request@~0.3.0: + version "0.3.3" + resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17" + integrity sha1-ns5bWsqJopkyJC4Yv5M975h2zBc= + browser-stdout@1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" @@ -6637,7 +6617,7 @@ byte-size@^7.0.0: resolved "https://registry.yarnpkg.com/byte-size/-/byte-size-7.0.1.tgz#b1daf3386de7ab9d706b941a748dbfc71130dee3" integrity sha512-crQdqyCwhokxwV1UyDzLZanhkugAgft7vt0qbbdt60C6Zf3CAiGmtUCylbtYwrU6loOUw3euGrNtW1J651ot1A== -bytebuffer@~5: +bytebuffer@^5.0.1, bytebuffer@~5: version "5.0.1" resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd" integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0= @@ -7235,6 +7215,15 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4= +cloudant-follow@~0.17.0: + version "0.17.0" + resolved "https://registry.yarnpkg.com/cloudant-follow/-/cloudant-follow-0.17.0.tgz#842513a74e72c440e61dc2b6fd96eedbd9cef38a" + integrity sha512-JQ1xvKAHh8rsnSVBjATLCjz/vQw1sWBGadxr2H69yFMwD7hShUGDwwEefdypaxroUJ/w6t1cSwilp/hRUxEW8w== + dependencies: + browser-request "~0.3.0" + debug "^3.0.0" + request "^2.83.0" + cmd-shim@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-4.1.0.tgz#b3a904a6743e9fede4148c6f3800bf2a08135bdd" @@ -7487,11 +7476,6 @@ component-bind@1.0.0: resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1" integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= -component-emitter@1.2.1: - version "1.2.1" - resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" - integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= - component-emitter@^1.2.1, component-emitter@~1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" @@ -8534,14 +8518,14 @@ debug@4, debug@4.3.2, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, de dependencies: ms "2.1.2" -debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6, debug@^3.2.7: +debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" -debug@~4.1.0, debug@~4.1.1: +debug@~4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== @@ -8897,7 +8881,7 @@ detect-indent@^6.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6" integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA== -detect-libc@^1.0.3: +detect-libc@^1.0.2, detect-libc@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= @@ -9392,18 +9376,6 @@ engine.io-parser@~4.0.0, engine.io-parser@~4.0.1: dependencies: base64-arraybuffer "0.1.4" -engine.io@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b" - integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA== - dependencies: - accepts "~1.3.4" - base64id "2.0.0" - cookie "~0.4.1" - debug "~4.1.0" - engine.io-parser "~2.2.0" - ws "~7.4.2" - engine.io@~4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-4.1.1.tgz#9a8f8a5ac5a5ea316183c489bf7f5b6cf91ace5b" @@ -9494,6 +9466,11 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" +errs@^0.3.2: + version "0.3.2" + resolved "https://registry.yarnpkg.com/errs/-/errs-0.3.2.tgz#798099b2dbd37ca2bc749e538a7c1307d0b50499" + integrity sha1-eYCZstvTfKK8dJ5TinwTB9C1BJk= + es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1: version "1.19.1" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" @@ -10566,6 +10543,18 @@ eyes@0.1.x: resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" integrity sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A= +fabric-ca-client@1.4.18, fabric-ca-client@~1.4.0: + version "1.4.18" + resolved "https://registry.yarnpkg.com/fabric-ca-client/-/fabric-ca-client-1.4.18.tgz#ee9efe0fd4809c6052af19d3a834d6953dbab95a" + integrity sha512-OklEHXkY93Z4voT044ZY0le9iqPLHYMvU44oDd7bZxFkgAixEUPwWOGr9VjfDyeQdZlU9I3IMgtiK5V4SK7XeA== + dependencies: + grpc "1.24.3" + jsrsasign "^8.0.20" + lodash.clone "4.5.0" + url "^0.11.0" + util "^0.10.3" + winston "^2.4.0" + fabric-ca-client@2.2.10: version "2.2.10" resolved "https://registry.yarnpkg.com/fabric-ca-client/-/fabric-ca-client-2.2.10.tgz#fa943b14b3d1d3a32bfb187647f005f48212cb56" @@ -10586,6 +10575,37 @@ fabric-ca-client@2.3.0-snapshot.62: url "^0.11.0" winston "^2.4.5" +fabric-client@1.4.18, fabric-client@~1.4.0: + version "1.4.18" + resolved "https://registry.yarnpkg.com/fabric-client/-/fabric-client-1.4.18.tgz#d124bd57be4763a93478bfdf9231169834cdaf61" + integrity sha512-gs3BkGbl+KAeu0H0s108eTXVcOiwJJaZpRcGqZt3DoiC5rwHipVERx/OH+bmZxoL7o8aaUEw8JkA+SmDqCh5BA== + dependencies: + "@types/bytebuffer" "^5.0.34" + bn.js "^4.11.3" + bytebuffer "^5.0.1" + callsite "^1.0.0" + elliptic "^6.5.4" + fabric-ca-client "1.4.18" + fs-extra "^8.1.0" + grpc "1.24.3" + ignore-walk "^3.0.0" + js-sha3 "^0.7.0" + js-yaml "^3.9.0" + jsrsasign "^8.0.20" + klaw "^2.0.0" + lodash.clone "4.5.0" + long "^4.0.0" + nano "^6.4.4" + nconf "^0.10.0" + promise-settle "^0.3.0" + protobufjs "5.0.3" + sjcl "1.0.7" + tar-stream "2.1.4" + url "^0.11.0" + winston "^2.4.0" + optionalDependencies: + pkcs11js "^1.0.6" + fabric-common@2.2.10: version "2.2.10" resolved "https://registry.yarnpkg.com/fabric-common/-/fabric-common-2.2.10.tgz#265aa1da9069da681ec039f99fd042c04b7cea51" @@ -10644,6 +10664,17 @@ fabric-network@2.3.0-snapshot.62: long "^4.0.0" nano "^9.0.3" +fabric-network@~1.4.0: + version "1.4.18" + resolved "https://registry.yarnpkg.com/fabric-network/-/fabric-network-1.4.18.tgz#fee924144cf9f67df38b1d3a13550fa008ac940c" + integrity sha512-cUyaazfqztBcf5Lh9v59q6e1D1J8cPe1qVSNhk79d9BKkQtMoSIfMEL6UXqyP/yfo2qC3Dhlts8I0Ej51Her4A== + dependencies: + fabric-ca-client "1.4.18" + fabric-client "1.4.18" + nano "^6.4.4" + rimraf "^2.6.2" + winston "^2.4.0" + fabric-protos@2.2.10: version "2.2.10" resolved "https://registry.yarnpkg.com/fabric-protos/-/fabric-protos-2.2.10.tgz#50363d5a22e8acada38b88d48deaea0d40fa1906" @@ -11791,6 +11822,18 @@ grpc@1.24.11: nan "^2.13.2" protobufjs "^5.0.3" +grpc@1.24.3: + version "1.24.3" + resolved "https://registry.yarnpkg.com/grpc/-/grpc-1.24.3.tgz#92efe28dfc1250dca179b8133e40b4f2341473d9" + integrity sha512-EDemzuZTfhM0hgrXqC4PtR76O3t+hTIYJYR5vgiW0yt2WJqo4mhxUqZUirzUQz34Psz7dbLp38C6Cl7Ij2vXRQ== + dependencies: + "@types/bytebuffer" "^5.0.40" + lodash.camelcase "^4.3.0" + lodash.clone "^4.5.0" + nan "^2.13.2" + node-pre-gyp "^0.15.0" + protobufjs "^5.0.3" + grpc_tools_node_protoc_ts@5.3.1: version "5.3.1" resolved "https://registry.yarnpkg.com/grpc_tools_node_protoc_ts/-/grpc_tools_node_protoc_ts-5.3.1.tgz#6f81ab7c8289c801cba3373aa334c13ca8f29618" @@ -12350,7 +12393,7 @@ ignore-by-default@^1.0.1: resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" integrity sha1-SMptcvbGo68Aqa1K5odr44ieKwk= -ignore-walk@3.0.4, ignore-walk@^3.0.3: +ignore-walk@3.0.4, ignore-walk@^3.0.0, ignore-walk@^3.0.1, ignore-walk@^3.0.3: version "3.0.4" resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.4.tgz#c9a09f69b7c7b479a5d74ac1a3c0d4236d2a6335" integrity sha512-PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ== @@ -12489,7 +12532,7 @@ ini@2.0.0, ini@^2.0.0: resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5" integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA== -ini@^1.3.2, ini@^1.3.4, ini@~1.3.0: +ini@^1.3.0, ini@^1.3.2, ini@^1.3.4, ini@~1.3.0: version "1.3.8" resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== @@ -14206,6 +14249,11 @@ js-sha3@^0.5.7: resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.5.7.tgz#0d4ffd8002d5333aabaf4a23eed2f6374c9f28e7" integrity sha1-DU/9gALVMzqrr0oj7tL2N0yfKOc= +js-sha3@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.7.0.tgz#0a5c57b36f79882573b2d84051f8bb85dd1bd63a" + integrity sha512-Wpks3yBDm0UcL5qlVhwW9Jr9n9i4FfeWBFOOXP5puDS/SiudJGhw7DPyBqn3487qD4F0lsC0q3zxink37f7zeA== + js-string-escape@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/js-string-escape/-/js-string-escape-1.0.1.tgz#e2625badbc0d67c7533e9edc1068c587ae4137ef" @@ -14224,7 +14272,7 @@ js-yaml@3.13.1: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@3.14.1, js-yaml@^3.13.1: +js-yaml@3.14.1, js-yaml@^3.13.1, js-yaml@^3.9.0: version "3.14.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== @@ -14472,6 +14520,11 @@ jsrsasign@^10.4.1: resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-10.5.0.tgz#28acf0dbe7565633d306190fd9400c38dd862cb0" integrity sha512-AC1kfL1LJASKBLGv4bLLl+auFlsBajOxEcggL7fn8cp7nMRPhyln3LK/Q9lEDCrxYFU35NGUeFtUBCbasoF2Uw== +jsrsasign@^8.0.20: + version "8.0.24" + resolved "https://registry.yarnpkg.com/jsrsasign/-/jsrsasign-8.0.24.tgz#fc26bac45494caac3dd8f69c1f95847c4bda6c83" + integrity sha512-u45jAyusqUpyGbFc2IbHoeE4rSkoBWQgLe/w99temHenX+GyCz4nflU5sjK7ajU1ffZTezl6le7u43Yjr/lkQg== + jszip@^3.1.3: version "3.7.1" resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9" @@ -14729,6 +14782,13 @@ klaw@^1.0.0: optionalDependencies: graceful-fs "^4.1.9" +klaw@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/klaw/-/klaw-2.1.1.tgz#42b76894701169cc910fd0d19ce677b5fb378af1" + integrity sha1-QrdolHARacyRD9DRnOZ3tfs3ivE= + dependencies: + graceful-fs "^4.1.9" + kleur@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" @@ -15110,7 +15170,7 @@ lodash.camelcase@^4.3.0: resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= -lodash.clone@^4.5.0: +lodash.clone@4.5.0, lodash.clone@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clone/-/lodash.clone-4.5.0.tgz#195870450f5a13192478df4bc3d23d2dea1907b6" integrity sha1-GVhwRQ9aExkkeN9Lw9I9LeoZB7Y= @@ -15150,6 +15210,11 @@ lodash.isboolean@^3.0.3: resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6" integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY= +lodash.isempty@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.isempty/-/lodash.isempty-4.4.0.tgz#6f86cbedd8be4ec987be9aaf33c9684db1b31e7e" + integrity sha1-b4bL7di+TsmHvpqvM8loTbGzHn4= + lodash.isequal@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" @@ -16209,6 +16274,17 @@ nano-json-stream-parser@^0.1.2: resolved "https://registry.yarnpkg.com/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz#0cc8f6d0e2b622b479c40d499c46d64b755c6f5f" integrity sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18= +nano@^6.4.4: + version "6.4.4" + resolved "https://registry.yarnpkg.com/nano/-/nano-6.4.4.tgz#4902a095e5186cfb23612c78826ea755b76fadf0" + integrity sha512-7sldMrZI1ZH8QE29PnzohxLfR67WNVzMKLa7EMl3x9Hr+0G+YpOUCq50qZ9G66APrjcb0Of2BTOZLNBCutZGag== + dependencies: + cloudant-follow "~0.17.0" + debug "^2.2.0" + errs "^0.3.2" + lodash.isempty "^4.4.0" + request "^2.85.0" + nano@^9.0.3: version "9.0.5" resolved "https://registry.yarnpkg.com/nano/-/nano-9.0.5.tgz#2b767819f612907a3ac09b21f2929d4097407262" @@ -16277,6 +16353,16 @@ natural-compare@^1.4.0: resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= +nconf@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/nconf/-/nconf-0.10.0.tgz#da1285ee95d0a922ca6cee75adcf861f48205ad2" + integrity sha512-fKiXMQrpP7CYWJQzKkPPx9hPgmq+YLDyxcG9N8RpiE9FoCkCbzD0NyW0YhE3xn3Aupe7nnDeIx4PFzYehpHT9Q== + dependencies: + async "^1.4.0" + ini "^1.3.0" + secure-keys "^1.0.0" + yargs "^3.19.0" + nconf@^0.11.2: version "0.11.3" resolved "https://registry.yarnpkg.com/nconf/-/nconf-0.11.3.tgz#4ee545019c53f1037ca57d696836feede3c49163" @@ -16287,7 +16373,7 @@ nconf@^0.11.2: secure-keys "^1.0.0" yargs "^16.1.1" -needle@^2.5.2: +needle@^2.5.0, needle@^2.5.2: version "2.9.1" resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz#22d1dffbe3490c2b83e301f7709b6736cd8f2684" integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ== @@ -16463,6 +16549,22 @@ node-polyfill-webpack-plugin@1.1.4: util "^0.12.4" vm-browserify "^1.1.2" +node-pre-gyp@^0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz#c2fc383276b74c7ffa842925241553e8b40f1087" + integrity sha512-7QcZa8/fpaU/BKenjcaeFF9hLz2+7S9AqyXFhlH/rilsQ/hPZKK32RtR5EQHJElgu+q5RfbJ34KriI79UWaorA== + dependencies: + detect-libc "^1.0.2" + mkdirp "^0.5.3" + needle "^2.5.0" + nopt "^4.0.1" + npm-packlist "^1.1.6" + npmlog "^4.0.2" + rc "^1.2.7" + rimraf "^2.6.1" + semver "^5.3.0" + tar "^4.4.2" + node-preload@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/node-preload/-/node-preload-0.2.1.tgz#c03043bb327f417a18fee7ab7ee57b408a144301" @@ -16588,7 +16690,7 @@ normalize-url@^6.0.1, normalize-url@^6.1.0: resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A== -npm-bundled@^1.1.1: +npm-bundled@^1.0.1, npm-bundled@^1.1.1: version "1.1.2" resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1" integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ== @@ -16638,6 +16740,15 @@ npm-package-arg@8.1.5, npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-packa semver "^7.3.4" validate-npm-package-name "^3.0.0" +npm-packlist@^1.1.6: + version "1.4.8" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" + integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" + npm-normalize-package-bin "^1.0.1" + npm-packlist@^2.1.4: version "2.2.2" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-2.2.2.tgz#076b97293fa620f632833186a7a8f65aaa6148c8" @@ -16721,7 +16832,7 @@ npm-watch@0.11.0: nodemon "^2.0.7" through2 "^4.0.2" -npmlog@^4.0.1, npmlog@^4.1.2: +npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -18492,6 +18603,16 @@ proto3-json-serializer@^0.1.1: resolved "https://registry.yarnpkg.com/proto3-json-serializer/-/proto3-json-serializer-0.1.5.tgz#c619769a59dc7fd8adf4e6c5060b9bf3039c8304" integrity sha512-G395jcZkgNXNeS+6FGqd09TsXeoCs9wmBWByDiwFy7Yd7HD8pyfyvf6q+rGh7PhT4AshRpG4NowzoKYUtkNjKg== +protobufjs@5.0.3, protobufjs@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17" + integrity sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA== + dependencies: + ascli "~1" + bytebuffer "~5" + glob "^7.0.5" + yargs "^3.10.0" + protobufjs@6.11.2, protobufjs@^6.10.0, protobufjs@^6.10.2, protobufjs@^6.11.2: version "6.11.2" resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b" @@ -18511,16 +18632,6 @@ protobufjs@6.11.2, protobufjs@^6.10.0, protobufjs@^6.10.2, protobufjs@^6.11.2: "@types/node" ">=13.7.0" long "^4.0.0" -protobufjs@^5.0.3: - version "5.0.3" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-5.0.3.tgz#e4dfe9fb67c90b2630d15868249bcc4961467a17" - integrity sha512-55Kcx1MhPZX0zTbVosMQEO5R6/rikNXd9b6RQK4KSPcrSIIwoXTtebIczUrXlwaSrbz4x8XUVThGPob1n8I4QA== - dependencies: - ascli "~1" - bytebuffer "~5" - glob "^7.0.5" - yargs "^3.10.0" - protoc-gen-ts@0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/protoc-gen-ts/-/protoc-gen-ts-0.6.0.tgz#a2c3e117ae43fa7821a7f46dee25fb6d20d12565" @@ -19243,7 +19354,7 @@ request@2.88.0: tunnel-agent "^0.6.0" uuid "^3.3.2" -request@^2.79.0, request@^2.87.0, request@^2.88.0, request@^2.88.2: +request@^2.79.0, request@^2.83.0, request@^2.85.0, request@^2.87.0, request@^2.88.0, request@^2.88.2: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -19449,7 +19560,7 @@ rfdc@^1.1.2, rfdc@^1.1.4: resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b" integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA== -rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.3: +rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -20091,6 +20202,11 @@ sisteransi@^1.0.5: resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed" integrity sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg== +sjcl@1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/sjcl/-/sjcl-1.0.7.tgz#32b365a50dc9bba26b88ba3c9df8ea34217d9f45" + integrity sha1-MrNlpQ3Ju6JriLo8nfjqNCF9n0U= + sjcl@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/sjcl/-/sjcl-1.0.8.tgz#f2ec8d7dc1f0f21b069b8914a41a8f236b0e252a" @@ -20169,11 +20285,6 @@ snapdragon@^0.8.1: source-map-resolve "^0.5.0" use "^3.1.0" -socket.io-adapter@~1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9" - integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g== - socket.io-adapter@~2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.1.0.tgz#edc5dc36602f2985918d631c1399215e97a1b527" @@ -20184,7 +20295,20 @@ socket.io-adapter@~2.3.1: resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.3.2.tgz#039cd7c71a52abad984a6d57da2c0b7ecdd3c289" integrity sha512-PBZpxUPYjmoogY0aoaTmo1643JelsaS1CiAwNjRVdrI0X9Seuc19Y2Wife8k88avW6haG8cznvwbubAZwH4Mtg== -socket.io-client@2.4.0, socket.io-client@^2.1.0: +socket.io-client@4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.1.3.tgz#236daa642a9f229932e00b7221e843bf74232a62" + integrity sha512-hISFn6PDpgDifVUiNklLHVPTMv1LAk8poHArfIUdXa+gKgbr0MZbAlquDFqCqsF30yBqa+jg42wgos2FK50BHA== + dependencies: + "@types/component-emitter" "^1.2.10" + backo2 "~1.0.2" + component-emitter "~1.3.0" + debug "~4.3.1" + engine.io-client "~5.1.2" + parseuri "0.0.6" + socket.io-parser "~4.0.4" + +socket.io-client@^2.1.0: version "2.4.0" resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35" integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ== @@ -20201,27 +20325,6 @@ socket.io-client@2.4.0, socket.io-client@^2.1.0: socket.io-parser "~3.3.0" to-array "0.1.4" -socket.io-client@4.1.3: - version "4.1.3" - resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-4.1.3.tgz#236daa642a9f229932e00b7221e843bf74232a62" - integrity sha512-hISFn6PDpgDifVUiNklLHVPTMv1LAk8poHArfIUdXa+gKgbr0MZbAlquDFqCqsF30yBqa+jg42wgos2FK50BHA== - dependencies: - "@types/component-emitter" "^1.2.10" - backo2 "~1.0.2" - component-emitter "~1.3.0" - debug "~4.3.1" - engine.io-client "~5.1.2" - parseuri "0.0.6" - socket.io-parser "~4.0.4" - -socket.io-parser@*: - version "4.1.1" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.1.1.tgz#0ad53d980781cab1eabe320417d8480c0133e62d" - integrity sha512-USQVLSkDWE5nbcY760ExdKaJxCE65kcsG/8k5FDGZVVxpD1pA7hABYXYkCUvxUuYYh/+uQw0N/fvBzfT8o07KA== - dependencies: - "@socket.io/component-emitter" "~3.0.0" - debug "~4.3.1" - socket.io-parser@~3.3.0: version "3.3.2" resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6" @@ -20231,15 +20334,6 @@ socket.io-parser@~3.3.0: debug "~3.1.0" isarray "2.0.1" -socket.io-parser@~3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a" - integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A== - dependencies: - component-emitter "1.2.1" - debug "~4.1.0" - isarray "2.0.1" - socket.io-parser@~4.0.3, socket.io-parser@~4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0" @@ -20264,18 +20358,6 @@ socket.io@4.1.3: socket.io-adapter "~2.3.1" socket.io-parser "~4.0.4" -socket.io@^2.0.4: - version "2.4.1" - resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.1.tgz#95ad861c9a52369d7f1a68acf0d4a1b16da451d2" - integrity sha512-Si18v0mMXGAqLqCVpTxBa8MGqriHGQh8ccEOhmsmNS3thNCGBwO8WGrwMibANsWtQQ5NStdZwHqZR3naJVFc3w== - dependencies: - debug "~4.1.0" - engine.io "~3.5.0" - has-binary2 "~1.0.2" - socket.io-adapter "~1.1.0" - socket.io-client "2.4.0" - socket.io-parser "~3.4.0" - socket.io@^3.1.0: version "3.1.2" resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-3.1.2.tgz#06e27caa1c4fc9617547acfbb5da9bc1747da39a" @@ -21256,6 +21338,17 @@ tar-fs@~2.0.1: pump "^3.0.0" tar-stream "^2.0.0" +tar-stream@2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.4.tgz#c4fb1a11eb0da29b893a5b25476397ba2d053bfa" + integrity sha512-o3pS2zlG4gxr67GmFYBLlq+dM8gyRGUOvsrHclSkvtVtQbjV0s/+ZE8OpICbaj8clrX3tjeHngYGP7rweaBnuw== + dependencies: + bl "^4.0.3" + end-of-stream "^1.4.1" + fs-constants "^1.0.0" + inherits "^2.0.3" + readable-stream "^3.1.1" + tar-stream@2.2.0, tar-stream@^2.0.0, tar-stream@^2.1.4: version "2.2.0" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287" @@ -21280,7 +21373,7 @@ tar-stream@^1.5.2: to-buffer "^1.1.1" xtend "^4.0.0" -tar@^4.0.2, tar@^4.4.12: +tar@^4.0.2, tar@^4.4.12, tar@^4.4.2: version "4.4.19" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3" integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA== @@ -22353,6 +22446,13 @@ util.promisify@^1.0.1: has-symbols "^1.0.1" object.getownpropertydescriptors "^2.1.1" +util@^0.10.3: + version "0.10.4" + resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901" + integrity sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A== + dependencies: + inherits "2.0.3" + util@^0.12.0, util@^0.12.4: version "0.12.4" resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253" @@ -23630,7 +23730,7 @@ winston-transport@^4.4.0: readable-stream "^2.3.7" triple-beam "^1.2.0" -winston@^2.4.5: +winston@^2.4.0, winston@^2.4.5: version "2.4.5" resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.5.tgz#f2e431d56154c4ea765545fc1003bd340c95b59a" integrity sha512-TWoamHt5yYvsMarGlGEQE59SbJHqGsZV8/lwC+iCcGeAe0vUaOh+Lv6SYM17ouzC/a/LB1/hz/7sxFBtlu1l4A== @@ -24058,7 +24158,7 @@ yargs@^17.0.0, yargs@^17.1.1: y18n "^5.0.5" yargs-parser "^20.2.2" -yargs@^3.10.0: +yargs@^3.10.0, yargs@^3.19.0: version "3.32.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995" integrity sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=