Skip to content

Feat peer dev mode tls v3 #608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
+825 −97
Closed

Feat peer dev mode tls v3 #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
eb714a0
Merge pull request #1 from hyperledger-labs/main
dpereowei Aug 23, 2025
67c281a
Merge branch 'hyperledger-labs:main' into main
dpereowei Aug 29, 2025
31acd86
Merge branch 'hyperledger-labs:main' into main
dpereowei Sep 5, 2025
e2a6c01
Merge branch 'hyperledger-labs:main' into main
dpereowei Sep 10, 2025
6d2f91f
feat-test-peer-dev-mode-with-tls
dpereowei Sep 17, 2025
ad44813
fix-trace failure point
dpereowei Sep 17, 2025
a357037
fix-start chaincode with mounted tls certs
dpereowei Sep 19, 2025
df27f7f
fix-start chaincode with mounted tls certs
dpereowei Sep 19, 2025
0306c03
fix-start chaincode with mounted tls certs
dpereowei Sep 19, 2025
b38bc5a
Merge branch 'main' into feat-peer-dev-mode-tls-v3
dpereowei Sep 19, 2025
88231a3
fix-package cc before invoke
dpereowei Sep 20, 2025
a2cec36
temp-handover for support
dpereowei Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ e2e/__tmp__
e2e-network/docker/*.logs
e2e-network/docker/*.tmpdir
fablo-target
generators
generators*
node_modules
.idea
.vscode
Expand Down
27 changes: 22 additions & 5 deletions e2e-network/docker/test-07-v2-peer-dev-mode.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ dumpLogs() {
networkDown() {
sleep 2
(for name in $(docker ps --format '{{.Names}}'); do dumpLogs "$name"; done)
# remove .env
rm "$NODECHAINCODE/.env"
(cd "$TEST_TMP" && "$FABLO_HOME/fablo.sh" down)
}

Expand Down Expand Up @@ -53,12 +55,25 @@ networkUp
# check if all nodes are ready
waitForContainer "orderer0.group1.orderer.example.com" "Beginning to serve requests"
waitForContainer "db.ca.org1.example.com" "database system is ready to accept connections"
waitForContainer "ca.org1.example.com" "Listening on http://0.0.0.0:7054"
waitForContainer "ca.org1.example.com" "Listening on https://0.0.0.0:7054"
waitForContainer "couchdb.peer0.org1.example.com" "Apache CouchDB has started. Time to relax."
waitForContainer "peer0.org1.example.com" "Joining gossip network of channel my-channel1 with 1 organizations"
waitForChaincode "peer0.org1.example.com" "my-channel1" "chaincode1" "0.0.1"

echo "All nodes are ready"

# create .env in chaincode directory
cat >"$NODECHAINCODE/.env" <<EOF
CHAINCODE_ID=chaincode1:0.0.1
CORE_CHAINCODE_LOGGING_LEVEL=debug
CORE_CHAINCODE_LOGGING_SHIM=debug
CORE_PEER_TLS_ENABLED=true
CORE_PEER_TLS_ROOTCERT_FILE="$TEST_TMP/fablo-target/fabric-config/crypto-config/ccaas/devmode-peer0.org1.example.com-chaincode1/tls/peer.crt"
CORE_TLS_CLIENT_CERT_PATH="$TEST_TMP/fablo-target/fabric-config/crypto-config/ccaas/devmode-peer0.org1.example.com-chaincode1/tls/client.crt"
CORE_TLS_CLIENT_KEY_PATH="$TEST_TMP/fablo-target/fabric-config/crypto-config/ccaas/devmode-peer0.org1.example.com-chaincode1/tls/client.key"
CORE_PEER_LOCALMSPID=Org1MSP
EOF

echo "Starting chaincode in development mode..."
# make sure nodemon is installed and Install if not
if ! command -v nodemon &> /dev/null; then
Expand All @@ -68,11 +83,13 @@ else
echo "nodemon is already installed"
fi
# start the chaincode in development mode
(cd "$NODECHAINCODE" && npm i && npm run start:watch) &

(cd "$NODECHAINCODE" && npm i && npm run start:dev:tls) &
CHAINCODE_PID=$!
sleep 5

# Test simple chaincode
expectInvoke "peer0.org1.example.com" "my-channel1" "chaincode1" \
'{"Args":["KVContract:put", "name", "Willy Wonka"]}' \
'{\"success\":\"OK\"}'
'{\"success\":\"OK\"}'

# kill background chaincode process
kill $CHAINCODE_PID
38 changes: 19 additions & 19 deletions e2e/__snapshots__/extendConfig.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1729,10 +1729,10 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.j
"fabloRest": {
"address": "fablo-rest.org1.example.com",
"discoverySslTargetNameOverrides": "",
"discoveryTlsCaCertFiles": "",
"discoveryUrls": "grpc://peer0.org1.example.com:7041",
"discoveryTlsCaCertFiles": "/crypto/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt",
"discoveryUrls": "grpcs://peer0.org1.example.com:7041",
"fabricCaName": "ca.org1.example.com",
"fabricCaUrl": "http://ca.org1.example.com:7054",
"fabricCaUrl": "https://ca.org1.example.com:7054",
"logging": {
"error": "console",
"info": "console",
Expand Down Expand Up @@ -1871,10 +1871,10 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.j
"fabloRest": {
"address": "fablo-rest.org1.example.com",
"discoverySslTargetNameOverrides": "",
"discoveryTlsCaCertFiles": "",
"discoveryUrls": "grpc://peer0.org1.example.com:7041",
"discoveryTlsCaCertFiles": "/crypto/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt",
"discoveryUrls": "grpcs://peer0.org1.example.com:7041",
"fabricCaName": "ca.org1.example.com",
"fabricCaUrl": "http://ca.org1.example.com:7054",
"fabricCaUrl": "https://ca.org1.example.com:7054",
"logging": {
"error": "console",
"info": "console",
Expand Down Expand Up @@ -1960,10 +1960,10 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.j
"fabloRest": {
"address": "fablo-rest.org1.example.com",
"discoverySslTargetNameOverrides": "",
"discoveryTlsCaCertFiles": "",
"discoveryUrls": "grpc://peer0.org1.example.com:7041",
"discoveryTlsCaCertFiles": "/crypto/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt",
"discoveryUrls": "grpcs://peer0.org1.example.com:7041",
"fabricCaName": "ca.org1.example.com",
"fabricCaUrl": "http://ca.org1.example.com:7054",
"fabricCaUrl": "https://ca.org1.example.com:7054",
"logging": {
"error": "console",
"info": "console",
Expand Down Expand Up @@ -2052,10 +2052,10 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.j
"fabloRest": {
"address": "fablo-rest.org1.example.com",
"discoverySslTargetNameOverrides": "",
"discoveryTlsCaCertFiles": "",
"discoveryUrls": "grpc://peer0.org1.example.com:7041",
"discoveryTlsCaCertFiles": "/crypto/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt",
"discoveryUrls": "grpcs://peer0.org1.example.com:7041",
"fabricCaName": "ca.org1.example.com",
"fabricCaUrl": "http://ca.org1.example.com:7054",
"fabricCaUrl": "https://ca.org1.example.com:7054",
"logging": {
"error": "console",
"info": "console",
Expand Down Expand Up @@ -2194,10 +2194,10 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.j
"fabloRest": {
"address": "fablo-rest.org1.example.com",
"discoverySslTargetNameOverrides": "",
"discoveryTlsCaCertFiles": "",
"discoveryUrls": "grpc://peer0.org1.example.com:7041",
"discoveryTlsCaCertFiles": "/crypto/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt",
"discoveryUrls": "grpcs://peer0.org1.example.com:7041",
"fabricCaName": "ca.org1.example.com",
"fabricCaUrl": "http://ca.org1.example.com:7054",
"fabricCaUrl": "https://ca.org1.example.com:7054",
"logging": {
"error": "console",
"info": "console",
Expand Down Expand Up @@ -2237,7 +2237,7 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.j
"fabloConfig": "<absolute path>",
},
"peerDevMode": true,
"tls": false,
"tls": true,
"tools": {},
},
"hooks": {
Expand Down Expand Up @@ -2437,10 +2437,10 @@ exports[`extend config samples/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.j
"fabloRest": {
"address": "fablo-rest.org1.example.com",
"discoverySslTargetNameOverrides": "",
"discoveryTlsCaCertFiles": "",
"discoveryUrls": "grpc://peer0.org1.example.com:7041",
"discoveryTlsCaCertFiles": "/crypto/org1.example.com/peers/peer0.org1.example.com/tls/ca.crt",
"discoveryUrls": "grpcs://peer0.org1.example.com:7041",
"fabricCaName": "ca.org1.example.com",
"fabricCaUrl": "http://ca.org1.example.com:7054",
"fabricCaUrl": "https://ca.org1.example.com:7054",
"logging": {
"error": "console",
"info": "console",
Expand Down
Loading