Merge branch 'main' into 561-CaDB

dzikowski · web-flow · commit 9fe0f3daceae · 2026-01-23T12:07:01.000+01:00
diff --git a/e2e-network/docker/test-04-v3-snapshot-ccaas.sh b/e2e-network/docker/test-04-v3-snapshot-ccaas.sh
@@ -122,9 +122,12 @@ echo "$user_token_response"
 user_token="$(echo "$user_token_response" | jq -r '.token')"
 
 # check if state is kept after restoration
+sleep 2
+
 expectInvokeRest "$fablo_rest_org1 $user_token" "my-channel1" "chaincode1" \
   "KVContract:get" '["name"]' \
   '{"response":{"success":"Mr Freeze"}}'
+
 expectInvokeRest "$fablo_rest_org1 $user_token" "my-channel1" "chaincode1" \
   "KVContract:getPrivateMessage" '["_implicit_org_Org1MSP"]' \
   '{"success":"RHIgVmljdG9yIEZyaWVz"}'
diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-k8s.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-k8s.json.test.ts.snap
@@ -587,7 +587,7 @@ classDef subgraph_padding fill:none,stroke:none
 
   subgraph channel_my_channel1 [Channel: my-channel1]
     subgraph channel_my_channel1_padding [ ]
-      chaincode_chaincode1[[Chaincode: chaincode1]]
+      chaincode_chaincode1_my_channel1[[Chaincode: chaincode1]]
     end
     class channel_my_channel1_padding subgraph_padding
   end
diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json.test.ts.snap
@@ -3582,7 +3582,7 @@ classDef subgraph_padding fill:none,stroke:none
 
   subgraph channel_my_channel1 [Channel: my-channel1]
     subgraph channel_my_channel1_padding [ ]
-      chaincode_chaincode1[[Chaincode: chaincode1]]
+      chaincode_chaincode1_my_channel1[[Chaincode: chaincode1]]
     end
     class channel_my_channel1_padding subgraph_padding
   end
diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap
@@ -3638,7 +3638,7 @@ classDef subgraph_padding fill:none,stroke:none
 
   subgraph channel_my_channel1 [Channel: my-channel1]
     subgraph channel_my_channel1_padding [ ]
-      chaincode_chaincode1[[Chaincode: chaincode1]]
+      chaincode_chaincode1_my_channel1[[Chaincode: chaincode1]]
     end
     class channel_my_channel1_padding subgraph_padding
   end
diff --git a/e2e/__snapshots__/fablo-config-hlf2-1org-2chaincode-raft-ccaas.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-1org-2chaincode-raft-ccaas.json.test.ts.snap
@@ -3827,14 +3827,14 @@ classDef subgraph_padding fill:none,stroke:none
 
   subgraph channel_my_channel1 [Channel: my-channel1]
     subgraph channel_my_channel1_padding [ ]
-      chaincode_chaincode1[[Chaincode: chaincode1]]
+      chaincode_chaincode1_my_channel1[[Chaincode: chaincode1]]
     end
     class channel_my_channel1_padding subgraph_padding
   end
 
   subgraph channel_my_channel2 [Channel: my-channel2]
     subgraph channel_my_channel2_padding [ ]
-      chaincode_chaincode1[[Chaincode: chaincode1]]
+      chaincode_chaincode1_my_channel2[[Chaincode: chaincode1]]
     end
     class channel_my_channel2_padding subgraph_padding
   end
diff --git a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap
@@ -4598,8 +4598,8 @@ classDef subgraph_padding fill:none,stroke:none
 
   subgraph channel_my_channel1 [Channel: my-channel1]
     subgraph channel_my_channel1_padding [ ]
-      chaincode_or_policy_chaincode[[Chaincode: or-policy-chaincode]]
-      chaincode_and_policy_chaincode[[Chaincode: and-policy-chaincode]]
+      chaincode_or_policy_chaincode_my_channel1[[Chaincode: or-policy-chaincode]]
+      chaincode_and_policy_chaincode_my_channel1[[Chaincode: and-policy-chaincode]]
     end
     class channel_my_channel1_padding subgraph_padding
   end
