Standardize usage of CCID instead of CCNAME across samples

munapower · munapower · commit 43d92388c006 · 2025-08-05T11:18:25.000-04:00
Improve simple-testing-network to check if monitoring should be enabled or not.

Fix docker tag issues and add note to readme

Small fix to minikube readme and CA image

Signed-off-by: munapower &lt;mmunaro@hotmail.com&gt;
diff --git a/ecc/Makefile b/ecc/Makefile
@@ -73,7 +73,7 @@ docker-fpc-app: docker-boilerplate-ecc
 		exit 1;\
 	fi
 	echo "\033[1;33mWARNING: overriding $(DOCKER_IMAGE) docker image\033[0m"
-	$(DOCKER) build $(DOCKER_BUILD_OPTS) -t $(DOCKER_IMAGE):$(FPC_VERSION) -f Dockerfile.fpc-app \
+	$(DOCKER) build $(DOCKER_BUILD_OPTS) -t $(DOCKER_IMAGE):$(FPC_VERSION) -t $(DOCKER_IMAGE):latest -f Dockerfile.fpc-app \
                 --build-arg HW_EXTENSION=$(HW_EXTENSION)\
  		$(DOCKER_ENCLAVE_SO_PATH)
 
diff --git a/ecc_go/README.md b/ecc_go/README.md
@@ -122,8 +122,8 @@ Here provide a collection of useful developer notes which may help you while dev
 ### Kill hanging containers
 
 ```bash
-docker kill $(docker ps -a -q --filter ancestor=fpc/ercc --filter ancestor=fpc/fpc-auction-go)
-docker rm $(docker ps -a -q --filter ancestor=fpc/ercc --filter ancestor=fpc/fpc-auction-go)
+docker kill $(docker ps -a -q --filter ancestor=fpc/ercc --filter ancestor=fpc/auction-go)
+docker rm $(docker ps -a -q --filter ancestor=fpc/ercc --filter ancestor=fpc/auction-go)
 ```
 
 More to come ...
diff --git a/ecc_go/build.mk b/ecc_go/build.mk
@@ -37,7 +37,7 @@ ecc_dependencies:
 	# which forces ecc to always be built
 
 env:
-	echo "export CC_NAME=$(CC_NAME)" > details.env
+	echo "export CC_ID=$(CC_ID)" > details.env
 	echo "export FPC_MRENCLAVE=$(shell cat mrenclave)" >> details.env
 	echo "export FPC_CHAINCODE_IMAGE=$(DOCKER_IMAGE):latest" >> details.env
 
