Skip to content

Support chaincodes with the same name but on different channels #607

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

Merged
dzikowski merged 11 commits into from
Sep 22, 2025
+2,784 −1,250
Merged

Support chaincodes with the same name but on different channels #607

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
56fb457
fix code and remove unwanted file
OsamaRab3 Sep 12, 2025
5e60e56
update
OsamaRab3 Sep 12, 2025
144b3e5
refactor:applied reviewer suggestions and removed redundant logic
OsamaRab3 Sep 12, 2025
958fce6
fixs fail on test-01
OsamaRab3 Sep 15, 2025
aa34e68
update snaps
OsamaRab3 Sep 15, 2025
269d224
fix issue test-04
OsamaRab3 Sep 15, 2025
33a32df
simplifi duplicate item and update chaincode label
OsamaRab3 Sep 17, 2025
6e3dbb5
update snaps
OsamaRab3 Sep 17, 2025
c349309
fix ccass start container
OsamaRab3 Sep 17, 2025
a9ef15f
rename: update sample config name to reflect two chaincodes
OsamaRab3 Sep 19, 2025
47515c6
fix rename on test-04
OsamaRab3 Sep 19, 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
8 changes: 4 additions & 4 deletions e2e/__snapshots__/extendConfig.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2865,7 +2865,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.
"requiredPeerCount": 1,
},
],
"privateDataConfigFile": "collections/or-policy-chaincode.json",
"privateDataConfigFile": "collections/my-channel1-or-policy-chaincode.json",
"version": "0.0.1",
},
{
Expand Down Expand Up @@ -3275,7 +3275,7 @@ exports[`extend config samples/fablo-config-hlf2-2orgs-2chaincodes-private-data.
"requiredPeerCount": 1,
},
],
"privateDataConfigFile": "collections/and-policy-chaincode.json",
"privateDataConfigFile": "collections/my-channel1-and-policy-chaincode.json",
"version": "0.0.1",
},
],
Expand Down Expand Up @@ -9491,7 +9491,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-1chaincode-raft-ccaas.json
"name": "chaincode1",
"peerChaincodeInstances": [
{
"containerName": "ccaas-peer0.org1.example.com-chaincode1",
"containerName": "ccaas-peer0.org1.example.com-my-channel1-chaincode1",
"orgDomain": "org1.example.com",
"peerAddress": "peer0.org1.example.com",
"port": 17041,
Expand Down Expand Up @@ -12216,7 +12216,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
"name": "chaincode1",
"peerChaincodeInstances": [
{
"containerName": "ccaas-peer0.org1.example.com-chaincode1",
"containerName": "ccaas-peer0.org1.example.com-my-channel1-chaincode1",
"orgDomain": "org1.example.com",
"peerAddress": "peer0.org1.example.com",
"port": 17041,
Expand Down
11 changes: 8 additions & 3 deletions e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-k8s.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,9 +337,11 @@ buildAndInstallChaincode() {
local CHAINCODE_LANG="$3"
local CHAINCODE_DIR_PATH="$4"
local CHAINCODE_VERSION="$5"
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
local USER="$6"
local CONFIG="$7"
local CHANNEL_NAME="$8"

local CHAINCODE_LABEL="\${CHANNEL_NAME}-\${CHAINCODE_NAME}_$CHAINCODE_VERSION"

if [ -z "$CHAINCODE_NAME" ]; then
echo "Error: chaincode name is not provided"
Expand Down Expand Up @@ -375,6 +377,8 @@ approveChaincode() {
local MSP="$7"
local SEQUENCE

local CHAINCODE_LABEL="\${CHANNEL_NAME}-\${CHAINCODE_NAME}_$CHAINCODE_VERSION"

SEQUENCE="$(kubectl hlf chaincode querycommitted --channel="$CHANNEL_NAME" --config="$CONFIG" --user="$USER" --peer="$PEER" 2>/dev/null | awk '{print $3}' | sed -n '2p')"
SEQUENCE=$((SEQUENCE + 1))

Expand Down Expand Up @@ -408,16 +412,17 @@ approveChaincode() {
}

commitChaincode() {

local CHAINCODE_NAME="$1"
local PEER=$2
local PEER="$2"
local CHAINCODE_VERSION="$3"
local CHANNEL_NAME="$4"
local USER="$5"
local CONFIG="$6"
local MSP="$7"
local SEQUENCE

local CHAINCODE_LABEL="\${CHANNEL_NAME}-\${CHAINCODE_NAME}_$CHAINCODE_VERSION"

SEQUENCE="$(kubectl hlf chaincode querycommitted --channel="$CHANNEL_NAME" --config="$CONFIG" --user="$USER" --peer="$PEER" 2>/dev/null | awk '{print $3}' | sed -n '2p')"
SEQUENCE=$((SEQUENCE + 1))

Expand Down
18 changes: 11 additions & 7 deletions e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2522,8 +2522,9 @@ chaincodePackageCCaaS() {
inputLog "CONTAINER_PORT: $CONTAINER_PORT"
inputLog "TLS_ENABLED: $TLS_ENABLED"

# Use the same container name logic as startCCaaSContainer
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
local CHANNEL_NAME=$9
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}-\${CHAINCODE_NAME}"
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
local PACKAGE_DIR="./chaincode-packages/ccaas_$ACTUAL_CONTAINER_NAME"

mkdir -p "$PACKAGE_DIR"
Expand Down Expand Up @@ -2572,8 +2573,9 @@ chaincodeInstall() {
local PEER_ADDRESS=$2
local CHAINCODE_NAME=$3
local CHAINCODE_VERSION=$4
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
local CA_CERT=$5
local CHANNEL_NAME=$5
local CA_CERT=$6
local CHAINCODE_LABEL="\${CHANNEL_NAME}-\${CHAINCODE_NAME}_$CHAINCODE_VERSION"

echo "Installing chaincode $CHAINCODE_NAME..."
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
Expand All @@ -2598,8 +2600,9 @@ startCCaaSContainer() {
local EXTERNAL_PORT="$5"
local CLI_NAME="$6"
local CA_CERT="$7"

local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
local CHANNEL_NAME="$8"
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}-\${CHAINCODE_NAME}"
CONTAINER_NAME=$(echo "$CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')

# Query installed chaincodes to get the package ID
local CA_CERT_PARAMS=()
Expand Down Expand Up @@ -2672,7 +2675,7 @@ chaincodeApprove() {
local CHANNEL_NAME="$3"
local CHAINCODE_NAME=$4
local CHAINCODE_VERSION=$5
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
local CHAINCODE_LABEL="\${CHANNEL_NAME}-\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
local ORDERER_URL=$6
local ENDORSEMENT=$7
local INIT_REQUIRED=$8
Expand Down Expand Up @@ -2758,6 +2761,7 @@ chaincodeCommit() {
local CHANNEL_NAME="$3"
local CHAINCODE_NAME=$4
local CHAINCODE_VERSION=$5
local CHAINCODE_LABEL="\${CHANNEL_NAME}-\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
local ORDERER_URL=$6
local ENDORSEMENT=$7
local INIT_REQUIRED=$8
Expand Down
24 changes: 14 additions & 10 deletions e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-raft-ccaas.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1734,7 +1734,7 @@ installChaincodes() {
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
local version="0.0.1"
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas-peer0.org1.example.com-chaincode1" "true"
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas-peer0.org1.example.com-my-channel1-chaincode1" "true"
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "chaincode1_$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "cli.org1.example.com" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
Expand Down Expand Up @@ -1764,7 +1764,7 @@ installChaincode() {
if [ "$chaincodeName" = "chaincode1" ]; then
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas-peer0.org1.example.com-chaincode1" "true"
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas-peer0.org1.example.com-my-channel1-chaincode1" "true"
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "chaincode1_$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "cli.org1.example.com" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
Expand Down Expand Up @@ -1800,7 +1800,7 @@ upgradeChaincode() {
if [ "$chaincodeName" = "chaincode1" ]; then
if [ -n "$(ls "$CHAINCODES_BASE_DIR/")" ]; then
printHeadline "Packaging chaincode 'chaincode1'" "U1F60E"
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas-peer0.org1.example.com-chaincode1" "true"
chaincodePackageCCaaS "cli.org1.example.com" "peer0.org1.example.com" "chaincode1" "$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "ccaas-peer0.org1.example.com-my-channel1-chaincode1" "true"
printHeadline "Installing 'chaincode1' for Org1" "U1F60E"
chaincodeInstall "cli.org1.example.com" "peer0.org1.example.com:7041" "chaincode1" "$version" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
startCCaaSContainer "peer0.org1.example.com:7041" "chaincode1" "chaincode1_$version" "ghcr.io/fablo-io/fablo-sample-kv-node-chaincode:2.2.0" "17041" "cli.org1.example.com" "crypto-orderer/tlsca.orderer.example.com-cert.pem"
Expand Down Expand Up @@ -2623,8 +2623,9 @@ chaincodePackageCCaaS() {
inputLog "CONTAINER_PORT: $CONTAINER_PORT"
inputLog "TLS_ENABLED: $TLS_ENABLED"

# Use the same container name logic as startCCaaSContainer
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
local CHANNEL_NAME=$9
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}-\${CHAINCODE_NAME}"
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
local PACKAGE_DIR="./chaincode-packages/ccaas_$ACTUAL_CONTAINER_NAME"

mkdir -p "$PACKAGE_DIR"
Expand Down Expand Up @@ -2673,8 +2674,9 @@ chaincodeInstall() {
local PEER_ADDRESS=$2
local CHAINCODE_NAME=$3
local CHAINCODE_VERSION=$4
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
local CA_CERT=$5
local CHANNEL_NAME=$5
local CA_CERT=$6
local CHAINCODE_LABEL="\${CHANNEL_NAME}-\${CHAINCODE_NAME}_$CHAINCODE_VERSION"

echo "Installing chaincode $CHAINCODE_NAME..."
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
Expand All @@ -2699,8 +2701,9 @@ startCCaaSContainer() {
local EXTERNAL_PORT="$5"
local CLI_NAME="$6"
local CA_CERT="$7"

local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
local CHANNEL_NAME="$8"
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}-\${CHAINCODE_NAME}"
CONTAINER_NAME=$(echo "$CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')

# Query installed chaincodes to get the package ID
local CA_CERT_PARAMS=()
Expand Down Expand Up @@ -2773,7 +2776,7 @@ chaincodeApprove() {
local CHANNEL_NAME="$3"
local CHAINCODE_NAME=$4
local CHAINCODE_VERSION=$5
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
local CHAINCODE_LABEL="\${CHANNEL_NAME}-\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
local ORDERER_URL=$6
local ENDORSEMENT=$7
local INIT_REQUIRED=$8
Expand Down Expand Up @@ -2859,6 +2862,7 @@ chaincodeCommit() {
local CHANNEL_NAME="$3"
local CHAINCODE_NAME=$4
local CHAINCODE_VERSION=$5
local CHAINCODE_LABEL="\${CHANNEL_NAME}-\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
local ORDERER_URL=$6
local ENDORSEMENT=$7
local INIT_REQUIRED=$8
Expand Down
18 changes: 11 additions & 7 deletions e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2590,8 +2590,9 @@ chaincodePackageCCaaS() {
inputLog "CONTAINER_PORT: $CONTAINER_PORT"
inputLog "TLS_ENABLED: $TLS_ENABLED"

# Use the same container name logic as startCCaaSContainer
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
local CHANNEL_NAME=$9
local ACTUAL_CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}-\${CHAINCODE_NAME}"
ACTUAL_CONTAINER_NAME=$(echo "$ACTUAL_CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')
local PACKAGE_DIR="./chaincode-packages/ccaas_$ACTUAL_CONTAINER_NAME"

mkdir -p "$PACKAGE_DIR"
Expand Down Expand Up @@ -2640,8 +2641,9 @@ chaincodeInstall() {
local PEER_ADDRESS=$2
local CHAINCODE_NAME=$3
local CHAINCODE_VERSION=$4
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
local CA_CERT=$5
local CHANNEL_NAME=$5
local CA_CERT=$6
local CHAINCODE_LABEL="\${CHANNEL_NAME}-\${CHAINCODE_NAME}_$CHAINCODE_VERSION"

echo "Installing chaincode $CHAINCODE_NAME..."
inputLog "CHAINCODE_VERSION: $CHAINCODE_VERSION"
Expand All @@ -2666,8 +2668,9 @@ startCCaaSContainer() {
local EXTERNAL_PORT="$5"
local CLI_NAME="$6"
local CA_CERT="$7"

local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHAINCODE_NAME}"
local CHANNEL_NAME="$8"
local CONTAINER_NAME="ccaas-\${PEER_ADDRESS%%:*}-\${CHANNEL_NAME}-\${CHAINCODE_NAME}"
CONTAINER_NAME=$(echo "$CONTAINER_NAME" | tr '[:upper:]' '[:lower:]')

# Query installed chaincodes to get the package ID
local CA_CERT_PARAMS=()
Expand Down Expand Up @@ -2740,7 +2743,7 @@ chaincodeApprove() {
local CHANNEL_NAME="$3"
local CHAINCODE_NAME=$4
local CHAINCODE_VERSION=$5
local CHAINCODE_LABEL="\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
local CHAINCODE_LABEL="\${CHANNEL_NAME}-\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
local ORDERER_URL=$6
local ENDORSEMENT=$7
local INIT_REQUIRED=$8
Expand Down Expand Up @@ -2826,6 +2829,7 @@ chaincodeCommit() {
local CHANNEL_NAME="$3"
local CHAINCODE_NAME=$4
local CHAINCODE_VERSION=$5
local CHAINCODE_LABEL="\${CHANNEL_NAME}-\${CHAINCODE_NAME}_$CHAINCODE_VERSION"
local ORDERER_URL=$6
local ENDORSEMENT=$7
local INIT_REQUIRED=$8
Expand Down
Loading
Loading