diff --git a/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap
@@ -6568,7 +6568,7 @@ classDef subgraph_padding fill:none,stroke:none
 
   subgraph channel_my_channel1 [Channel: my-channel1]
     subgraph channel_my_channel1_padding [ ]
-      chaincode_chaincode1[[Chaincode: chaincode1]]
+      chaincode_chaincode1_my_channel1[[Chaincode: chaincode1]]
     end
     class channel_my_channel1_padding subgraph_padding
   end
@@ -6583,7 +6583,7 @@ classDef subgraph_padding fill:none,stroke:none
 
   subgraph channel_my_channel3 [Channel: my-channel3]
     subgraph channel_my_channel3_padding [ ]
-      chaincode_chaincode2[[Chaincode: chaincode2]]
+      chaincode_chaincode2_my_channel3[[Chaincode: chaincode2]]
     end
     class channel_my_channel3_padding subgraph_padding
   end
diff --git a/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap
@@ -7174,7 +7174,7 @@ classDef subgraph_padding fill:none,stroke:none
 
   subgraph channel_my_channel1 [Channel: my-channel1]
     subgraph channel_my_channel1_padding [ ]
-      chaincode_chaincode1[[Chaincode: chaincode1]]
+      chaincode_chaincode1_my_channel1[[Chaincode: chaincode1]]
     end
     class channel_my_channel1_padding subgraph_padding
   end
diff --git a/e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap
@@ -4038,7 +4038,7 @@ classDef subgraph_padding fill:none,stroke:none
 
   subgraph channel_my_channel1 [Channel: my-channel1]
     subgraph channel_my_channel1_padding [ ]
-      chaincode_chaincode1[[Chaincode: chaincode1]]
+      chaincode_chaincode1_my_channel1[[Chaincode: chaincode1]]
     end
     class channel_my_channel1_padding subgraph_padding
   end
diff --git a/e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap b/e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap
@@ -4063,7 +4063,7 @@ classDef subgraph_padding fill:none,stroke:none
 
   subgraph channel_my_channel1 [Channel: my-channel1]
     subgraph channel_my_channel1_padding [ ]
-      chaincode_chaincode1[[Chaincode: chaincode1]]
+      chaincode_chaincode1_my_channel1[[Chaincode: chaincode1]]
     end
     class channel_my_channel1_padding subgraph_padding
   end
diff --git a/src/export-network-topology/generateMermaidDiagram.ts b/src/export-network-topology/generateMermaidDiagram.ts
@@ -3,7 +3,7 @@ import { FabloConfigExtended, OrdererGroup } from "../types/FabloConfigExtended"
 const safeId = (id: string): string => id.replace(/[^a-zA-Z0-9_]/g, "_");
 const ordererGroupId = (g: OrdererGroup): string => safeId(`ord_group_${g.name}_${g.orderers?.[0].address}`);
 const channelId = (channelName: string): string => safeId(`channel_${channelName}`);
-const chaincodeId = (ccName: string): string => safeId(`chaincode_${ccName}`);
+const chaincodeId = (ccName: string, channelName: string): string => safeId(`chaincode_${ccName}_${channelName}`);
 
 export function generateMermaidDiagram(config: FabloConfigExtended): string {
   const lines: string[] = ["graph LR"];
@@ -64,7 +64,7 @@ export function generateMermaidDiagram(config: FabloConfigExtended): string {
     // Add chaincodes for this channel (using cylinder shape)
     const channelChaincodes = config.chaincodes?.filter((cc) => cc.channel?.name === channel.name) ?? [];
     channelChaincodes.forEach((cc) => {
-      lines.push(`      ${chaincodeId(cc.name)}[[Chaincode: ${cc.name}]]`);
+      lines.push(`      ${chaincodeId(cc.name, channel.name)}[[Chaincode: ${cc.name}]]`);
     });
 
     // Add dummy invisible node for empty channels to ensure visibility