diff --git a/integration/go_chaincode/auction/topology.go b/integration/go_chaincode/auction/topology.go
@@ -24,7 +24,7 @@ import (
 
 const (
 	ChaincodeName      = "auction"
-	ChaincodeImageName = "fpc/fpc-auction-go"
+	ChaincodeImageName = "fpc/auction-go"
 	ChaincodeImageTag  = "latest"
 )
 
diff --git a/integration/go_chaincode/kv_test/topology.go b/integration/go_chaincode/kv_test/topology.go
@@ -22,7 +22,7 @@ import (
 
 const (
 	ChaincodeName      = "kv-test"
-	ChaincodeImageName = "fpc/fpc-kv-test-go"
+	ChaincodeImageName = "fpc/kv-test-go"
 	ChaincodeImageTag  = "latest"
 )
 
diff --git a/samples/application/simple-cli-go/Makefile b/samples/application/simple-cli-go/Makefile
@@ -16,5 +16,6 @@ DOCKER_BUILD_OPTS += --no-cache
 docker:
 	$(DOCKER) build $(DOCKER_BUILD_OPTS) \
     	-t fpc/fpcclient:$(FPC_VERSION) \
+		-t fpc/fpcclient:latest \
     	-f Dockerfile \
     	.
diff --git a/samples/application/simple-cli-go/cmd/root.go b/samples/application/simple-cli-go/cmd/root.go
@@ -64,7 +64,7 @@ func initConfig() {
 		CorePeerTLSKeyFile:      getStrEnv("CORE_PEER_TLS_KEY_FILE"),
 		CorePeerTLSRootCertFile: getStrEnv("CORE_PEER_TLS_ROOTCERT_FILE"),
 		OrdererCA:               getStrEnv("ORDERER_CA"),
-		ChaincodeId:             getStrEnv("CC_NAME"),
+		ChaincodeId:             getStrEnv("CC_ID"),
 		ChannelId:               getStrEnv("CHANNEL_NAME"),
 		GatewayConfigPath:       getStrEnv("GATEWAY_CONFIG"),
 	}
diff --git a/samples/chaincode/auction-go/Makefile b/samples/chaincode/auction-go/Makefile
@@ -6,4 +6,4 @@
 TOP = ../../..
 include $(TOP)/ecc_go/build.mk
 
-CC_NAME ?= fpc-auction-go
+CC_NAME ?= auction-go
diff --git a/samples/chaincode/cc-tools-demo/README.md b/samples/chaincode/cc-tools-demo/README.md
@@ -157,7 +157,7 @@ Create a `Makefile` (i.e., `touch $FPC_PATH/samples/chaincode/cc-tools-demo/Make
 TOP = ../../..
 include $(TOP)/ecc_go/build.mk
 
-CC_NAME ?= fpc-cc-tools-demo
+CC_NAME ?= cc-tools-demo
 
 EGO_CONFIG_FILE = $(FPC_PATH)/samples/chaincode/cc-tools-demo/ccToolsDemoEnclave.json
 ECC_MAIN_FILES=$(FPC_PATH)/samples/chaincode/cc-tools-demo
@@ -200,10 +200,10 @@ Edit the file of the error `$FPC_PATH/samples/chaincode/cc-tools-demo/vendor/git
 
 ```
 
-After building again, you can check that the `fpc/fpc-cc-tools-demo` image exists in your local docker registry using:
+After building again, you can check that the `fpc/cc-tools-demo` image exists in your local docker registry using:
 
 ```bash
-docker images | grep fpc-cc-tools-demo
+docker images | grep cc-tools-demo
 ```
 
 ## Time to test!
@@ -288,7 +288,7 @@ cd $FPC_PATH/samples/application/simple-cli-go
 make
 
 # export fpcclient settings
-export CC_NAME=cc-tools-demo
+export CC_ID=cc-tools-demo
 export CHANNEL_NAME=mychannel
 export CORE_PEER_ADDRESS=localhost:7051
 export CORE_PEER_ID=peer0.org1.example.com
diff --git a/samples/chaincode/cc-tools-demo/setup.sh b/samples/chaincode/cc-tools-demo/setup.sh
diff --git a/samples/chaincode/cc-tools-demo/testTutorial.sh b/samples/chaincode/cc-tools-demo/testTutorial.sh
@@ -31,7 +31,7 @@ docker system prune
 sleep 5
 
 cd $FPC_PATH/samples/chaincode/cc-tools-demo/
-export CC_NAME=fpc-cc-tools-demo
+export CC_NAME=cc-tools-demo
 make
 
 # - run docker images | grep fpc-cc-tools-demo to make sure of the image 
@@ -67,7 +67,7 @@ cd $FPC_PATH/samples/application/simple-cli-go
 make
 
 # export fpcclient settings
-export CC_NAME=cc-tools-demo
+export CC_ID=cc-tools-demo
 export CHANNEL_NAME=mychannel
 export CORE_PEER_ADDRESS=localhost:7051
 export CORE_PEER_ID=peer0.org1.example.com
diff --git a/samples/chaincode/echo-go/Makefile b/samples/chaincode/echo-go/Makefile
@@ -6,4 +6,4 @@
 TOP = ../../..
 include $(TOP)/ecc_go/build.mk
 
-CC_NAME ?= fpc-echo-go
+CC_NAME ?= echo-go
diff --git a/samples/chaincode/kv-test-go/Makefile b/samples/chaincode/kv-test-go/Makefile
@@ -6,4 +6,4 @@
 TOP = ../../..
 include $(TOP)/ecc_go/build.mk
 
-CC_NAME ?= fpc-kv-test-go
+CC_NAME ?= kv-test-go
diff --git a/samples/chaincode/secret-keeper-go/Makefile b/samples/chaincode/secret-keeper-go/Makefile
@@ -5,7 +5,7 @@
 
 TOP = ../../..
 
-CC_NAME ?= fpc-secret-keeper-go
+CC_NAME ?= secret-keeper-go
 
 # Define paths for cmd subdirectories
 DEFAULT= cmd/naive/main.go
diff --git a/samples/chaincode/simple-asset-go/README.md b/samples/chaincode/simple-asset-go/README.md
@@ -161,7 +161,7 @@ Create a `Makefile` (i.e., `touch $FPC_PATH/samples/chaincode/simple-asset-go/Ma
 TOP = ../../..
 include $(TOP)/ecc_go/build.mk
 
-CC_NAME ?= fpc-simple-asset-go
+CC_NAME ?= simple-asset-go
 ```
 
 Please make sure that in the file above the variable `TOP` points to the FPC root directory (i.e., `$FPC_PATH`).
@@ -171,7 +171,7 @@ In `$FPC_PATH/samples/chaincode/simple-asset-go` directory, to build the chainco
 make
 ```
 
-After building, you can check that the `fpc/fpc-simple-asset-go` image exists in your local docker registry using:
+After building, you can check that the `fpc/simple-asset-go` image exists in your local docker registry using:
 ```bash
 docker images | grep simple-asset-go
 ```
@@ -234,9 +234,9 @@ make ercc-ecc-start
 You should see now four containers running (i.e., `peer0org1_simple-asset-go_ccaas`, `peer0org2_simple-asset-go_ccaas`, `peer0org1_ercc_ccaas`, and `peer0org2_ercc_ccaas`). 
 
 ### Invoke simple asset
-Open a new terminal and connect to the `fpc-development-go-support` container by running
+Open a new terminal and connect to the `fpc-development-main` container by running
  ```bash
-docker exec -it fpc-development-go-support /bin/bash
+docker exec -it fpc-development-main /bin/bash
 ```
 
 ```bash
@@ -249,7 +249,7 @@ cd $FPC_PATH/samples/application/simple-cli-go
 make
 
 # export fpcclient settings
-export CC_NAME=simple-asset-go
+export CC_ID=simple-asset-go
 export CHANNEL_NAME=mychannel
 export CORE_PEER_ADDRESS=localhost:7051
 export CORE_PEER_ID=peer0.org1.example.com
diff --git a/samples/demos/hlgf22/README.md b/samples/demos/hlgf22/README.md
@@ -27,7 +27,7 @@ fpc "github.com/hyperledger/fabric-private-chaincode/ecc_go/chaincode"
 In order to build the chaincode, we will use the tools provided by FPC.
 Note that you can use the FPC docker-based development environment.
 
-Set `CC_NAME ?= fpc-basic-asset-transfer` inside the `Makefile`.
+Set `CC_NAME ?= basic-asset-transfer` inside the `Makefile`.
 
 ```bash
 make
diff --git a/samples/deployment/fabric-smart-client/the-simple-testing-network/README.md b/samples/deployment/fabric-smart-client/the-simple-testing-network/README.md
@@ -38,7 +38,7 @@ make run
 go run . network start --path ./testdata
 ```
 Once the network is up and running, use a second terminal to interact with the network.
-Uou can shut down the network using `CTRL+C`.
+You can shut down the network using `CTRL+C`.
 
 To clean up the network you can run `make clean` or `go run . network clean --path ./testdata`.
 
@@ -58,7 +58,7 @@ cd $FPC_PATH/samples/application/simple-cli-go
 make
 
 # Run the following script and source the resulting environment variables
-export CC_NAME=kv-test-go
+export CC_ID=kv-test-go
 $FPC_PATH/samples/deployment/fabric-smart-client/the-simple-testing-network/env.sh Org1
 source Org1.env
 
@@ -75,7 +75,10 @@ You can switch the user by running `./env.sh` either with `Org1` or `Org2`.
 
 The test network includes a Hyperledger Blockchain explorer that you can use to see what is happening on the network.
 By default, you can reach the Blockchain Explorer Dashboard via your browser on `http://localhost:8080` with username `admin` and password `admin`.
-
+You can disable adding it by setting the `BE_INSTALL` environment variable to `NO`.
+```bash
+export BE_INSTALL=NO
+```
 
 ### Troubleshooting
 
diff --git a/samples/deployment/fabric-smart-client/the-simple-testing-network/env.sh b/samples/deployment/fabric-smart-client/the-simple-testing-network/env.sh
@@ -11,8 +11,8 @@ if [[ -z "${FPC_PATH}" ]]; then
   exit 1
 fi
 
-if [[ -z "${CC_NAME}" ]]; then
-  echo "Error: CC_NAME not set"
+if [[ -z "${CC_ID}" ]]; then
+  echo "Error: CC_ID not set"
   exit 1
 fi
 
@@ -40,7 +40,7 @@ echo "export CONF_PATH=$FPC_PATH/samples/deployment/fabric-smart-client/the-simp
 echo "export GATEWAY_CONFIG=\$CONF_PATH/peerOrganizations/${ORG,,}.example.com/connections.yaml" >> ${ORG}.env
 echo "export ORG_PATH=\$CONF_PATH/peerOrganizations/${ORG,,}.example.com" >> ${ORG}.env
 echo "export ORDERER_PATH=\$CONF_PATH/ordererOrganizations/example.com" >> ${ORG}.env
-#echo "export CC_NAME=${CC_NAME}" >> ${ORG}.env
+#echo "export CC_ID=${CC_ID}" >> ${ORG}.env
 echo "export CHANNEL_NAME=testchannel" >> ${ORG}.env
 echo "export CORE_PEER_ADDRESS=${ADDR}" >> ${ORG}.env
 echo "export CORE_PEER_ID=${PEER_ID}" >> ${ORG}.env
diff --git a/samples/deployment/fabric-smart-client/the-simple-testing-network/topology.go b/samples/deployment/fabric-smart-client/the-simple-testing-network/topology.go
@@ -20,10 +20,11 @@ import (
 
 const (
 	defaultChaincodeName      = "kv-test-go"
-	defaultChaincodeImageName = "fpc/fpc-kv-test-go"
+	defaultChaincodeImageName = "fpc/kv-test-go"
 	defaultChaincodeImageTag  = "latest"
 	defaultChaincodeMRENCLAVE = "fakeMRENCLAVE"
 	defaultLoggingSpec        = "info"
+	defaultBlockchainExplorer = "YES"
 )
 
 func Fabric() []api.Topology {
@@ -41,16 +42,18 @@ func Fabric() []api.Topology {
 	// bring hyperledger explorer into the game
 	// you can reach it http://localhost:8080 with admin:admin
 	monitoringTopology := monitoring.NewTopology()
-	monitoringTopology.EnableHyperledgerExplorer()
-
+	if config.blockchainExplorer == "YES" {
+		monitoringTopology.EnableHyperledgerExplorer()
+	}
 	return []api.Topology{fabricTopology, fsc.NewTopology(), monitoringTopology}
 }
 
 type config struct {
-	loggingSpec    string
-	chaincodeName  string
-	chaincodeImage string
-	fpcOptions     []func(chaincode *topology.ChannelChaincode)
+	loggingSpec        string
+	chaincodeName      string
+	chaincodeImage     string
+	blockchainExplorer string
+	fpcOptions         []func(chaincode *topology.ChannelChaincode)
 }
 
 // setup prepares a config helper struct, containing some additional configuration that can be injected via environment variables
@@ -69,12 +72,18 @@ func setup() *config {
 		config.chaincodeName = defaultChaincodeName
 	}
 
-	// export FPC_CHAINCODE_IMAGE=fpc/fpc-kv-test-go:latest
+	// export FPC_CHAINCODE_IMAGE=fpc/kv-test-go:latest
 	config.chaincodeImage = os.Getenv("FPC_CHAINCODE_IMAGE")
 	if len(config.chaincodeImage) == 0 {
 		config.chaincodeImage = fmt.Sprintf("%s:%s", defaultChaincodeImageName, defaultChaincodeImageTag)
 	}
 
+	// export BE_INSTALL=YES or NO
+	config.blockchainExplorer = os.Getenv("BE_INSTALL")
+	if len(config.blockchainExplorer) == 0 {
+		config.blockchainExplorer = defaultBlockchainExplorer
+	}
+
 	// get mrenclave
 	mrenclave := os.Getenv("FPC_MRENCLAVE")
 	if len(mrenclave) == 0 {
diff --git a/samples/deployment/k8s/README.md b/samples/deployment/k8s/README.md
@@ -31,7 +31,7 @@ make -C $FPC_PATH/utils/docker pull
 make -C $FPC_PATH/utils/docker build
 ```
 
-Then we build the FPC components including the FPC Enclave Registry docker image.
+Then, once we are in the FPC dev environment, we build the FPC components including the FPC Enclave Registry docker image.
 ```bash
 make -C $FPC_PATH build
 make -C $FPC_PATH/ercc docker
@@ -70,7 +70,10 @@ Note that this commands create a docker image with the name `fpc/fpcclient`.
 
 ## Minikube on Mac
 
-This tutorial is heavily inspired by the article [How to implement Hyperledger Fabric External Chaincodes within a Kubernetes cluster](https://medium.com/swlh/how-to-implement-hyperledger-fabric-external-chaincodes-within-a-kubernetes-cluster-fd01d7544523) by Pau Aragonès Sabaté. Thank you!
+For the following steps you do not need to be in the FPC dev environment. This tutorial is heavily inspired by the article [How to implement Hyperledger Fabric External Chaincodes within a Kubernetes cluster](https://medium.com/swlh/how-to-implement-hyperledger-fabric-external-chaincodes-within-a-kubernetes-cluster-fd01d7544523) by Pau Aragonès Sabaté. Thank you!
+
+Note:
+You might run into issues if your Mac has an M1 processor or above. If you install minikube using brew it might detect your environment as amd64 and not arm64, install the arm64 binaries. Another point is that if you have set DOCKER_DEFAULT_PLATFORM=linux/amd64 that will also generate errors. Set it in the terminal to linux/arm64 and your minikube/docker environment should start.
 
 ### Start minikube
 
@@ -132,6 +135,7 @@ Use the `generate.sh` script to create the crypto material for the peer organiza
 script create the genesis block, the client connection profiles, and packages the FPC Chaincode and the FPC Enclave Registry.
 ```bash
 cd $FPC_PATH/samples/deployment/k8s
+export TEST_CC_PATH=$FPC_PATH/samples/chaincode/echo
 ./generate.sh
 ````
 
@@ -220,7 +224,7 @@ Note that the `core.yaml` we have already loaded in the configmap contains the n
 For each Org:
 ```bash
 # copy cli_orgX pod name from above and enter container
-kubectl exec -it cli_orgX_pod_name bash -n hyperledge
+kubectl exec -it cli_orgX_pod_name bash -n hyperledger
 
 # for all peers of orgX we install ercc and fpccc
 export ERCC=ercc-peer0-$ORG; export FPCCC=fpccc-peer0-$ORG
@@ -308,7 +312,7 @@ Alternatively, you can also run `just run fpcclient-org1` to enter the container
 kubectl delete --all all --namespace=hyperledger
 ```
 
-Alternatively, you can also call `just down`.
+Alternatively, you can also call `just down`. If you plan on restarting the environment it is best that you also run `minikube ssh -- sudo rm -rf /tmp/storage`. 
 
 
 ## Troubleshooting
diff --git a/samples/deployment/k8s/org1/org1-ca-deployment.yaml b/samples/deployment/k8s/org1/org1-ca-deployment.yaml
@@ -39,7 +39,7 @@ spec:
               value: "true"
             - name: FABRIC_CA_SERVER_TLS_KEYFILE
               value: /etc/hyperledger/fabric-ca-server-config/priv_sk
-          image: hyperledger/fabric-ca:1.4.7
+          image: hyperledger/fabric-ca:1.5.12
           name: ca-org1
           ports:
             - containerPort: 7054
diff --git a/samples/deployment/k8s/org1/org1-fpcclient-deployment.yaml b/samples/deployment/k8s/org1/org1-fpcclient-deployment.yaml
@@ -25,7 +25,7 @@ spec:
         - env:
             - name: SGX_MODE
               value: SIM
-            - name: CC_NAME
+            - name: CC_ID
               value: fpccc
             - name: CHANNEL_NAME
               value: mychannel
diff --git a/samples/deployment/k8s/org2/org2-ca-deployment.yaml b/samples/deployment/k8s/org2/org2-ca-deployment.yaml
@@ -39,7 +39,7 @@ spec:
               value: "true"
             - name: FABRIC_CA_SERVER_TLS_KEYFILE
               value: /etc/hyperledger/fabric-ca-server-config/priv_sk
-          image: hyperledger/fabric-ca:1.4.7
+          image: hyperledger/fabric-ca:1.5.12
           name: ca-org2
           ports:
             - containerPort: 7054
diff --git a/samples/deployment/k8s/org2/org2-fpcclient-deployment.yaml b/samples/deployment/k8s/org2/org2-fpcclient-deployment.yaml
@@ -25,7 +25,7 @@ spec:
         - env:
             - name: SGX_MODE
               value: SIM
-            - name: CC_NAME
+            - name: CC_ID
               value: fpccc
             - name: CHANNEL_NAME
               value: mychannel
diff --git a/samples/deployment/k8s/org3/org3-ca-deployment.yaml b/samples/deployment/k8s/org3/org3-ca-deployment.yaml
@@ -39,7 +39,7 @@ spec:
               value: "true"
             - name: FABRIC_CA_SERVER_TLS_KEYFILE
               value: /etc/hyperledger/fabric-ca-server-config/priv_sk
-          image: hyperledger/fabric-ca:1.4.7
+          image: hyperledger/fabric-ca:1.5.12
           name: ca-org3
           ports:
             - containerPort: 7054
diff --git a/samples/deployment/k8s/org3/org3-fpcclient-deployment.yaml b/samples/deployment/k8s/org3/org3-fpcclient-deployment.yaml
@@ -25,7 +25,7 @@ spec:
         - env:
             - name: SGX_MODE
               value: SIM
-            - name: CC_NAME
+            - name: CC_ID
               value: fpccc
             - name: CHANNEL_NAME
               value: mychannel
diff --git a/samples/deployment/test-network/README.md b/samples/deployment/test-network/README.md
diff --git a/samples/deployment/test-network/compose.yaml b/samples/deployment/test-network/compose.yaml
diff --git a/samples/deployment/test-network/test.sh b/samples/deployment/test-network/test.sh

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`
`25`	`25`	`const (`
`26`	`26`	`ChaincodeName = "auction"`
`27`		`- ChaincodeImageName = "fpc/fpc-auction-go"`
	`27`	`+ ChaincodeImageName = "fpc/auction-go"`
`28`	`28`	`ChaincodeImageTag = "latest"`
`29`	`29`	`)`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`
`23`	`23`	`const (`
`24`	`24`	`ChaincodeName = "kv-test"`
`25`		`- ChaincodeImageName = "fpc/fpc-kv-test-go"`
	`25`	`+ ChaincodeImageName = "fpc/kv-test-go"`
`26`	`26`	`ChaincodeImageTag = "latest"`
`27`	`27`	`)`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,6 @@ DOCKER_BUILD_OPTS += --no-cache`
`16`	`16`	`docker:`
`17`	`17`	`$(DOCKER) build $(DOCKER_BUILD_OPTS) \`
`18`	`18`	`-t fpc/fpcclient:$(FPC_VERSION) \`
	`19`	`+ -t fpc/fpcclient:latest \`
`19`	`20`	`-f Dockerfile \`
`20`	`21`	`.`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func initConfig() {`
`64`	`64`	`CorePeerTLSKeyFile: getStrEnv("CORE_PEER_TLS_KEY_FILE"),`
`65`	`65`	`CorePeerTLSRootCertFile: getStrEnv("CORE_PEER_TLS_ROOTCERT_FILE"),`
`66`	`66`	`OrdererCA: getStrEnv("ORDERER_CA"),`
`67`		`- ChaincodeId: getStrEnv("CC_NAME"),`
	`67`	`+ ChaincodeId: getStrEnv("CC_ID"),`
`68`	`68`	`ChannelId: getStrEnv("CHANNEL_NAME"),`
`69`	`69`	`GatewayConfigPath: getStrEnv("GATEWAY_CONFIG"),`
`70`	`70`	`}`